diff options
Diffstat (limited to 'src/game/server/game_server.h')
| -rw-r--r-- | src/game/server/game_server.h | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/src/game/server/game_server.h b/src/game/server/game_server.h index ec3d597a..46b451e1 100644 --- a/src/game/server/game_server.h +++ b/src/game/server/game_server.h @@ -112,6 +112,7 @@ class gameobject : public entity int sudden_death; public: + int gametype; gameobject(); virtual void post_reset(); virtual void tick(); @@ -190,11 +191,21 @@ 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, + }; + // weapon info + entity* hitobjects[10]; + int numobjectshit; struct weaponstat { - bool got; + int ammoregenstart; int ammo; + bool got; } weapons[NUM_WEAPONS]; int active_weapon; int reload_timer; @@ -219,6 +230,14 @@ public: int health; int armor; + // ninja + baselib::vec2 activationdir; + int ninjaactivationtick; + int extrapowerflags; + int currentcooldown; + int currentactivation; + int currentmovetime; + int score; bool dead; @@ -251,7 +270,8 @@ public: void release_hooked(); void release_hooks(); - void handle_weapons(); + int handle_weapons(); + int handle_ninja(); virtual void tick(); virtual void tick_defered(); |