about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-19 21:04:55 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-12-19 21:04:55 +0000
commit8c93744eb3bce4326f5dd287171ed9d780745264 (patch)
treed384912fa4562eff76631ea8df06af37bdbf8d29 /src/game
parent4880814f3061ef2ad85404d57799d17f7ede74ba (diff)
downloadzcatch-8c93744eb3bce4326f5dd287171ed9d780745264.tar.gz
zcatch-8c93744eb3bce4326f5dd287171ed9d780745264.zip
fixed problem with autofire and no ammo
Diffstat (limited to 'src/game')
-rw-r--r--src/game/server/gs_server.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index fa8b38d5..c969de1a 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -1000,7 +1000,7 @@ int player::handle_weapons()
 		if(active_weapon == WEAPON_ROCKET || active_weapon == WEAPON_SHOTGUN)
 			fullauto = true;
 		
-		if(count_input(previnput.fire, input.fire).presses || (fullauto && input.fire&1))
+		if(count_input(previnput.fire, input.fire).presses || ((fullauto && input.fire&1) && weapons[active_weapon].ammo))
 		{
 			// fire!
 			if(weapons[active_weapon].ammo)