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

Wait states ported (scripted animations)

Browse Source
This commit is contained in:
Sergeanur
2021-05-18 14:06:40 +03:00
parent 0c3ee871f4
commit c7821635fd
6 changed files with 546 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
src/peds/Ped.h
View File

@@ -216,6 +216,56 @@ enum eWaitState {
WAITSTATE_GROUND_ATTACK,
WAITSTATE_LANCESITTING,
WAITSTATE_PLAYANIM_HANDSUP_SIMPLE,
WAITSTATE_MULTIPLAYER_CUTSCENE_MPNOTE,
WAITSTATE_MULTIPLAYER_CUTSCENE_MPNOTE_LOOP,
WAITSTATE_CS_MISC_IDLE_LOOK,
WAITSTATE_CS_MISC_IDLE_NO,
WAITSTATE_CS_MISC_IDLE_YES,
WAITSTATE_CS_MISC_IDLE_CHAT2,
WAITSTATE_CS_MISC_IDLE_COUGH,
WAITSTATE_CS_MISC_IDLE_GIGGLE_FEMALE,
WAITSTATE_CS_MISC_IDLE_TOUGH_CHAT,
WAITSTATE_CS_MISC_IDLE_CELL_TALK,
WAITSTATE_DONH2_CAMERA,
WAITSTATE_DONH3_HAPPY,
WAITSTATE_JDT2_ANXIOUS_TALK,
WAITSTATE_JDT2_SHRUG,
WAITSTATE_JDT4_DILDO_TALK,
WAITSTATE_JDT5_CALM_DOWN,
WAITSTATE_JDT5_POINT,
WAITSTATE_JDT6_PICKUP,
WAITSTATE_MAR1_SKIRT,
WAITSTATE_MAR2_CELL_ANSWER,
WAITSTATE_MAR2_CELL_END,
WAITSTATE_MAR2_CELL_TALK,
WAITSTATE_MAR2_FOOT_TAP,
WAITSTATE_MAR3_HOOCHY,
WAITSTATE_MAR3_NOTE_IDLE,
WAITSTATE_MAR3_NOTE_PICKUP,
WAITSTATE_SAL1_BIREFCASE_DOWN,
WAITSTATE_SAL2_IDLE_SEATED,
WAITSTATE_SAL2_SEAT_TO_STAND,
WAITSTATE_SAL3_SEATED_TALK,
WAITSTATE_SAL3_SEATED_IDLE,
WAITSTATE_SAL4_DUST_DOWN,
WAITSTATE_SAL4_GIRL_RUN,
WAITSTATE_SAL6_ANGRY_SEATED,
WAITSTATE_SAL6_IDLE_SEATED,
WAITSTATE_SAL7_LOOKOUT,
WAITSTATE_VIC2_POINT_ANGRY,
WAITSTATE_VIC3_WAFT,
WAITSTATE_VIC3_PICKUP_ROLL,
WAITSTATE_VIC4_CARRY_BOX,
WAITSTATE_VIC4_CELL_LOOK,
WAITSTATE_VIC4_CRATE_IDLE,
WAITSTATE_VIC6_CELL_ANGRY,
WAITSTATE_TOURIST3,
WAITSTATE_TOURIST2,
WAITSTATE_TOURIST1,
WAITSTATE_MAC2_PLEAD,
WAITSTATE_JDT6_KNOCK,
WAITSTATE_SAL3_SIT_DOWN,
WAITSTATE_VIC7_PROD_WITH_FOOT
};
enum eObjective {
@@ -826,7 +876,7 @@ public:
void SetEvasiveDive(CPhysical*, uint8);
void SetAttack(CEntity*);
void StartFightAttack(uint8);
void SetWaitState(eWaitState, void*);
void SetWaitState(eWaitState, void*, bool repeat = false);
bool FightStrike(CVector&, bool);
void FightHitPed(CPed*, CVector&, CVector&, int16);
int32 ChooseAttackPlayer(uint8, bool);
@@ -1225,6 +1275,9 @@ public:
static bool bPedCheat3;
static CVector2D ms_vec2DFleePosition;
static void LoadNonStandardPedAnim(eWaitState waitState);
static void UnloadNonStandardPedAnim(eWaitState waitState);
#ifndef MASTER
// Mobile things
void DebugDrawPedDestination(CPed *, int, int);