diff options
| author | /dev/humancontroller <devhc@example.com> | 2015-06-14 15:31:28 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-03-09 13:51:17 +0100 |
| commit | 7d165fdd77b85ae93acd749a15051080ea3eb0cd (patch) | |
| tree | 0b49c581639bad4a6f1a20750cdf6a62e0862c1e /src/game | |
| parent | 25ea3c77d8ace5d8166e5e57bd0202658d8371d7 (diff) | |
after spawning, do not charge the lucifer cannon until all buttons are up
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/bg_pmove.c | 9 |
1 files changed, 5 insertions, 4 deletions
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 ) |