HAM5.5b2 merged in!

Notes:
-There may still be bugs!! (In fact, I almost guarantee it -- there's
-Ammo box code added to HR's crate code
-Splitting a crate/box also automatically refills half empty magazines
-new pathing arrows for map screen not included
-code for scouts to know where enemies are going doesn't appear to work... but i'm not sure it was completed.
-lots of gobledy gook (chinese?) comments turned back to english
-also added Bob's popups
-other languages besides english still need to have there language.cpp files updated with array changes
-AI enhancements by Warmsteel (reloading, suppression, roaming, avoiding gas, and other fixes)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5181 3b4a5df2-a311-0410-b5c6-a8a6f20db521

Strategic/Map Screen Interface Border.cpp

@@ -28,8 +28,12 @@
 	// Also include Town Militia for checks regarding Mobile Militia Restrictions
 	#include "Town Militia.h"
 	// Also include Quests, for checking whether a fact is true.
-	#include "Quests.h"
+	#include "Quests.h"	
+	// HEADROCK HAM 5: Required for inventory filter popup
+	#include "popup_callback.h"
+	#include "popup_class.h"
 #endif
+
 #include "connect.h"
 
 #ifdef JA2UB
@@ -91,6 +95,13 @@ BOOLEAN fZoomFlag = FALSE;
 //BOOLEAN fCursorIsOnMapScrollButtons = FALSE;
 //BOOLEAN fDisabledMapBorder = FALSE;
 
+// HEADROCK HAM 5: Externed here to be able to forgo redrawing the map inventory.
+extern POPUP* gMapInventoryFilterPopup;
+extern BOOLEAN gfMapInventoryFilterPopupVisible;
+extern BOOLEAN gfQueueRecreateMapInventoryFilterMenu;
+extern UINT32 guiMapInvenFilterButton[ 9 ];
+extern void CreateMapInventoryFilterMenu( );
+
 
 // buttons & button images
 // HEADROCK HAM 4: Increase both arrays by one to accomodate new Mobile Restrictions button
@@ -210,17 +221,29 @@ void RenderMapBorder( void )
 	}
 */
 
+	// HEADROCK HAM 5: Do not redraw if the filter menu is open.
 	if( fShowMapInventoryPool )
 	{
-		// render background, then leave
-		BlitInventoryPoolGraphic( );
+		if (gfMapInventoryFilterPopupVisible)
+		{
+			if (gfQueueRecreateMapInventoryFilterMenu)
+			{
+				ButtonList[guiMapInvenFilterButton[ 0 ]]->uiFlags |= (BUTTON_CLICKED_ON);
+				CreateMapInventoryFilterMenu();
+			}
+			gMapInventoryFilterPopup->show();
+		}
+		else
+		{
+			// render background, then leave
+			BlitInventoryPoolGraphic( );
+		}
 		return;
 	}
 
 	// get and blt border
 	GetVideoObject(&hHandle, guiMapBorder );
 	// HEADROCK HAM 4: Load different map border depending on whether we want to display the mobile militia button or not.
-
 	if (gGameExternalOptions.gfAllowMilitiaGroups)
 	{
 		BltVideoObject( guiSAVEBUFFER , hHandle, 1, xResOffset + MAP_BORDER_X, MAP_BORDER_Y, VO_BLT_SRCTRANSPARENCY,NULL );