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

Laptop/CampaignHistory_Summary.cpp

@@ -144,9 +144,7 @@ void RenderCampaignHistorySummary()
 		DrawTextToScreen( sText, usPosX, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, INS_FONT_SMALL, CAMPAIGN_HISTORY_FONT_COLOR_REGULAR, FONT_MCOLOR_BLACK, FALSE, 0 );
 
 		usPosX = LAPTOP_SCREEN_UL_X;
-		// closing line that separates header from individual page
-		DisplaySmallRedLineWithShadow( usPosX, usPosY+15, LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X, usPosY+15);
-
+		
 		usPosY += 20;
 
 		for(int i = CAMPAIGNHISTORY_SD_MERC; i < CAMPAIGNHISTORY_SD_MAX; ++i)
@@ -515,9 +513,7 @@ void RenderCampaignHistory_MostImportant()
 		DrawTextToScreen( sText, usPosX, usPosY, LAPTOP_SCREEN_LR_X-LAPTOP_SCREEN_UL_X, INS_FONT_SMALL, CAMPAIGN_HISTORY_FONT_COLOR_REGULAR, FONT_MCOLOR_BLACK, FALSE, 0 );
 				
 		usPosX = LAPTOP_SCREEN_UL_X;
-		// closing line that separates header from individual page
-		DisplaySmallRedLineWithShadow( usPosX, usPosY+15, LAPTOP_SCREEN_LR_X - LAPTOP_SCREEN_UL_X, usPosY+15);
-
+		
 		usPosY += 20;
 
 		for(int i = CAMPAIGNHISTORY_SD_MERC; i < CAMPAIGNHISTORY_SD_MAX; ++i)

Laptop/CampaignStats.cpp

@@ -445,6 +445,10 @@ Incident_Stats::GetAttackerDirString( BOOLEAN fAttacker )
 		swprintf(helperstr, L"%s", dir1 );
 		break;
 
+	case 0:
+		swprintf(helperstr, szCampaignHistoryDetail[TEXT_CAMPAIGNHISTORY_DETAIL_UNKNOWNLOCATION] );
+		break;
+
 	default:
 		break;
 	}

Tactical/Soldier Add.cpp

@@ -1202,9 +1202,9 @@ BOOLEAN InternalAddSoldierToSector( UINT8 ubID, BOOLEAN fCalculateDirection, BOO
 			if ( pSoldier->bSoldierFlagMask & SOLDIER_AIRDROP )
 				gCurrentIncident.usIncidentFlags |= INCIDENT_AIRDROP;
 
-			// problem: soldiers already present in a sector have ubStrategicInsertionCode = 0, which is INSERTION_CODE_NORTH - but they don't actually coem from north, as they are already present
-			// we thus count them as coming from north if they either already have a gridno, or usStrategicInsertionData
-			if ( pSoldier->ubStrategicInsertionCode == INSERTION_CODE_NORTH && pSoldier->usStrategicInsertionData || pSoldier->sGridNo != NOWHERE )
+			// problem: soldiers already present in a sector have ubStrategicInsertionCode = 0, which is INSERTION_CODE_NORTH - but they don't actually come from north, as they are already present
+			// we thus count them as coming from north if they have valid usStrategicInsertionData
+			if ( pSoldier->ubStrategicInsertionCode == INSERTION_CODE_NORTH && pSoldier->usStrategicInsertionData )//|| pSoldier->sGridNo != NOWHERE )
 			{
 				if ( pSoldier->bSide == gbPlayerNum )
 					gCurrentIncident.usIncidentFlags |= INCIDENT_ATTACKDIR_NORTH;

Utils/Text.h

@@ -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,

Utils/_ChineseText.cpp

@@ -8331,6 +8331,7 @@ STR16	szCampaignHistoryDetail[]=
 	L"南方",
 	L"西方",
 	L"和",
+	L"an unknown location",	// TODO.Translate
 
 	L"该分区的建筑受损。%d名市民被杀，%d名市民受伤。",
 	L"在战斗中，%s和%s呼叫了支援。",

Utils/_DutchText.cpp

@@ -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.",

Utils/_EnglishText.cpp

@@ -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.",

Utils/_FrenchText.cpp

@@ -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.",

Utils/_GermanText.cpp

@@ -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.",

Utils/_ItalianText.cpp

@@ -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.",

Utils/_PolishText.cpp

@@ -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.",

Utils/_RussianText.cpp

@@ -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.",

Utils/_TaiwaneseText.cpp

@@ -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.",