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
+2 -6
View File
@@ -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)
+4
View File
@@ -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;
}