From 795e07c8822d6785300302518c210082be3bc8d0 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 21 Mar 2020 14:29:03 +0300 Subject: [PATCH 1/3] purple nines glitch fix --- src/control/Gangs.cpp | 4 ++++ src/control/Gangs.h | 4 +--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/control/Gangs.cpp b/src/control/Gangs.cpp index f6f9261e..f5f609bc 100644 --- a/src/control/Gangs.cpp +++ b/src/control/Gangs.cpp @@ -23,6 +23,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 93ebe663..379543ee 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; @@ -46,6 +44,6 @@ public: static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } private: - static CGangInfo(&Gang)[NUM_GANGS]; + }; From ac610b7e6e04067ef938be020995632209027ff5 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 21 Mar 2020 15:13:38 +0300 Subject: [PATCH 2/3] fixed erroneous assumption --- src/control/Replay.cpp | 4 ---- 1 file changed, 4 deletions(-) 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(); From b4f99c19a422a678bb6c952bb7ec4c00ed95f6a8 Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sat, 21 Mar 2020 15:34:05 +0300 Subject: [PATCH 3/3] readme update --- README.md | 1 - 1 file changed, 1 deletion(-) 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