From 9bc09aff3ddc0b9d7fd23694fa5fe2a536481143 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sat, 16 Nov 2013 18:35:55 +0000
Subject: [PATCH] - Multiplayer Bugfix: Fixed M.E.R.C inventory glitches on
 laptop site

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6615 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/AimMembers.cpp  |  21 ---------------------
 Laptop/mercs Files.cpp | Bin 142006 -> 141862 bytes
 2 files changed, 21 deletions(-)

diff --git a/Laptop/AimMembers.cpp b/Laptop/AimMembers.cpp
index 5cd94c46..133731a1 100644
--- a/Laptop/AimMembers.cpp
+++ b/Laptop/AimMembers.cpp
@@ -1582,12 +1582,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 		UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y;
 		PosX = WEAPONBOX_X_NSGI+3;		// + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
 		PosY = WEAPONBOX_Y_NSGI;
-		if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
-		{
-			PosX+=0;
-			PosY+=24;
-			wnameY-=26;
-		}
 
 		//tais: disable Weaponbox Mouseregions to stop crashing when changing kit selection and hovering over item
 		//tooltips for weaponbox
@@ -1649,15 +1643,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 				SetRegionHelpEndCallback( &(gWeaponboxFasthelpRegion[ubItemCount-1]), HelpTextDoneCallback );
 				MSYS_EnableRegion( &gWeaponboxFasthelpRegion[ubItemCount-1] );
 
-				// WANNE: In a multiplayer game also display the items name on the MERC website
-				if (is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
-				{
-					//if this will only be a single line, center it in the box
-					if( ( DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED | DONT_DISPLAY_TEXT ) / GetFontHeight( AIM_M_WEAPON_TEXT_FONT ) ) == 1 )
-						DisplayWrappedString( (UINT16)(PosX-1), (UINT16)(wnameY+GetFontHeight( AIM_M_WEAPON_TEXT_FONT )/2), AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
-					else
-						DisplayWrappedString( (UINT16)(PosX-1), wnameY, AIM_MEMBER_WEAPON_NAME_WIDTH, 2, AIM_M_WEAPON_TEXT_FONT, AIM_M_WEAPON_TEXT_COLOR,	gzItemName, FONT_MCOLOR_BLACK, FALSE, CENTER_JUSTIFIED );
-				}
 
 				if(ubColumnCount == WEAPONBOX_COLUMNS) 
 				{
@@ -1679,12 +1664,6 @@ BOOLEAN DisplayMercsInventory(UINT8 ubMercID)
 		UINT16 wnameY = AIM_MEMBER_WEAPON_NAME_Y;
 		PosX = WEAPONBOX_X+3;		// + 3 ( 1 to take care of the shadow, +2 to get past the weapon box border )
 		PosY = WEAPONBOX_Y;
-		if(is_networked && guiCurrentLaptopMode == LAPTOP_MODE_MERC_FILES)
-		{
-			PosX+=20;
-			PosY-=28;
-			wnameY-=28;
-		}
 
 		for(i=0; i<gMercProfiles[ubMercID].inv.size(); i++)
 		{
diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp
index ae24855beadbc5add0f2febcd90bd010658fbc50..69ea13c9f93f436d67bead8d714f7c1256072346 100644
GIT binary patch
delta 33
rcmV++0N($$)d;542%xH$1P%cbvw*7VdY8Uz0TPFvB>}gdB?1@)`|}MI

delta 75
zcmV-R0JQ(6)CjiK2%xF~36t-&BL@ut3IGWJ36lZ48I!28DwmcG0TPo=<T{g(ty;6D
hs#bajCIBV?AOInkUvvQ*lLV6zhYlqHw+<x&7zOo@7uEm(