summaryrefslogtreecommitdiffstats
path: root/src/entities
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-06-17 00:16:38 +0200
committeraap <aap@papnet.eu>2019-06-17 00:23:19 +0200
commit0add48abf589330ae6fe11e304c111d9f52ce009 (patch)
treee9f4374bf520a2fdfb9f3d66cd4ed0aa822a020b /src/entities
parentupdated guidelines (diff)
downloadre3-0add48abf589330ae6fe11e304c111d9f52ce009.tar
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.gz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.bz2
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.lz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.xz
re3-0add48abf589330ae6fe11e304c111d9f52ce009.tar.zst
re3-0add48abf589330ae6fe11e304c111d9f52ce009.zip
Diffstat (limited to 'src/entities')
-rw-r--r--src/entities/Ped.cpp6
-rw-r--r--src/entities/Ped.h12
-rw-r--r--src/entities/PlayerInfo.h14
-rw-r--r--src/entities/PlayerPed.h28
-rw-r--r--src/entities/Vehicle.cpp10
-rw-r--r--src/entities/Vehicle.h10
6 files changed, 40 insertions, 40 deletions
diff --git a/src/entities/Ped.cpp b/src/entities/Ped.cpp
index 8d51c1f2..ccb07d46 100644
--- a/src/entities/Ped.cpp
+++ b/src/entities/Ped.cpp
@@ -8,9 +8,9 @@
#include "DMaudio.h"
#include "Ped.h"
-Bool &CPed::bNastyLimbsCheat = *(Bool*)0x95CD44;
-Bool &CPed::bPedCheat2 = *(Bool*)0x95CD5A;
-Bool &CPed::bPedCheat3 = *(Bool*)0x95CD59;
+bool &CPed::bNastyLimbsCheat = *(bool*)0x95CD44;
+bool &CPed::bPedCheat2 = *(bool*)0x95CD5A;
+bool &CPed::bPedCheat3 = *(bool*)0x95CD59;
void *CPed::operator new(size_t sz) { return CPools::GetPedPool()->New(); }
void CPed::operator delete(void *p, size_t sz) { CPools::GetPedPool()->Delete((CPed*)p); }
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index 6a2f8ef1..0b0a5562 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -196,8 +196,8 @@ private:
public:
CPathNode *m_pNextPathNode;
CPathNode *m_pLastPathNode;
- Float m_fHealth;
- Float m_fArmour;
+ float m_fHealth;
+ float m_fArmour;
uint8 stuff2[34];
CEntity *m_pCurrentPhysSurface;
CVector m_vecOffsetFromPhysSurface;
@@ -205,7 +205,7 @@ public:
uint8 stuff3[12];
CPed* m_pSeekTarget;
CVehicle *m_pMyVehicle;
- Bool bInVehicle;
+ bool bInVehicle;
uint8 stuff4[23];
int32 m_nPedType;
PedStat *m_pedStats;
@@ -255,9 +255,9 @@ public:
CWeapon *GetWeapon(void) { return &m_weapons[m_currentWeapon]; }
RwFrame *GetNodeFrame(int nodeId) { return m_pFrames[nodeId]->frame; }
- static Bool &bNastyLimbsCheat;
- static Bool &bPedCheat2;
- static Bool &bPedCheat3;
+ static bool &bNastyLimbsCheat;
+ static bool &bPedCheat2;
+ static bool &bPedCheat3;
};
static_assert(offsetof(CPed, m_nPedState) == 0x224, "CPed: error");
static_assert(offsetof(CPed, m_pCurSurface) == 0x2FC, "CPed: error");
diff --git a/src/entities/PlayerInfo.h b/src/entities/PlayerInfo.h
index eb15f53f..bcbaf4ac 100644
--- a/src/entities/PlayerInfo.h
+++ b/src/entities/PlayerInfo.h
@@ -29,7 +29,7 @@ public:
int32 m_nTotalPackages;
int32 field_188;
int32 m_nSwitchTaxiTime;
- Bool m_bSwitchTaxi;
+ bool m_bSwitchTaxi;
int8 field_197;
int8 field_198;
int8 field_199;
@@ -42,7 +42,7 @@ public:
int8 field_218;
int8 field_219;
int32 m_nWBTime;
- Bool m_bInRemoteMode;
+ bool m_bInRemoteMode;
int8 field_225;
int8 field_226;
int8 field_227;
@@ -55,15 +55,15 @@ public:
int16 m_nTrafficMultiplier;
int8 field_254;
int8 field_255;
- Float m_fRoadDensity;
+ float m_fRoadDensity;
int32 m_nPreviousTimeRewardedForExplosion;
int32 m_nExplosionsSinceLastReward;
int32 field_268;
int32 field_272;
- Bool m_bInfiniteSprint;
- Bool m_bFastReload;
- Bool m_bGetOutOfJailFree;
- Bool m_bGetOutOfHospitalFree;
+ bool m_bInfiniteSprint;
+ bool m_bFastReload;
+ bool m_bGetOutOfJailFree;
+ bool m_bGetOutOfHospitalFree;
uint8 m_aSkinName[32];
RwTexture *m_pSkinTexture;
};
diff --git a/src/entities/PlayerPed.h b/src/entities/PlayerPed.h
index 6721f975..ee4f57b3 100644
--- a/src/entities/PlayerPed.h
+++ b/src/entities/PlayerPed.h
@@ -7,36 +7,36 @@ class CPlayerPed : public CPed {
public:
CWanted *m_pWanted;
CCopPed *m_pArrestingCop;
- Float m_fMoveSpeed;
- Float m_fCurrentStamina;
- Float m_fMaxStamina;
- Float m_fStaminaProgress;
- Bool m_bWeaponSlot;
- Bool m_bSpeedTimerFlag;
- Bool m_bShouldEvade;
+ float m_fMoveSpeed;
+ float m_fCurrentStamina;
+ float m_fMaxStamina;
+ float m_fStaminaProgress;
+ bool m_bWeaponSlot;
+ bool m_bSpeedTimerFlag;
+ bool m_bShouldEvade;
int8 field_1367;
int32 m_nSpeedTimer;
int32 m_nShotDelay;
- Float field_1376;
+ float field_1376;
int8 field_1380;
int8 field_1381;
int8 field_1382;
int8 field_1383;
CEntity *m_pEvadingFrom;
int32 m_nTargettableObjects[4];
- Bool m_bAdrenalineActive;
- Bool m_bHasLockOnTarget;
+ bool m_bAdrenalineActive;
+ bool m_bHasLockOnTarget;
int8 field_1406;
int8 field_1407;
- Bool m_bAdrenalineTime;
- Bool m_bCanBeDamaged;
+ bool m_bAdrenalineTime;
+ bool m_bCanBeDamaged;
int8 field_1413;
int8 field_1414;
int8 field_1415;
CVector field_1416[6];
int32 field_1488[6];
- Float field_1512;
- Float m_fFPSMoveHeading;
+ float field_1512;
+ float m_fFPSMoveHeading;
};
static_assert(sizeof(CPlayerPed) == 0x5F0, "CPlayerPed: error");
diff --git a/src/entities/Vehicle.cpp b/src/entities/Vehicle.cpp
index ebd7ae68..bac05f7b 100644
--- a/src/entities/Vehicle.cpp
+++ b/src/entities/Vehicle.cpp
@@ -3,11 +3,11 @@
#include "Vehicle.h"
#include "Pools.h"
-Bool &CVehicle::bWheelsOnlyCheat = *(Bool *)0x95CD78;
-Bool &CVehicle::bAllDodosCheat = *(Bool *)0x95CD75;
-Bool &CVehicle::bCheat3 = *(Bool *)0x95CD66;
-Bool &CVehicle::bCheat4 = *(Bool *)0x95CD65;
-Bool &CVehicle::bCheat5 = *(Bool *)0x95CD64;
+bool &CVehicle::bWheelsOnlyCheat = *(bool *)0x95CD78;
+bool &CVehicle::bAllDodosCheat = *(bool *)0x95CD75;
+bool &CVehicle::bCheat3 = *(bool *)0x95CD66;
+bool &CVehicle::bCheat4 = *(bool *)0x95CD65;
+bool &CVehicle::bCheat5 = *(bool *)0x95CD64;
void *CVehicle::operator new(size_t sz) { return CPools::GetVehiclePool()->New(); }
void CVehicle::operator delete(void *p, size_t sz) { CPools::GetVehiclePool()->Delete((CVehicle*)p); }
diff --git a/src/entities/Vehicle.h b/src/entities/Vehicle.h
index 00126c31..e5d1cfb3 100644
--- a/src/entities/Vehicle.h
+++ b/src/entities/Vehicle.h
@@ -63,11 +63,11 @@ uint8 m_extra2;
bool IsHeli(void) { return m_vehType == VEHICLE_TYPE_HELI; }
bool IsPlane(void) { return m_vehType == VEHICLE_TYPE_PLANE; }
- static Bool &bWheelsOnlyCheat;
- static Bool &bAllDodosCheat;
- static Bool &bCheat3;
- static Bool &bCheat4;
- static Bool &bCheat5;
+ static bool &bWheelsOnlyCheat;
+ static bool &bAllDodosCheat;
+ static bool &bCheat3;
+ static bool &bCheat4;
+ static bool &bCheat5;
};
static_assert(sizeof(CVehicle) == 0x288, "CVehicle: error");
static_assert(offsetof(CVehicle, m_pCurSurface) == 0x1E0, "CVehicle: error");