about summary refs log tree commit diff
path: root/src/game/server/gs_server.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/server/gs_server.cpp')
-rw-r--r--src/game/server/gs_server.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp
index 530727f6..a45e52ab 100644
--- a/src/game/server/gs_server.cpp
+++ b/src/game/server/gs_server.cpp
@@ -920,9 +920,13 @@ int player::handle_weapons()
 		return handle_sniper();
 	*/
 
-	if(count_input(previnput.fire, input.fire).presses) //previnput.fire != input.fire && (input.fire&1))
+	if(reload_timer == 0)
 	{
-		if(reload_timer == 0)
+		bool fullauto = false;
+		if(active_weapon == WEAPON_ROCKET || active_weapon == WEAPON_SHOTGUN)
+			fullauto = true;
+		
+		if(count_input(previnput.fire, input.fire).presses || (fullauto && input.fire&1))
 		{
 			// fire!
 			if(weapons[active_weapon].ammo)