From 8c93744eb3bce4326f5dd287171ed9d780745264 Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Wed, 19 Dec 2007 21:04:55 +0000 Subject: fixed problem with autofire and no ammo --- src/game/server/gs_server.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/game/server/gs_server.cpp') 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) -- cgit 1.4.1