about summary refs log tree commit diff
path: root/src/game/server/gs_common.h
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-15 12:04:48 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-15 12:04:48 +0000
commit1ba4e8d4ef42c26ce1dd496658bf6e48893ca4f4 (patch)
treef74f4387841e3f24e24b7aee602aa4afb7d3043c /src/game/server/gs_common.h
parenta3c5960ffedccf31ba2f133c88ed1533038e7f92 (diff)
downloadzcatch-1ba4e8d4ef42c26ce1dd496658bf6e48893ca4f4.tar.gz
zcatch-1ba4e8d4ef42c26ce1dd496658bf6e48893ca4f4.zip
some renames and sniper stuff
Diffstat (limited to 'src/game/server/gs_common.h')
-rw-r--r--src/game/server/gs_common.h5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/game/server/gs_common.h b/src/game/server/gs_common.h
index 93264f9f..7df0a9c4 100644
--- a/src/game/server/gs_common.h
+++ b/src/game/server/gs_common.h
@@ -234,7 +234,6 @@ public:
 		int ammo;
 		int ammocost;
 		int weaponstage;
-		int chargetick;
 		bool got;
 	} weapons[NUM_WEAPONS];
 	int active_weapon;
@@ -243,6 +242,8 @@ public:
 	int reload_timer;
 	int attack_tick;
 	
+	int sniper_chargetick;
+	
 	int damage_taken;
 
 	int emote_type;
@@ -270,7 +271,7 @@ public:
 
 	// ninja
 	vec2 activationdir;
-	int ninjaactivationtick;
+	int ninja_activationtick;
 	int extrapowerflags;
 	int currentcooldown;
 	int currentactivation;