Merged from revision: 6761

- Campaign Stats: Externalized hard coded "and" text to language specific text files

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

Laptop/CampaignStats.cpp

@@ -430,15 +430,15 @@ Incident_Stats::GetAttackerDirString( BOOLEAN fAttacker )
 	switch ( dirs )
 	{
 	case 4:
-		swprintf(helperstr, L"%s, %s, %s and %s", dir1, dir2, dir3, dir4 );
+		swprintf(helperstr, L"%s, %s, %s %s %s", dir1, dir2, dir3, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_AND], dir4 );
 		break;
 
 	case 3:
-		swprintf(helperstr, L"%s, %s and %s", dir1, dir2, dir3 );
+		swprintf(helperstr, L"%s, %s %s %s", dir1, dir2, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_AND], dir3 );
 		break;
 
 	case 2:
-		swprintf(helperstr, L"%s and %s", dir1, dir2 );
+		swprintf(helperstr, L"%s %s %s", dir1, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_AND], dir2 );
 		break;
 
 	case 1:

Strategic/Merc Contract.cpp

@@ -746,7 +746,7 @@ BOOLEAN WillMercRenew( SOLDIERTYPE	*pSoldier, BOOLEAN fSayQuote )
 
 void HandleBuddiesReactionToFiringMerc(SOLDIERTYPE *pFiredSoldier, INT8 bMoraleEvent )
 {
-	INT8									bMercID, bOtherID;
+	INT8									bMercID;
 	INT8									bLastTeamID;
 	SOLDIERTYPE *					pSoldier;
 

Utils/Text.h

@@ -2559,6 +2559,7 @@ enum
 	TEXT_CAMPAIGNHISTORY_DETAIL_EAST,
 	TEXT_CAMPAIGNHISTORY_DETAIL_SOUTH,
 	TEXT_CAMPAIGNHISTORY_DETAIL_WEST,
+	TEXT_CAMPAIGNHISTORY_DETAIL_AND,	// " and " text
 
 	TEXT_CAMPAIGNHISTORY_DETAIL_BUILDINGDAMAGE,
 	TEXT_CAMPAIGNHISTORY_DETAIL_REINFORCE_BOTH,

Utils/_ChineseText.cpp

@@ -8210,6 +8210,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_DutchText.cpp

@@ -8225,6 +8225,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_EnglishText.cpp

@@ -8209,6 +8209,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",
@@ -8218,7 +8219,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"In a serious escalation of the conflict, both sides deployed tanks.",
 	L"%d tanks were used by %s, %d of them were destroyed in the fierce fighting.",
 	L"Both sides are said to have used snipers.",
-	L"Unverified reports indicate %s snipers were involved in the firefight."
+	L"Unverified reports indicate %s snipers were involved in the firefight.",
 };
 
 STR16	szCampaignHistoryTimeString[]=

Utils/_FrenchText.cpp

@@ -8198,6 +8198,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_GermanText.cpp

@@ -8030,6 +8030,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_ItalianText.cpp

@@ -8213,6 +8213,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_PolishText.cpp

@@ -8237,6 +8237,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_RussianText.cpp

@@ -8211,6 +8211,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",

Utils/_TaiwaneseText.cpp

@@ -8228,6 +8228,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"east",
 	L"south",
 	L"west",
+	L"and",
 
 	L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
 	L"During the attack, %s and %s called reinforcements.",