From 25133e0afed7552c9c6135d148d16ff42e04c230 Mon Sep 17 00:00:00 2001
From: ChrisL <ChrisL@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Mon, 6 Jun 2011 19:44:37 +0000
Subject: [PATCH] BUGFIX 480 - When disarming a bomb when your inventory is
 full, the merc actually disarming the bomb will now be the active
 "ItemPointerSoldier".

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4476 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Tactical/Handle Items.cpp | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Tactical/Handle Items.cpp b/Tactical/Handle Items.cpp
index 4f61cf2b1..360a6e174 100644
--- a/Tactical/Handle Items.cpp	
+++ b/Tactical/Handle Items.cpp	
@@ -4780,6 +4780,8 @@ void BoobyTrapMessageBoxCallBack( UINT8 ubExitValue )
 					{
 						gpItemPointer = new OBJECTTYPE;
 						gTempObject.MoveThisObjectTo(*gpItemPointer,-1,gpBoobyTrapSoldier,NUM_INV_SLOTS,MAX_OBJECTS_PER_SLOT);
+						//CHRISL: Also make sure we list the ItemPointerSoldier as our BoobyTrapSoldier
+						gpItemPointerSoldier = gpBoobyTrapSoldier;
 					}
 					// OJW - 20091029 - disarm explosives
 					if (is_networked && is_client)