Archive/openmohaa
0
0
Fork 0
mirror of https://github.com/openmoh/openmohaa.git synced 2025-05-01 23:27:59 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Finalized actor_turret

Browse source
This commit is contained in:
smallmodel 2023-10-22 17:30:37 +02:00
parent 6eff8bc273
commit 70c628d759
No known key found for this signature in database
GPG key ID: 9F2D623CEDF08512
2 changed files with 398 additions and 382 deletions
Download patch file Download diff file Expand all files Collapse all files

9
code/fgame/actor.h
View file

@ -463,6 +463,8 @@ enum eActorState_Turret {
ACTOR_STATE_TURRET_COVER_INSTEAD, ACTOR_STATE_TURRET_COVER_INSTEAD,
ACTOR_STATE_TURRET_BECOME_COVER, ACTOR_STATE_TURRET_BECOME_COVER,
ACTOR_STATE_TURRET_WAIT, ACTOR_STATE_TURRET_WAIT,
ACTOR_STATE_TURRET_SHOOT, // Added in 2.0
ACTOR_STATE_TURRET_RETARGET_SUPPRESS, // Added in 2.0
ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE, ACTOR_STATE_TURRET_RETARGET_SNIPER_NODE,
ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_SMALL, ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_SMALL,
ACTOR_STATE_TURRET_RETARGET_PATH_EXACT, ACTOR_STATE_TURRET_RETARGET_PATH_EXACT,
@ -470,7 +472,8 @@ enum eActorState_Turret {
ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_MEDIUM, ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_MEDIUM,
ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_LARGE, ACTOR_STATE_TURRET_RETARGET_STEP_SIDE_LARGE,
ACTOR_STATE_TURRET_RETARGET_STEP_FACE_MEDIUM, ACTOR_STATE_TURRET_RETARGET_STEP_FACE_MEDIUM,
ACTOR_STATE_TURRET_RETARGET_STEP_FACE_LARGE ACTOR_STATE_TURRET_RETARGET_STEP_FACE_LARGE,
ACTOR_STATE_TURRET_NUM_STATES
}; };
// //
@ -508,7 +511,7 @@ enum eActorState_Cover {
// Pain think state // Pain think state
// //
enum eActorState_Pain { enum eActorState_Pain {
ACTOR_STATE_PAIN_START = ACTOR_STATE_PAIN, ACTOR_STATE_PAIN_START = ACTOR_STATE_PAIN,
ACTOR_STATE_PAIN_INITIAL = ACTOR_STATE_PAIN_START, ACTOR_STATE_PAIN_INITIAL = ACTOR_STATE_PAIN_START,
ACTOR_STATE_PAIN_MAIN ACTOR_STATE_PAIN_MAIN
}; };
@ -549,7 +552,7 @@ enum eActorState_BalconyKilled {
// Weaponless think state // Weaponless think state
// //
enum eActorState_WeaponLess { enum eActorState_WeaponLess {
ACTOR_STATE_WEAPONLESS_START = ACTOR_STATE_WEAPONLESS, ACTOR_STATE_WEAPONLESS_START = ACTOR_STATE_WEAPONLESS,
ACTOR_STATE_WEAPONLESS_NORMAL = ACTOR_STATE_WEAPONLESS_START, ACTOR_STATE_WEAPONLESS_NORMAL = ACTOR_STATE_WEAPONLESS_START,
ACTOR_STATE_WEAPONLESS_GRENADE, ACTOR_STATE_WEAPONLESS_GRENADE,
ACTOR_STATE_WEAPONLESS_LOOP ACTOR_STATE_WEAPONLESS_LOOP

771
code/fgame/actor_turret.cpp
View file

File diff suppressed because it is too large Load diff