Se.Cherkasov/re3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into world

Browse Source 
# Conflicts:
#	src/core/World.cpp
#	src/core/World.h
This commit is contained in:
saml1er
2020-04-17 00:01:53 +05:00
parent 52d0d811b7 83cbe4e39e
commit e52a02fb9e
113 changed files with 6774 additions and 600 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/core/World.h
View File

@@ -61,7 +61,7 @@ class CWorld
public:
static uint8 &PlayerInFocus;
static CPlayerInfo (&Players)[NUMPLAYERS];
static CPlayerInfo Players[NUMPLAYERS];
static CEntity *&pIgnoreEntity;
static bool &bIncludeDeadPeds;
static bool &bNoMoreCollisionTorque;
@@ -151,9 +151,10 @@ public:
static void Process();
static void TriggerExplosion(const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
static void TriggerExplosionSectorList(CPtrList& list, const CVector& position, float fRadius, float fPower, CEntity* pCreator, bool bProcessVehicleBombTimer);
static void UseDetonator(CEntity *);
};
extern CColPoint *gaTempSphereColPoints;
extern CColPoint gaTempSphereColPoints[MAX_COLLISION_POINTS];
class CPlayerPed;
class CVehicle;