diff options
| author | Roman Tetelman <kevlarman@gmail.com> | 2009-10-03 12:21:08 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2013-01-03 00:15:52 +0000 |
| commit | a377106a6f71ecdfb8e80c012524bbb25ac6fa89 (patch) | |
| tree | 631fd7307c7fb0ffe24dc6e0f508634dde883b35 /src/game/bg_misc.c | |
| parent | 02a440cb75c13ca121cab6bc5c5810d31f5e6ee8 (diff) | |
* fix for not being able to sell ckit while repairing (fixes #21)
Diffstat (limited to 'src/game/bg_misc.c')
| -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; } |