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

Merge branch 'master' into miami

Browse source 
# Conflicts:
#	src/animation/RpAnimBlend.cpp
#	src/audio/oal/stream.cpp
#	src/audio/sampman.h
#	src/control/Pickups.cpp
#	src/core/Collision.cpp
#	src/core/Collision.h
#	src/core/FileLoader.cpp
#	src/core/FileMgr.cpp
#	src/core/FileMgr.h
#	src/core/Streaming.cpp
#	src/core/Streaming.h
#	src/core/SurfaceTable.h
#	src/modelinfo/VehicleModelInfo.h
#	src/peds/Ped.cpp
#	src/rw/RwHelper.cpp
#	src/rw/RwHelper.h
#	src/skel/glfw/glfw.cpp
#	src/skel/platform.h
#	src/text/Text.cpp
#	src/text/Text.h
#	src/vehicles/CarGen.cpp
#	src/vehicles/Heli.cpp
This commit is contained in:
Sergeanur 2020-07-29 15:34:57 +03:00
commit acdc52116e
14 changed files with 377 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/core/Game.cpp
View file

@ -152,9 +152,14 @@ CGame::InitialiseOnceBeforeRW(void)
return true;
}
#if !defined(LIBRW) && defined(PS2_MATFX)
#ifndef LIBRW
#ifdef PS2_MATFX
void ReplaceMatFxCallback();
#endif
#endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING
void ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING
#endif // !LIBRW
bool
CGame::InitialiseRenderWare(void)
@ -206,9 +211,14 @@ CGame::InitialiseRenderWare(void)
#else
rw::MatFX::modulateEnvMap = false;
#endif
#elif defined(PS2_MATFX)
#else
#ifdef PS2_MATFX
ReplaceMatFxCallback();
#endif
#endif // PS2_MATFX
#ifdef DUAL_PASS_RENDERING
ReplaceAtomicPipeCallback();
#endif // DUAL_PASS_RENDERING
#endif // LIBRW
CFont::Initialise();
CHud::Initialise();