From dcaa44bdd2691e5b6b3a79e16327099621162a0d Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Tue, 11 Oct 2011 14:46:27 +0000
Subject: [PATCH] - Fixed 'Subtotal' disappearing in BR when all items out of
 stock/not available yet (by Buggler) - Added new shortcut 'u' which opens
 selected sector inventory screen when item filter is active in strategic
 screen (by Buggler)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@4698 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Laptop/BobbyRGuns.cpp   | 26 +++++++++++++-------------
 Strategic/mapscreen.cpp | 33 ++++++++++++++++-----------------
 2 files changed, 29 insertions(+), 30 deletions(-)

diff --git a/Laptop/BobbyRGuns.cpp b/Laptop/BobbyRGuns.cpp
index fcb2e6f70..631b9e7b1 100644
--- a/Laptop/BobbyRGuns.cpp
+++ b/Laptop/BobbyRGuns.cpp
@@ -1346,6 +1346,19 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
 	PosY = BOBBYR_GRID_PIC_Y;
 	usTextPosY = BOBBYR_ITEM_DESC_START_Y;
 
+	//Display the subtotal at the bottom of the screen
+	swprintf( sDollarTemp, L"%d", CalculateTotalPurchasePrice() );
+	InsertCommasForDollarFigure( sDollarTemp );
+	InsertDollarSignInToString( sDollarTemp );
+	swprintf( sTemp, L"%s %s", BobbyRText[BOBBYR_GUNS_SUB_TOTAL], sDollarTemp );
+	DrawTextToScreen(sTemp, BOBBYR_ORDER_SUBTOTAL_X, BOBBYR_ORDER_SUBTOTAL_Y, 0, BOBBYR_ORDER_TITLE_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
+
+	//Display the Used item disclaimer
+	if( gfOnUsedPage )
+	{
+		DrawTextToScreen( BobbyRText[BOBBYR_GUNS_PERCENT_FUNCTIONAL], BOBBYR_PERCENT_FUNTCIONAL_X, BOBBYR_PERCENT_FUNTCIONAL_Y, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
+	}
+
 //	InitFirstAndLastGlobalIndex( uiItemClass );
 
 	//if there are no items then return
@@ -1651,19 +1664,6 @@ BOOLEAN DisplayItemInfo(UINT32 uiItemClass, INT32 iFilter)
 		gusOldItemNumOnTopOfPage = gusCurWeaponIndex;
 	}
 
-	//Display the subtotal at the bottom of the screen
-	swprintf( sDollarTemp, L"%d", CalculateTotalPurchasePrice() );
-	InsertCommasForDollarFigure( sDollarTemp );
-	InsertDollarSignInToString( sDollarTemp );
-	swprintf( sTemp, L"%s %s", BobbyRText[BOBBYR_GUNS_SUB_TOTAL], sDollarTemp );
-	DrawTextToScreen(sTemp, BOBBYR_ORDER_SUBTOTAL_X, BOBBYR_ORDER_SUBTOTAL_Y, 0, BOBBYR_ORDER_TITLE_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
-
-	//Display the Used item disclaimer
-	if( gfOnUsedPage )
-	{
-		DrawTextToScreen( BobbyRText[BOBBYR_GUNS_PERCENT_FUNCTIONAL], BOBBYR_PERCENT_FUNTCIONAL_X, BOBBYR_PERCENT_FUNTCIONAL_Y, 0, BOBBYR_ITEM_DESC_TEXT_FONT, BOBBYR_ORDER_TEXT_COLOR, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED | TEXT_SHADOWED);
-	}
-
 	return(TRUE);
 }
 
diff --git a/Strategic/mapscreen.cpp b/Strategic/mapscreen.cpp
index d38e1cf32..eee33931e 100644
--- a/Strategic/mapscreen.cpp
+++ b/Strategic/mapscreen.cpp
@@ -7554,24 +7554,13 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 						{
 							fDisableJustForIan = ! fDisableJustForIan;
 						}
-						else
-						{
-							// only handle border button keyboard equivalents if the button is visible!
-							if ( !fShowMapInventoryPool )
-							{
-								ToggleItemsFilter();
-							}
-						}
-					#else
-						// only handle border button keyboard equivalents if the button is visible!
-						if ( !fShowMapInventoryPool )
-						{
-							ToggleItemsFilter();
-						}
 					#endif
-
+					// only handle border button keyboard equivalents if the button is visible!
+					if ( !fShowMapInventoryPool )
+					{
+						ToggleItemsFilter();
+					}
 					break;
-
 				case 'K':
 					//CHRISL: Swap gunsling
 					if ( bSelectedInfoChar != -1 && fShowInventoryFlag && UsingNewInventorySystem() == true )
@@ -7897,7 +7886,17 @@ void GetMapKeyboardInput( UINT32 *puiNewEvent )
 						}
 					}
 					#endif
-					break;
+					// open selected sector inventory screen
+					// if showing item counts on the map, and not already in sector inventory
+					if ( fShowItemsFlag && !fShowMapInventoryPool )
+					{
+						// show sector inventory for selected sector
+						ChangeSelectedMapSector( sSelMapX, sSelMapY, ( INT8 ) iCurrentMapSectorZ );
+
+						fShowMapInventoryPool = TRUE;
+						CreateDestroyMapInventoryPoolButtons( TRUE );
+					}
+					break;				
 				case 'v':
 					if( fCtrl )
 					{