From 7d165fdd77b85ae93acd749a15051080ea3eb0cd Mon Sep 17 00:00:00 2001
From: /dev/humancontroller <devhc@example.com>
Date: Sun, 14 Jun 2015 15:31:28 +0200
Subject: after spawning, do not charge the lucifer cannon until all buttons
 are up

---
 src/game/bg_pmove.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 70c69809..0322fb1d 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2913,6 +2913,11 @@ static void PM_Weapon( void )
 
   // Charging up a Lucifer Cannon
   pm->ps->eFlags &= ~EF_WARN_CHARGE;
+
+  // don't allow attack until all buttons are up
+  if( pm->ps->pm_flags & PMF_RESPAWNED )
+    return;
+
   if( pm->ps->weapon == WP_LUCIFER_CANNON )
   {
     // Charging up
@@ -2933,10 +2938,6 @@ static void PM_Weapon( void )
       pm->ps->eFlags |= EF_WARN_CHARGE;
   }
 
-  // don't allow attack until all buttons are up
-  if( pm->ps->pm_flags & PMF_RESPAWNED )
-    return;
-
   // no bite during pounce
   if( ( pm->ps->weapon == WP_ALEVEL3 || pm->ps->weapon == WP_ALEVEL3_UPG )
       && ( pm->cmd.buttons & BUTTON_ATTACK )
-- 
cgit