summaryrefslogtreecommitdiffstats
path: root/src/entities/Ped.h
diff options
context:
space:
mode:
authoreray orçunus <erayorcunus@gmail.com>2019-07-06 00:47:26 +0200
committereray orçunus <erayorcunus@gmail.com>2019-07-06 00:52:14 +0200
commit769c2812ffb317829dbef8b258ef3d2ebed7b484 (patch)
tree5c056bab681e962de1a7bb2ade0a120568cc06fa /src/entities/Ped.h
parentCPed... (diff)
parentfinished CDamageManager (diff)
downloadre3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar.gz
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar.bz2
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar.lz
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar.xz
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.tar.zst
re3-769c2812ffb317829dbef8b258ef3d2ebed7b484.zip
Diffstat (limited to 'src/entities/Ped.h')
-rw-r--r--src/entities/Ped.h19
1 files changed, 12 insertions, 7 deletions
diff --git a/src/entities/Ped.h b/src/entities/Ped.h
index a774dbbe..3888c076 100644
--- a/src/entities/Ped.h
+++ b/src/entities/Ped.h
@@ -84,8 +84,8 @@ enum eVehEnter : uint16 {
};
enum {
- CREATED_BY_RANDOM = 1,
- CREATED_BY_SCRIPT
+ RANDOM_CHAR = 1,
+ MISSION_CHAR,
};
enum PedLineUpPhase {
@@ -154,15 +154,15 @@ enum PedState
PED_PASSENGER,
PED_TAXI_PASSENGER,
PED_OPEN_DOOR,
- PED_DIE = 48,
- PED_DEAD = 49,
+ PED_DIE,
+ PED_DEAD,
PED_CARJACK,
PED_DRAG_FROM_CAR,
PED_ENTER_CAR,
PED_STEAL_CAR,
PED_EXIT_CAR,
PED_HANDS_UP,
- PED_ARRESTED = 56,
+ PED_ARRESTED,
};
enum eMoveState {
@@ -181,6 +181,8 @@ public:
// 0x128
CStoredCollPoly m_collPoly;
float m_fCollisionSpeed;
+
+ // cf. https://github.com/DK22Pac/plugin-sdk/blob/master/plugin_sa/game_sa/CPed.h from R*
uint8 bIsStanding : 1;
uint8 m_ped_flagA2 : 1;
uint8 m_ped_flagA4 : 1; // stores (CTimer::GetTimeInMilliseconds() < m_lastHitTime)
@@ -201,7 +203,7 @@ public:
uint8 m_ped_flagC1 : 1;
uint8 bRespondsToThreats : 1;
- uint8 m_ped_flagC4 : 1;
+ uint8 m_ped_flagC4 : 1; // false when in bus, bRenderPedInCar?
uint8 m_ped_flagC8 : 1;
uint8 m_ped_flagC10 : 1;
uint8 m_ped_flagC20 : 1; // just left some body part?
@@ -261,8 +263,9 @@ public:
uint8 m_ped_flagI20 : 1;
uint8 m_ped_flagI40 : 1;
uint8 m_ped_flagI80 : 1;
+
uint8 stuff10[3];
- uint8 m_nCreatedBy;
+ uint8 CharCreatedBy;
uint8 field_161;
uint8 pad_162[2];
eObjective m_objective;
@@ -537,6 +540,8 @@ public:
return 0;
}
}
+ PedState GetPedState(void) { return m_nPedState; }
+ void SetPedState(PedState state) { m_nPedState = state; }
// to make patching virtual functions possible
void SetModelIndex_(uint32 mi) { CPed::SetModelIndex(mi); }