diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 12:33:22 +0100 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-12-19 12:33:22 +0100 |
| commit | 76a564df2e2d2aff4015d7eb430e8193208dc04a (patch) | |
| tree | 2da1673da0000182f9cce01ad3e260e6c2b6c4f7 /src/core | |
| parent | removed cullzones stuff from renderer (diff) | |
| download | re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar.gz re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar.bz2 re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar.lz re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar.xz re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.tar.zst re3-76a564df2e2d2aff4015d7eb430e8193208dc04a.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Game.cpp | 2 | ||||
| -rw-r--r-- | src/core/Pools.cpp | 2 |
2 files changed, 1 insertions, 3 deletions
diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 3f759794..679dd823 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -415,9 +415,7 @@ bool CGame::Initialise(const char* datFile) CPickups::Init(); CTheCarGenerators::Init(); -#ifndef GTA_PS2 // or GTA_VERSION? CdStreamAddImage("MODELS\\GTA3.IMG"); -#endif CFileLoader::LoadLevel("DATA\\DEFAULT.DAT"); CFileLoader::LoadLevel(datFile); diff --git a/src/core/Pools.cpp b/src/core/Pools.cpp index 68e6f391..f3aeda8c 100644 --- a/src/core/Pools.cpp +++ b/src/core/Pools.cpp @@ -28,7 +28,7 @@ CDummyPool *CPools::ms_pDummyPool; CAudioScriptObjectPool *CPools::ms_pAudioScriptObjectPool; CColModelPool *CPools::ms_pColModelPool; -#ifdef GTA_PS2 // or USE_CUSTOM_ALLOCATOR +#if defined GTA_PS2 && !defined MASTER // or USE_CUSTOM_ALLOCATOR #define CHECKMEM(msg) CMemCheck::AllocateMemCheckBlock(msg) #else #define CHECKMEM(msg) |