Merged revision(s) 6985 from branches/ja2_source_official_2014:

- Fix: battle reports no longer report that a team came from north if it was already in sector.
- Fix: red lines at wrong locations

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6986 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-02-26 20:59:25 +00:00
parent c57e3baba1
commit 9e393cd5e3
13 changed files with 21 additions and 10 deletions
+1
View File
@@ -2576,6 +2576,7 @@ enum
TEXT_CAMPAIGNHISTORY_DETAIL_SOUTH,
TEXT_CAMPAIGNHISTORY_DETAIL_WEST,
TEXT_CAMPAIGNHISTORY_DETAIL_AND, // " and " text
TEXT_CAMPAIGNHISTORY_DETAIL_UNKNOWNLOCATION,
TEXT_CAMPAIGNHISTORY_DETAIL_BUILDINGDAMAGE,
TEXT_CAMPAIGNHISTORY_DETAIL_REINFORCE_BOTH,
+1
View File
@@ -8331,6 +8331,7 @@ STR16 szCampaignHistoryDetail[]=
L"南方",
L"西方",
L"",
L"an unknown location", // TODO.Translate
L"该分区的建筑受损。%d名市民被杀,%d名市民受伤。",
L"在战斗中,%s和%s呼叫了支援。",
+1
View File
@@ -8345,6 +8345,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+2 -1
View File
@@ -8320,7 +8320,7 @@ STR16 szCampaignHistoryDetail[]=
L"attacked",
L"ambushed",
L"airdropped",
L"The attack came from %s.",
L"%s were reinforced from %s.",
L"The attack came from %s, %s were reinforced from %s.",
@@ -8329,6 +8329,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location",
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+2
View File
@@ -8328,6 +8328,8 @@ STR16 szCampaignHistoryDetail[]=
L"du sud",
L"de l'ouest",
L"et",
L"an unknown location", // TODO.Translate
L"Des bâtiments ont été endommagés. Il y a eu %d civils tués et %d blessés.",
L"Pendant l'attaque, %s et %s ont appelé des renforts.",
L"Pendant l'attaque, %s a appelé des renforts.",
+1
View File
@@ -8155,6 +8155,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+1
View File
@@ -8337,6 +8337,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+1
View File
@@ -8355,6 +8355,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+1
View File
@@ -8333,6 +8333,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",
+1
View File
@@ -8345,6 +8345,7 @@ STR16 szCampaignHistoryDetail[]=
L"south",
L"west",
L"and",
L"an unknown location", // TODO.Translate
L"Buildings in the sector were damaged. %d civilians were killed and %d wounded.",
L"During the attack, %s and %s called reinforcements.",