Merge pull request #349 from Nick007J/master

purple nines glitch fix
This commit is contained in:
Nikolay Korolev 2020-03-21 20:11:08 +03:00 committed by GitHub
commit fdfffbcba9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 7 deletions

View file

@ -23,6 +23,10 @@ void CGangs::Initialize(void)
Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS; Gang[GANG_HOODS].m_nVehicleMI = MI_HOODS;
Gang[GANG_7].m_nVehicleMI = -1; Gang[GANG_7].m_nVehicleMI = -1;
Gang[GANG_8].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) void CGangs::SetGangVehicleModel(int16 gang, int32 model)

View file

@ -6,8 +6,6 @@ struct CGangInfo
{ {
int32 m_nVehicleMI; int32 m_nVehicleMI;
int8 m_nPedModelOverride; int8 m_nPedModelOverride;
int8 field_5;
int16 field_6;
eWeaponType m_Weapon1; eWeaponType m_Weapon1;
eWeaponType m_Weapon2; eWeaponType m_Weapon2;
@ -46,6 +44,6 @@ public:
static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; } static CGangInfo* GetGangInfo(int16 gang) { return &Gang[gang]; }
private: private:
static CGangInfo(&Gang)[NUM_GANGS]; static CGangInfo(&Gang)[NUM_GANGS];
}; };

View file

@ -1250,10 +1250,6 @@ void CReplay::RestoreStuffFromMem(void)
memcpy(CRadar::ms_RadarTrace, pRadarBlips, sizeof(CBlip) * NUMRADARBLIPS); memcpy(CRadar::ms_RadarTrace, pRadarBlips, sizeof(CBlip) * NUMRADARBLIPS);
delete[] pRadarBlips; delete[] pRadarBlips;
pRadarBlips = nil; 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); FindPlayerPed()->m_pWanted = new CWanted(PlayerWanted);
CWorld::Players[0] = PlayerInfo; CWorld::Players[0] = PlayerInfo;
int i = CPools::GetPedPool()->GetSize(); int i = CPools::GetPedPool()->GetSize();