summaryrefslogtreecommitdiff
path: root/src/game/bg_pmove.c
diff options
context:
space:
mode:
Diffstat (limited to 'src/game/bg_pmove.c')
-rw-r--r--src/game/bg_pmove.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index 9141f472..b90db531 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -2682,6 +2682,12 @@ static void PM_Weapon( void )
}
else
pm->ps->pm_flags &= ~PMF_USE_ITEM_HELD;
+
+ if( pm->ps->weapon != pm->cmd.weapon && pm->ps->pm_flags & PMF_WEAPON_SWITCH )
+ {
+ pm->ps->pm_flags &= ~PMF_WEAPON_SWITCH;
+ PM_BeginWeaponChange( pm->cmd.weapon );
+ }
}
if( pm->ps->weaponTime > 0 )