diff options
Diffstat (limited to 'src/game/server/gs_common.h')
| -rw-r--r-- | src/game/server/gs_common.h | 37 |
1 files changed, 10 insertions, 27 deletions
diff --git a/src/game/server/gs_common.h b/src/game/server/gs_common.h index 2c7b7920..8c4509a2 100644 --- a/src/game/server/gs_common.h +++ b/src/game/server/gs_common.h @@ -216,19 +216,6 @@ class player : public entity { public: static const int phys_size = 28; - - enum // what are these? - { - MODIFIER_RETURNFLAGS_OVERRIDEVELOCITY = 1 << 0, - MODIFIER_RETURNFLAGS_OVERRIDEPOSITION = 1 << 1, - MODIFIER_RETURNFLAGS_OVERRIDEGRAVITY = 1 << 2, - - MODIFIER_RETURNFLAGS_NOHOOK = 1 << 3, - - - WEAPONSTAGE_SNIPER_NEUTRAL = 0, - WEAPONSTAGE_SNIPER_CHARGING = 1, - }; // weapon info entity* hitobjects[10]; @@ -238,23 +225,21 @@ public: int ammoregenstart; int ammo; int ammocost; - int weaponstage; bool got; } weapons[NUM_WEAPONS]; + int active_weapon; int last_weapon; int wanted_weapon; int reload_timer; int attack_tick; - int sniper_chargetick; - int damage_taken; int emote_type; int emote_stop; - int last_action; + int last_action; // last tick that the player took any action ie some input // int client_id; @@ -263,7 +248,6 @@ public: int color_body; int color_feet; - // these are non-heldback inputs player_input latest_previnput; player_input latest_input; @@ -280,17 +264,18 @@ public: int armor; // ninja - vec2 activationdir; - int ninja_activationtick; - int extrapowerflags; - int currentcooldown; - int currentactivation; - int currentmovetime; + struct + { + vec2 activationdir; + int activationtick; + int currentcooldown; + int currentmovetime; + } ninja; // int score; int team; - int state; + int player_state; // if the client is chatting, accessing a menu or so bool spawning; bool dead; @@ -325,8 +310,6 @@ public: int handle_weapons(); int handle_ninja(); - int handle_sniper(); - int handle_bomb(); virtual void tick(); virtual void tick_defered(); |