From 66cf5dd1d216b71899831fe8cbb676057c5757f7 Mon Sep 17 00:00:00 2001
From: James Haley
Date: Wed, 2 Mar 2011 00:51:07 +0000
Subject: Fixed automap background color, size of plrkilledmsg buffer, a bug
 which caused the scanner to never be depleted from the inventory, and
 emulation of seemingly inconsequential undefined behavior in P_XYMovement via
 use of negative numspechit is currently addressed by changing the branch
 condition to > 0.

Subversion-branch: /branches/strife-branch
Subversion-revision: 2286
---
 src/strife/p_user.c | 11 +----------
 1 file changed, 1 insertion(+), 10 deletions(-)

(limited to 'src/strife/p_user.c')

diff --git a/src/strife/p_user.c b/src/strife/p_user.c
index fa521ace..718eb119 100644
--- a/src/strife/p_user.c
+++ b/src/strife/p_user.c
@@ -884,19 +884,15 @@ boolean P_ItemBehavior(player_t* player, int item)
     {
     case SPR_ARM1:  // 136
         return P_GiveArmor(player, 2);
-        break;
 
     case SPR_ARM2:  // 137
         return P_GiveArmor(player, 1);
-        break;
 
     case SPR_SHD1:  // 186
         return P_GivePower(player, pw_invisibility);
-        break;
 
     case SPR_MASK:  // 187
         return P_GivePower(player, pw_ironfeet);
-        break;
 
     case SPR_PMUP:  // 191
         if(!player->powers[pw_allmap])
@@ -905,27 +901,22 @@ boolean P_ItemBehavior(player_t* player, int item)
             return false;
         }
         player->powers[pw_allmap] = PMUPTICS;
-        break;
+        return true; // haleyjd 20110228: repaired
 
     case SPR_STMP:  // 180
         return P_GiveBody(player, 10);
-        break;
 
     case SPR_MDKT:  // 181
         return P_GiveBody(player, 25);
-        break;
 
     case SPR_FULL:  // 130
         return P_GiveBody(player, 200);
-        break;
 
     case SPR_BEAC:  // 135
         return P_SpawnTeleportBeacon(player);
-        break;
 
     case SPR_TARG:  // 108
         return P_GivePower(player, pw_targeter);
-        break;
     }
 
     return false;
-- 
cgit v1.2.3