diff options
| -rw-r--r-- | src/game/bg_misc.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/game/bg_misc.c b/src/game/bg_misc.c index dab1eff9..ad4a1d3f 100644 --- a/src/game/bg_misc.c +++ b/src/game/bg_misc.c @@ -3376,11 +3376,15 @@ BG_PlayerCanChangeWeapon */ qboolean BG_PlayerCanChangeWeapon( playerState_t *ps ) { + // Can always change from ckit + if( ps->weapon == WP_HBUILD ) + return qtrue; + // Do not allow Lucifer Cannon "canceling" via weapon switch if( ps->weapon == WP_LUCIFER_CANNON && ps->stats[ STAT_MISC ] > LCANNON_CHARGE_TIME_MIN ) return qfalse; - + return ps->weaponTime <= 0 || ps->weaponstate != WEAPON_FIRING; } |