diff --git a/README.md b/README.md index 9b1f4131..6e8f717c 100644 --- a/README.md +++ b/README.md @@ -67,7 +67,6 @@ CRecordDataForChase CRoadBlocks CRubbish CSceneEdit -CRunningScript, CTheScripts - being worked on CSkidmarks CShotInfo CSpecialFX diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp index 6be1ef9c..f9cb4698 100644 --- a/src/control/Gangs.cpp +++ b/src/control/Gangs.cpp @@ -24,6 +24,10 @@ void CGangs::Initialize(void) Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS; Gang[GANG_7].m_nVehicleMI = -1; Gang[GANG_8].m_nVehicleMI = -1; +#ifdef FIX_BUGS + for (int i = 0; i < NUM_GANGS; i++) + Gang[i].m_nPedModelOverride = -1; +#endif } void CGangs::SetGangVehicleModel(int16 gang, int32 model) diff --git a/src/control/Gangs.h b/src/control/Gangs.h index 1ffc5ddd..a348f259 100644 --- a/src/control/Gangs.h +++ b/src/control/Gangs.h @@ -6,8 +6,6 @@ struct CGangInfo { int32 m_nVehicleMI; int8 m_nPedModelOverride; - int8 field_5; - int16 field_6; eWeaponType m_Weapon1; eWeaponType m_Weapon2; @@ -44,6 +42,5 @@ public: static CGangInfo *GetGangInfo(int16 gang) { return &Gang[gang]; } private: - static CGangInfo Gang[NUM_GANGS]; }; diff --git a/src/control/Replay.cpp b/src/control/Replay.cpp index 4734cd51..2b7c6b62 100644 --- a/src/control/Replay.cpp +++ b/src/control/Replay.cpp @@ -1250,10 +1250,6 @@ void CReplay::RestoreStuffFromMem(void) memcpy(CRadar::ms_RadarTrace, pRadarBlips, sizeof(CBlip) * NUMRADARBLIPS); delete[] pRadarBlips; pRadarBlips = nil; -#ifdef FIX_REPLAY_BUGS - // NB: can only be used with fixed bug at the start of PlayBackThisFrameInterpolation - delete FindPlayerPed()->m_pWanted; -#endif FindPlayerPed()->m_pWanted = new CWanted(PlayerWanted); CWorld::Players[0] = PlayerInfo; int i = CPools::GetPedPool()->GetSize();