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>2008-03-29 18:40:18 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2008-03-29 18:40:18 +0000
commite822830056e8e6bdefdf2e77db819c9ac67311f4 (patch)
treebd0e92094b629b322ab4d6ca68dbeed3370f8649 /src/game/server/gs_common.h
parent370cbbe79f8dbc8ef00dca28e27480c05789670f (diff)
downloadzcatch-e822830056e8e6bdefdf2e77db819c9ac67311f4.tar.gz
zcatch-e822830056e8e6bdefdf2e77db819c9ac67311f4.zip
fixed some weapon switching issues
Diffstat (limited to 'src/game/server/gs_common.h')
-rw-r--r--src/game/server/gs_common.h6
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/server/gs_common.h b/src/game/server/gs_common.h
index 5986c17a..efebe384 100644
--- a/src/game/server/gs_common.h
+++ b/src/game/server/gs_common.h
@@ -254,7 +254,8 @@ public:
 	
 	int active_weapon;
 	int last_weapon;
-	int wanted_weapon;
+	int queued_weapon;
+	
 	int reload_timer;
 	int attack_tick;
 	
@@ -335,6 +336,9 @@ public:
 	
 	void set_weapon(int w);
 	
+	void handle_weaponswitch();
+	void do_weaponswitch();
+	
 	int handle_weapons();
 	int handle_ninja();