MERGED bugfixes from revision: 4987

- Bugfix: Fixed crash, when you are in tactical turn based and you show the item description from a sector inventory item and then you close the sector inventory when the item description is still open
o Now you have to close the item description box first. A message box will output you the error and you can't close the sector inventory when the item description box is open

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

Strategic/Map Screen Interface Map Inventory.cpp

@@ -1705,16 +1705,23 @@ void MapInventoryPoolDoneBtn( GUI_BUTTON *btn, INT32 reason )
 {
 	if(reason & MSYS_CALLBACK_REASON_LBUTTON_DWN )
 	{
-	  btn->uiFlags|=(BUTTON_CLICKED_ON);
+		btn->uiFlags|=(BUTTON_CLICKED_ON);
 	}
 	else if(reason & MSYS_CALLBACK_REASON_LBUTTON_UP )
-  {
+	{
-    if (btn->uiFlags & BUTTON_CLICKED_ON)
+		if (btn->uiFlags & BUTTON_CLICKED_ON)
 		{
-      btn->uiFlags&=~(BUTTON_CLICKED_ON);
+			btn->uiFlags&=~(BUTTON_CLICKED_ON);
 
-			// done
+			if (gfInItemDescBox)
-			fShowMapInventoryPool = FALSE;
+			{
+				DoMapMessageBox( MSG_BOX_BASIC_STYLE, gzLateLocalizedString[64], MAP_SCREEN, MSG_BOX_FLAG_OK, NULL );
+			}
+			else
+			{
+				// done
+				fShowMapInventoryPool = FALSE;
+			}
 		}
 	}
 }

Utils/_ChineseText.cpp

@@ -5963,6 +5963,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s的陶瓷片已经粉碎了!",	//"%s's ceramic plates have been smashed!",
 	L"%s多打了%d发子弹！",	//"%s fires %d more rounds than intended!",
 	L"%s多打了1发子弹！",	//"%s fires %d more round than intended!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 // HEADROCK HAM 3.5: Added sector name

Utils/_DutchText.cpp

@@ -5964,6 +5964,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s's armour attachment has been smashed!",
 	L"%s fires %d more rounds than intended!",
 	L"%s fires one more round than intended!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_EnglishText.cpp

@@ -5961,6 +5961,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s's armour attachment has been smashed!",
 	L"%s fires %d more rounds than intended!",
 	L"%s fires one more round than intended!",
+
+	L"You need to close the item description box first!",
 };
 
 // HEADROCK HAM 3.5: Added sector name

Utils/_FrenchText.cpp

@@ -5946,6 +5946,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s: attachement de protection détruit !",
 	L"%s tire %d fois de plus que prévu !",
 	L"%s tire 1 fois de plus que prévu !",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_GermanText.cpp

@@ -5793,6 +5793,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s's Rüstungsverstärkung wurde zertrümmert!",
 	L"%s feuert %d Schüsse mehr als beabsichtigt!",
 	L"%s feuert einen Schuss mehr als beabsichtigt!",
+
+	L"Sie müssen zuerst das Gegenstandsbeschreibungsfenster schließen!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_ItalianText.cpp

@@ -5953,6 +5953,8 @@ STR16 gzLateLocalizedString[] =
   L"%s's armour attachment has been smashed!",
 	L"%s fires %d more rounds than intended!",
 	L"%s fires one more round than intended!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_PolishText.cpp

@@ -5959,6 +5959,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s: dodatki do pancerza zostały zniszczone!",
 	L"%s wystrzelił(a) %d pocisk(ów) więcej niż to było zamierzone!",
 	L"%s wystrzelił(a) 1 pocisk(ów) więcej niż to było zamierzone!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_RussianText.cpp

@@ -5939,6 +5939,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s чувствует что в бронежилете что-то треснуло!",
 	L"%s выпустил на %d больше пуль!",
 	L"%s выпустил на одну пулю больше!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] = 

Utils/_TaiwaneseText.cpp

@@ -5966,6 +5966,8 @@ STR16 gzLateLocalizedString[] =
 	L"%s's armour attachment has been smashed!",
 	L"%s fires %d more rounds than intended!",
 	L"%s fires one more round than intended!",
+
+	L"You need to close the item description box first!",	// TODO.Translate
 };
 
 STR16 gzCWStrings[] =