summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorPaweł Redman <pawel.redman@gmail.com>2015-04-12 19:24:07 +0200
committerPaweł Redman <pawel.redman@gmail.com>2015-04-12 19:24:07 +0200
commitf7b5399b8abc2fc63f5c8d1e021fbe9f449944d0 (patch)
treedc0a81c65cb6a8e9c3cfff0a3a1ce384e550b50a /src/game
parent6e5d06b186d4360b900972800de7a7c82dac17a7 (diff)
Fix Mass Driver not being able to fire while zoomed.
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 051f6e6..49eb793 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -3430,6 +3430,11 @@ static void PM_Weapon( void )
case WP_MASS_DRIVER:
+ if( pm->ps->ammo > 6 && attack3 )
+ attack3 = attack2 = qtrue;
+ else
+ attack2 = attack3 = qfalse;
+
//attack2 is handled on the client for zooming (cg_view.c)
if( !attack1 )
{