diff --git a/Laptop/CampaignStats.cpp b/Laptop/CampaignStats.cpp index b179f19ff..29f55e909 100644 --- a/Laptop/CampaignStats.cpp +++ b/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: diff --git a/Strategic/Merc Contract.cpp b/Strategic/Merc Contract.cpp index a7311b2a3..68c8ee17e 100644 --- a/Strategic/Merc Contract.cpp +++ b/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; diff --git a/Utils/Text.h b/Utils/Text.h index 2c4dbb728..7d7f29f02 100644 --- a/Utils/Text.h +++ b/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, diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index cef84e981..07a9b0eb7 100644 --- a/Utils/_ChineseText.cpp +++ b/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.", diff --git a/Utils/_DutchText.cpp b/Utils/_DutchText.cpp index afdae4466..22e723a70 100644 --- a/Utils/_DutchText.cpp +++ b/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.", diff --git a/Utils/_EnglishText.cpp b/Utils/_EnglishText.cpp index cae9e32fd..1f65d4ade 100644 --- a/Utils/_EnglishText.cpp +++ b/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[]= diff --git a/Utils/_FrenchText.cpp b/Utils/_FrenchText.cpp index 516d09a78..456a54536 100644 --- a/Utils/_FrenchText.cpp +++ b/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.", diff --git a/Utils/_GermanText.cpp b/Utils/_GermanText.cpp index 9598a9686..2375452e8 100644 --- a/Utils/_GermanText.cpp +++ b/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.", diff --git a/Utils/_ItalianText.cpp b/Utils/_ItalianText.cpp index 30a8a0309..df4a755d5 100644 --- a/Utils/_ItalianText.cpp +++ b/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.", diff --git a/Utils/_PolishText.cpp b/Utils/_PolishText.cpp index 90969b635..af56612ed 100644 --- a/Utils/_PolishText.cpp +++ b/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.", diff --git a/Utils/_RussianText.cpp b/Utils/_RussianText.cpp index 99d484d26..e091a8620 100644 --- a/Utils/_RussianText.cpp +++ b/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.", diff --git a/Utils/_TaiwaneseText.cpp b/Utils/_TaiwaneseText.cpp index 35fc4384e..e11a6ef9c 100644 --- a/Utils/_TaiwaneseText.cpp +++ b/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.",