Fixed: "New armour bug: blue and green armour add" (see here http://s…

…ourceforge.net/tracker/?func=detail&aid=2734790&group_id=74815&atid=542099).
skyjake · May 2, 2009 · e19b768 · e19b768
1 parent 27bfc2d
commit e19b768
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/doomsday/plugins/jdoom/src/p_inter.c b/doomsday/plugins/jdoom/src/p_inter.c
@@ -219,7 +219,7 @@ boolean P_GiveArmor(player_t* plr, int type, int points)
         return false; // Don't pick up.
 
     P_PlayerSetArmorType(plr, type);
-    P_PlayerGiveArmorBonus(plr, points);
+    P_PlayerGiveArmorBonus(plr, points - plr->armorPoints);
 
     // Maybe unhide the HUD?
     ST_HUDUnHide(plr - players, HUE_ON_PICKUP_ARMOR);

diff --git a/doomsday/plugins/jheretic/src/p_inter.c b/doomsday/plugins/jheretic/src/p_inter.c
@@ -227,7 +227,7 @@ boolean P_GiveArmor(player_t* plr, int type, int points)
         return false;
 
     P_PlayerSetArmorType(plr, type);
-    P_PlayerGiveArmorBonus(plr, points);
+    P_PlayerGiveArmorBonus(plr, points - plr->armorPoints);
 
     // Maybe unhide the HUD?
     ST_HUDUnHide(plr - players, HUE_ON_PICKUP_ARMOR);

diff --git a/doomsday/plugins/jhexen/src/p_inter.c b/doomsday/plugins/jhexen/src/p_inter.c
@@ -508,7 +508,7 @@ boolean P_GiveArmor(player_t* plr, armortype_t type, int points)
     if(plr->armorPoints[type] >= points)
         return false;
 
-    P_PlayerGiveArmorBonus(plr, type, points);
+    P_PlayerGiveArmorBonus(plr, type, points - plr->armorPoints[type]);
 
     // Maybe unhide the HUD?
     ST_HUDUnHide(plr - players, HUE_ON_PICKUP_ARMOR);