a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 23:30:01 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'master' into erorcun

Browse source
This commit is contained in:
erorcun 2020-03-22 04:49:24 +03:00 committed by GitHub
parent d5a6e17079 fdfffbcba9
commit b17935b89e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
README.md
View file

@ -67,7 +67,6 @@ CRecordDataForChase
CRoadBlocks CRoadBlocks
CRubbish CRubbish
CSceneEdit CSceneEdit
CRunningScript, CTheScripts - being worked on
CSkidmarks CSkidmarks
CShotInfo CShotInfo
CSpecialFX CSpecialFX

4
src/control/Gangs.cpp
View file

@ -24,6 +24,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)

3
src/control/Gangs.h
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;
@ -44,6 +42,5 @@ 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];
}; };

4
src/control/Replay.cpp
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();