summaryrefslogtreecommitdiff
path: root/src/game
diff options
context:
space:
mode:
authorChristopher Schwarz <lakitu7@gmail.com>2011-06-09 21:28:11 +0000
committerTim Angus <tim@ngus.net>2013-01-03 00:18:08 +0000
commit655f1d1b608df44ecc03f0dba43165f351261019 (patch)
treed917d65dfb108ee8fd495b63194b14de8c4c8730 /src/game
parenta5139cb92c25b89644db24cb8c58ceabde9dbb80 (diff)
* (bug 4267) Fix ob1 in weapons code in pmove (/dev/humancontroller)
Diffstat (limited to 'src/game')
-rw-r--r--src/game/bg_pmove.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/game/bg_pmove.c b/src/game/bg_pmove.c
index a003330c..16c49726 100644
--- a/src/game/bg_pmove.c
+++ b/src/game/bg_pmove.c
@@ -3017,13 +3017,13 @@ static void PM_Weapon( void )
{
if( !( pm->ps->pm_flags & PMF_USE_ITEM_HELD ) )
{
- if( pm->cmd.weapon <= 32 )
+ if( pm->cmd.weapon < 32 )
{
//if trying to select a weapon, select it
if( pm->ps->weapon != pm->cmd.weapon )
PM_BeginWeaponChange( pm->cmd.weapon );
}
- else if( pm->cmd.weapon > 32 )
+ else
{
//if trying to toggle an upgrade, toggle it
if( BG_InventoryContainsUpgrade( pm->cmd.weapon - 32, pm->ps->stats ) ) //sanity check