diff options
| -rw-r--r-- | src/control/Record.cpp | 7 | ||||
| -rw-r--r-- | src/core/Game.cpp | 2 | ||||
| -rw-r--r-- | src/core/Pools.cpp | 2 | ||||
| -rw-r--r-- | src/modelinfo/SimpleModelInfo.h | 12 |
4 files changed, 1 insertions, 22 deletions
diff --git a/src/control/Record.cpp b/src/control/Record.cpp index d3e48647..9b4a21fc 100644 --- a/src/control/Record.cpp +++ b/src/control/Record.cpp @@ -71,13 +71,6 @@ void CRecordDataForChase::ProcessControlCars(void) bool CRecordDataForChase::ShouldThisPadBeLeftAlone(uint8 pad) { - // may be wrong - if (Status == STATE_PLAYBACK_INIT) // this is useless but ps2 def checks if it's STATE_PLAYBACK_INIT - return false; - - if (Status == STATE_RECORD) - return pad != 0; - return false; } 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) diff --git a/src/modelinfo/SimpleModelInfo.h b/src/modelinfo/SimpleModelInfo.h index 0bb5fbe6..986cb886 100644 --- a/src/modelinfo/SimpleModelInfo.h +++ b/src/modelinfo/SimpleModelInfo.h @@ -11,18 +11,6 @@ public: float m_lodDistances[3]; uint8 m_numAtomics; uint8 m_alpha; - /* // For reference, PS2 has: - uint8 m_firstDamaged; - uint8 m_normalCull : 1; - uint8 m_isDamaged : 1; - uint8 m_isBigBuilding : 1; - uint8 m_noFade : 1; - uint8 m_drawLast : 1; - uint8 m_additive : 1; - uint8 m_isSubway : 1; - uint8 m_ignoreLight : 1; - // m_noZwrite is missing because not needed - */ uint16 m_firstDamaged : 2; // 0: no damage model // 1: 1 and 2 are damage models // 2: 2 is damage model |