diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Camera.cpp | 6 | ||||
| -rw-r--r-- | src/core/Game.cpp | 6 | ||||
| -rw-r--r-- | src/core/Streaming.cpp | 6 | ||||
| -rw-r--r-- | src/core/ZoneCull.cpp | 16 | ||||
| -rw-r--r-- | src/core/config.h | 6 |
5 files changed, 1 insertions, 39 deletions
diff --git a/src/core/Camera.cpp b/src/core/Camera.cpp index 830a2bb2..30f4287b 100644 --- a/src/core/Camera.cpp +++ b/src/core/Camera.cpp @@ -633,11 +633,7 @@ CCamera::CamControl(void) m_bInitialNodeFound = false; m_bInitialNoNodeStaticsSet = false; } -#ifdef GTA_TRAIN Process_Train_Camera_Control(); -#else - assert(0 && "this can't happen"); -#endif }else{ if(((CVehicle*)pTargetEntity)->IsBoat()) boatTarget = true; @@ -2713,7 +2709,6 @@ CCamera::DontProcessObbeCinemaCamera(void) bDidWeProcessAnyCinemaCam = false; } -#ifdef GTA_TRAIN void CCamera::LoadTrainCamNodes(char const *name) { @@ -2891,7 +2886,6 @@ CCamera::Process_Train_Camera_Control(void) } } } -#endif void diff --git a/src/core/Game.cpp b/src/core/Game.cpp index d0b3f5a3..96109e56 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -377,9 +377,7 @@ bool CGame::Initialise(const char* datFile) CWorld::RepositionCertainDynamicObjects(); #endif LoadingScreen("Loading the Game", "Initialise vehicle paths", nil); -#ifdef GTA_ZONECULL CCullZones::ResolveVisibilities(); -#endif CTrain::InitTrains(); CPlane::InitPlanes(); CCredits::Init(); @@ -498,9 +496,7 @@ void CGame::ReInitGameObjectVariables(void) CSpecialFX::Init(); CWaterCannons::Init(); CParticle::ReloadConfig(); -#ifdef GTA_ZONECULL CCullZones::ResolveVisibilities(); -#endif if ( !FrontEndMenuManager.m_bWantToLoad ) { @@ -535,9 +531,7 @@ void CGame::ReloadIPLs(void) #ifndef MIAMI CWorld::RepositionCertainDynamicObjects(); #endif -#ifdef GTA_ZONECULL CCullZones::ResolveVisibilities(); -#endif CRenderer::SortBIGBuildings(); CTimer::Update(); } diff --git a/src/core/Streaming.cpp b/src/core/Streaming.cpp index d212dd05..daeda35d 100644 --- a/src/core/Streaming.cpp +++ b/src/core/Streaming.cpp @@ -2235,9 +2235,7 @@ CStreaming::ProcessEntitiesInSectorList(CPtrList &list, float x, float y, float if(xmin < pos.x && pos.x < xmax && ymin < pos.y && pos.y < ymax && (CVector2D(x, y) - pos).MagnitudeSqr() < lodDistSq) -#ifdef GTA_ZONECULL if(CRenderer::IsEntityCullZoneVisible(e)) -#endif RequestModel(e->GetModelIndex(), 0); } } @@ -2261,9 +2259,7 @@ CStreaming::ProcessEntitiesInSectorList(CPtrList &list) (!e->IsObject() || ((CObject*)e)->ObjectCreatedBy != TEMP_OBJECT)){ CTimeModelInfo *mi = (CTimeModelInfo*)CModelInfo::GetModelInfo(e->GetModelIndex()); if (mi->GetModelType() != MITYPE_TIME || CClock::GetIsTimeInRange(mi->GetTimeOn(), mi->GetTimeOff())) -#ifdef GTA_ZONECULL if(CRenderer::IsEntityCullZoneVisible(e)) -#endif RequestModel(e->GetModelIndex(), 0); } } @@ -2687,9 +2683,7 @@ CStreaming::LoadScene(const CVector &pos) RemoveModel(si - ms_aInfoForModel); } CRenderer::m_loadingPriority = false; -#ifdef GTA_ZONECULL CCullZones::ForceCullZoneCoors(pos); -#endif DeleteAllRwObjects(); #ifndef MIAMI AddModelsToRequestList(pos); diff --git a/src/core/ZoneCull.cpp b/src/core/ZoneCull.cpp index 1e9c00f0..780c180e 100644 --- a/src/core/ZoneCull.cpp +++ b/src/core/ZoneCull.cpp @@ -38,7 +38,6 @@ CCullZones::Init(void) CurrentFlags_Camera = 0; CurrentFlags_Player = 0; bCurrentSubwayIsInvisible = false; -#ifdef GTA_ZONECULL NumCullZones = 0; OldCullZone = -1; EntityIndicesUsed = 0; @@ -47,10 +46,8 @@ CCullZones::Init(void) aPointersToBigBuildingsForBuildings[i] = -1; for(i = 0; i < NUMTREADABLES; i++) aPointersToBigBuildingsForTreadables[i] = -1; -#endif } -#ifdef GTA_ZONECULL bool CCullZone::TestLine(CVector vec1, CVector vec2) { CColPoint colPoint; @@ -216,7 +213,6 @@ CCullZones::DoVisibilityTestCullZone(int zoneId, bool doIt) } } } -#endif void CCullZones::Update(void) @@ -229,10 +225,8 @@ CCullZones::Update(void) switch(CTimer::GetFrameCounter() & 7){ case 0: case 4: -#ifdef GTA_ZONECULL /* Update Cull zone */ ForceCullZoneCoors(TheCamera.GetGameCamPosition()); -#endif break; case 2: @@ -256,7 +250,6 @@ CCullZones::Update(void) void CCullZones::ForceCullZoneCoors(CVector coors) { -#ifdef GTA_ZONECULL int32 z; z = FindCullZoneForCoors(coors); if(z != OldCullZone){ @@ -266,10 +259,8 @@ CCullZones::ForceCullZoneCoors(CVector coors) aZones[z].DoStuffEnteringZone(); OldCullZone = z; } -#endif } -#ifdef GTA_ZONECULL int32 CCullZones::FindCullZoneForCoors(CVector coors) { @@ -282,7 +273,6 @@ CCullZones::FindCullZoneForCoors(CVector coors) return i; return -1; } -#endif int32 CCullZones::FindAttributesForCoors(CVector coors, int32 *wantedLevel) @@ -360,7 +350,6 @@ CCullZones::AddCullZone(CVector const &position, CAttributeZone *attrib; CVector v; -#ifdef GTA_ZONECULL if((flag & ATTRZONE_NOTCULLZONE) == 0){ cull = &aZones[NumCullZones++]; v = position; @@ -383,7 +372,6 @@ CCullZones::AddCullZone(CVector const &position, cull->m_groupIndexCount[2] = 0; cull->m_indexStart = 0; } -#endif if(flag & ~ATTRZONE_NOTCULLZONE){ attrib = &aAttributeZones[NumAttributeZones++]; attrib->minx = minx; @@ -398,7 +386,6 @@ CCullZones::AddCullZone(CVector const &position, } -#ifdef GTA_ZONECULL void CCullZone::DoStuffLeavingZone(void) { @@ -573,5 +560,4 @@ CCullZones::DoWeHaveMoreThanXOccurencesOfSet(int32 count, uint16 *set) } } return false; -} -#endif
\ No newline at end of file +}
\ No newline at end of file diff --git a/src/core/config.h b/src/core/config.h index c3904fa9..c0597db2 100644 --- a/src/core/config.h +++ b/src/core/config.h @@ -160,12 +160,6 @@ enum Config { //#define GTA_PS2 //#define GTA_XBOX -#ifndef MIAMI -#define GTA_TRAIN // This game has trains -#define GTA_BRIDGE // This game has the bridge -#define GTA_ZONECULL // This game culls by zones -#endif - // This enables things from the PS2 version on PC #define GTA_PS2_STUFF |