From e554c1d3ea2d5336fad7da41491dfeee59de6e6b Mon Sep 17 00:00:00 2001
From: Paweł Redman <trem.redman@gmail.com>
Date: Sun, 15 Sep 2013 21:50:33 +0200
Subject: Battle suit + Helmet bugfix

---
 src/game/g_cmds.c | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/game/g_cmds.c b/src/game/g_cmds.c
index 3578b08..468dde0 100644
--- a/src/game/g_cmds.c
+++ b/src/game/g_cmds.c
@@ -2262,8 +2262,9 @@ void Cmd_Buy_f( gentity_t *ent )
       return;
     }
 
-    //have space to carry this?
-    if( !sellHelmet && BG_Upgrade( upgrade )->slots & BG_SlotsForInventory( ent->client->ps.stats ) )
+    if( BG_Upgrade( upgrade )->slots & BG_SlotsForInventory( ent->client->ps.stats ) &&
+        !( sellHelmet && ( BG_InventoryContainsUpgrade( UP_HELMET_MK1, ent->client->ps.stats ) ||
+                           BG_InventoryContainsUpgrade( UP_HELMET_MK2, ent->client->ps.stats ) ) ) )
     {
       G_TriggerMenu( ent->client->ps.clientNum, MN_H_NOSLOTS );
       return;
-- 
cgit