diff options
| author | /dev/humancontroller <devhc@example.com> | 2014-07-13 21:04:39 +0200 |
|---|---|---|
| committer | /dev/humancontroller <devhc@example.com> | 2017-03-09 13:51:14 +0100 |
| commit | 11dd8874c42785feaf020679320ae9de7e226adb (patch) | |
| tree | 3146d6f8a1c1f895b45f8aba1423a76bb973111e | |
| parent | f5dd3837b18ed9892c1932383c3f85f75fa7dbfe (diff) | |
do not force lucifer cannon users to stop attacking in order to charge again
| -rw-r--r-- | src/game/bg_pmove.c | 16 | ||||
| -rw-r--r-- | src/game/bg_public.h | 1 |
2 files changed, 2 insertions, 15 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c index 62db61fe..2590b4cd 100644 --- a/src/game/bg_pmove.c +++ b/src/game/bg_pmove.c @@ -2953,7 +2953,7 @@ static void PM_Weapon( void ) if( pm->ps->weapon == WP_LUCIFER_CANNON ) { // Charging up - if( !pm->ps->weaponTime && pm->ps->weaponstate != WEAPON_NEEDS_RESET && + if( !pm->ps->weaponTime && ( pm->cmd.buttons & BUTTON_ATTACK ) ) { pm->ps->stats[ STAT_MISC ] += pml.msec; @@ -3134,14 +3134,6 @@ static void PM_Weapon( void ) case WP_LUCIFER_CANNON: attack3 = qfalse; - - // Prevent firing of the Lucifer Cannon after an overcharge - if( pm->ps->weaponstate == WEAPON_NEEDS_RESET ) - { - if( attack1 ) - return; - pm->ps->weaponstate = WEAPON_READY; - } // Can't fire secondary while primary is charging if( attack1 || pm->ps->stats[ STAT_MISC ] > 0 ) @@ -3157,9 +3149,6 @@ static void PM_Weapon( void ) pm->ps->weaponstate = WEAPON_READY; return; } - - // Overcharge - pm->ps->weaponstate = WEAPON_NEEDS_RESET; } if( pm->ps->stats[ STAT_MISC ] > LCANNON_CHARGE_TIME_MIN ) @@ -3362,8 +3351,7 @@ static void PM_Weapon( void ) pm->ps->torsoTimer = TIMER_ATTACK; } - if( pm->ps->weaponstate != WEAPON_NEEDS_RESET ) - pm->ps->weaponstate = WEAPON_FIRING; + pm->ps->weaponstate = WEAPON_FIRING; // take an ammo away if not infinite if( !BG_Weapon( pm->ps->weapon )->infiniteAmmo || diff --git a/src/game/bg_public.h b/src/game/bg_public.h index 77aed5fe..04659ebb 100644 --- a/src/game/bg_public.h +++ b/src/game/bg_public.h @@ -136,7 +136,6 @@ typedef enum WEAPON_DROPPING, WEAPON_FIRING, WEAPON_RELOADING, - WEAPON_NEEDS_RESET, } weaponstate_t; // pmove->pm_flags |