- New feature: Remove attachments and unload all weapons in sector (Shift+F)

- Fix for grenade launchers (allow reloading with valid ammunition only)
- Fix for stacking items in sector



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

Utils/Text Utils.cpp

@@ -247,8 +247,8 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 				}
 				#endif
 
-		#ifdef POLISH
-			switch( pNameString[ i ] )
+				#ifdef POLISH
+				switch( pNameString[ i ] )
 				{
 					case 260:		pInfoString[ i ] = 165;		break;
 					case 262:		pInfoString[ i ] = 198;		break;
@@ -271,10 +271,10 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 					case 380:		pInfoString[ i ] = 191;		break;
 					case 378:		pInfoString[ i ] = 376;		break;
 				}
-			#endif
+				#endif
 
 
-			#ifdef RUSSIAN
+				#ifdef RUSSIAN
 				if ((unsigned char)Item[ubIndex].szItemDesc [j] == 208) //d0
 				{
 					// This character determines the special character
@@ -372,8 +372,7 @@ BOOLEAN LoadItemInfo(UINT16 ubIndex, STR16 pNameString, STR16 pInfoString )
 				//	}
 				//}
 			#endif
-
-		}
+			}
 			else
 			{
 				pInfoString[i] ='\0';

Utils/Text.h

@@ -549,6 +549,7 @@ enum
 	DOOR_IS_BUSY,
   VEHICLE_VITAL_STATS_POPUPTEXT,
   NO_LOS_TO_TALK_TARGET,
+	ATTACHMENT_REMOVED,
 };
 
 enum{

Utils/_DutchText.cpp

@@ -1406,6 +1406,7 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Iemand anders probeert deze deur te gebruiken.",		// L"Somebody else is trying to use this door.",
 	L"Gezondheid: %d/%d\nBrandstof: %d/%d",				//L"Health: %d/%d\nFuel: %d/%d",
 	L"%s kan %s niet zien.",					// Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_EnglishText.cpp

@@ -1406,7 +1406,8 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Lock destroyed",
 	L"Somebody else is trying to use this door.",
 	L"Health: %d/%d\nFuel: %d/%d",
-  L"%s cannot see %s.",  // Cannot see person trying to talk to
+	L"%s cannot see %s.",  // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_FrenchText.cpp

@@ -1395,7 +1395,8 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Verrou détruit",
 	L"Quelqu'un d'autre veut essayer sur cette porte.",
 	L"Etat : %d/%d\nCarburant : %d/%d",
-L"%s ne peut pas voir %s.",  // Cannot see person trying to talk to
+	L"%s ne peut pas voir %s.",  // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_GermanText.cpp

@@ -1370,6 +1370,7 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Noch jemand an der Tür.",
 	L"Gesundh.: %d/%d\nTank: %d/%d",
 	L"%s kann %s nicht sehen.", // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_ItalianText.cpp

@@ -1389,7 +1389,8 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Serratura distrutta",
 	L"Qualcun altro sta provando a utilizzare questa porta.",
 	L"Salute: %d/%d\nCarburante: %d/%d",
-  L"%s non riesce a vedere %s.",  // Cannot see person trying to talk to
+	L"%s non riesce a vedere %s.",  // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_PolishText.cpp

@@ -1389,7 +1389,8 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Zamek zosta³ zniszczony",
 	L"Ktoœ inny majstruje przy tych drzwiach.",
 	L"Stan: %d/%d\nPaliwo: %d/%d",
-  L"%s nie widzi - %s.",  // Cannot see person trying to talk to
+	L"%s nie widzi - %s.",  // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.

Utils/_RussianText.cpp

@@ -1397,7 +1397,8 @@ wchar_t TacticalStr[][ MED_STRING_LENGTH ] =
 	L"Çàìîê ðàçðóøåí",
 	L"Êòî-òî åùå ïûòàåòñÿ âîñïîëüçîâ.ýòîé äâåðüþ.",
 	L"Çäîðîâüå: %d/%d\nÁåíç: %d/%d",
-  L"%s íå âèäèò %s.",  // Cannot see person trying to talk to
+	L"%s íå âèäèò %s.",  // Cannot see person trying to talk to
+	L"Attachment removed",
 };
 
 //Varying helptext explains (for the "Go to Sector/Map" checkbox) what will happen given different circumstances in the "exiting sector" interface.