diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-03-22 02:49:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-03-22 02:49:24 +0100 |
| commit | b17935b89e8a42c13a2bc0662bb5bc34a1be66d5 (patch) | |
| tree | d42b0d0fe6ef7f1b2d68b71ecbc63437d6ab2c4d | |
| parent | ProcessButtonPresses and fixes (diff) | |
| parent | Merge pull request #349 from Nick007J/master (diff) | |
| download | re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar.gz re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar.bz2 re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar.lz re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar.xz re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.tar.zst re3-b17935b89e8a42c13a2bc0662bb5bc34a1be66d5.zip | |
| -rw-r--r-- | README.md | 1 | ||||
| -rw-r--r-- | src/control/Gangs.cpp | 4 | ||||
| -rw-r--r-- | src/control/Gangs.h | 3 | ||||
| -rw-r--r-- | src/control/Replay.cpp | 4 |
4 files changed, 4 insertions, 8 deletions
@@ -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(); |