diff options
| author | erorcun <erayorcunus@gmail.com> | 2019-11-01 13:40:28 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-01 13:40:28 +0100 |
| commit | e7c06a004bdab34acd4857f5fe328b5b953de149 (patch) | |
| tree | 937135856409f9c9d97425a4950fbdf1ff58f199 /src/peds/Ped.h | |
| parent | Merge pull request #255 from Nick007J/master (diff) | |
| parent | Script fix (diff) | |
| download | re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar.gz re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar.bz2 re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar.lz re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar.xz re3-e7c06a004bdab34acd4857f5fe328b5b953de149.tar.zst re3-e7c06a004bdab34acd4857f5fe328b5b953de149.zip | |
Diffstat (limited to 'src/peds/Ped.h')
| -rw-r--r-- | src/peds/Ped.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/src/peds/Ped.h b/src/peds/Ped.h index b8d2f5dd..7e049464 100644 --- a/src/peds/Ped.h +++ b/src/peds/Ped.h @@ -58,6 +58,15 @@ enum PedRouteType PEDROUTE_GO_TO_START_WHEN_DONE }; +enum FightMoveHitLevel +{ + HITLEVEL_NULL, + HITLEVEL_GROUND, + HITLEVEL_LOW, + HITLEVEL_MEDIUM, + HITLEVEL_HIGH +}; + struct FightMove { AnimationId animId; @@ -65,7 +74,7 @@ struct FightMove float endFireTime; float comboFollowOnTime; float strikeRadius; - uint8 hitLevel; + uint8 hitLevel; // FightMoveHitLevel uint8 damage; uint8 flags; }; @@ -99,7 +108,8 @@ enum PedFightMoves FIGHTMOVE_HITBIGSTEP, FIGHTMOVE_HITONFLOOR, FIGHTMOVE_HITBEHIND, - FIGHTMOVE_IDLE2NORM + FIGHTMOVE_IDLE2NORM, + NUM_FIGHTMOVES }; enum ePedPieceTypes @@ -681,6 +691,7 @@ public: void ScanForInterestingStuff(void); void WarpPedIntoCar(CVehicle*); void SetCarJack(CVehicle*); + void WarpPedToNearLeaderOffScreen(void); // Static methods static CVector GetLocalPositionToOpenCarDoor(CVehicle *veh, uint32 component, float offset); |