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

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

Browse source 
# Conflicts:
#	src/core/config.h
This commit is contained in:
Sergeanur 2020-08-19 23:35:10 +03:00
commit dab6d6dd6d
78 changed files with 3941 additions and 126 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/core/Game.cpp
View file

@ -91,6 +91,7 @@
#include "Ropes.h"
#include "WindModifiers.h"
#include "postfx.h"
#include "custompipes.h"
eLevelName CGame::currLevel;
int32 CGame::currArea;
@ -356,6 +357,10 @@ bool CGame::Initialise(const char* datFile)
CdStreamAddImage("MODELS\\GTA3.IMG");
CFileLoader::LoadLevel("DATA\\DEFAULT.DAT");
CFileLoader::LoadLevel(datFile);
#ifdef EXTENDED_PIPELINES
// for generic fallback
CustomPipes::SetTxdFindCallback();
#endif
CWorld::AddParticles();
CVehicleModelInfo::LoadVehicleColours();
CVehicleModelInfo::LoadEnvironmentMaps();