summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorNikolay Korolev <nickvnuk@gmail.com>2020-03-21 18:11:08 +0100
committerGitHub <noreply@github.com>2020-03-21 18:11:08 +0100
commitfdfffbcba90e8122aecb293b2281fb08ab40e96b (patch)
tree8bca235070532a7cc51c62446e3ad592acdc3b1e /src/control
parentreadme update (diff)
parentfixed erroneous assumption (diff)
downloadre3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar.gz
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar.bz2
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar.lz
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar.xz
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.tar.zst
re3-fdfffbcba90e8122aecb293b2281fb08ab40e96b.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Gangs.cpp4
-rw-r--r--src/control/Gangs.h4
-rw-r--r--src/control/Replay.cpp4
3 files changed, 5 insertions, 7 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];
+
};
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();