mirror/re3
1
0
Fork 0
mirror of https://github.com/GTAmodding/re3.git synced 2025-07-04 21:34:08 +00:00
Code Issues Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master' into miami

Browse source 
# Conflicts:
#	premake5.lua
#	src/core/ZoneCull.cpp
#	src/core/Zones.cpp
#	src/objects/CutsceneHead.cpp
#	src/render/Clouds.cpp
This commit is contained in:
Sergeanur 2020-05-13 00:19:21 +03:00
commit 33dfaf7da1
56 changed files with 1418 additions and 385 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/animation/CutsceneMgr.cpp
View file

@ -102,7 +102,7 @@ const struct {
{ "MT_PH2", STREAMED_SOUND_CUTSCENE_MARTY_PH2 },
{ "MT_PH3", STREAMED_SOUND_CUTSCENE_MARTY_PH3 },
{ "MT_PH4", STREAMED_SOUND_CUTSCENE_MARTY_PH4 },
{ NULL, NULL }
{ NULL, 0 }
};
int