1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-09-16 14:47:17 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merged revision(s) 6822 from branches/ja2_source_official_2014:

Browse Source 
- Fix: autoresolve battle reports sector wrong
- Fix: reports over #255 are not accessible

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6823 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2014-01-25 17:11:25 +00:00
parent 518ae3d56b
commit 405b073416
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Laptop/CampaignHistory_Summary.cpp
+5 -5
View File
@@ -303,8 +303,8 @@ void SelectCampaignHistorySummaryRegionCallBack(MOUSE_REGION * pRegion, INT32 iR
MOUSE_REGION gCampaignHistoryMostImportantLinkRegion[3]; MOUSE_REGION gCampaignHistoryMostImportantLinkRegion[3];
void SelectCampaignHistoryMostImportantRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason ); void SelectCampaignHistoryMostImportantRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
UINT8 gusMostImportantPage = 0; UINT32 gusMostImportantPage = 0;
UINT8 gusMostImportantMode = 0; // 0: Summary, 1: Detail UINT32 gusMostImportantMode = 0; // 0: Summary, 1: Detail
// special pics for one-time-events // special pics for one-time-events
UINT32 guiCampaignEventImage; UINT32 guiCampaignEventImage;
@@ -864,7 +864,7 @@ void SelectCampaignHistoryMostImportantRegionCallBack(MOUSE_REGION * pRegion, IN
UINT32 uiLink = MSYS_GetRegionUserData( pRegion, 0 ); UINT32 uiLink = MSYS_GetRegionUserData( pRegion, 0 );
// only display existing incidents // only display existing incidents
UINT8 numpages = gCampaignStats.usNumIncidents; UINT32 numpages = gCampaignStats.usNumIncidents;
/*for(int i = 0; i < CAMPAIGNSTATS_NUM_MOST_IMPORTANT; ++i) /*for(int i = 0; i < CAMPAIGNSTATS_NUM_MOST_IMPORTANT; ++i)
{ {
if ( gCampaignStats.importantIncidents[i].usID ) if ( gCampaignStats.importantIncidents[i].usID )
@@ -906,7 +906,7 @@ void SelectCampaignHistoryMostImportantRegionCallBack(MOUSE_REGION * pRegion, IN
MOUSE_REGION gCampaignHistoryNewsLinkRegion[4]; MOUSE_REGION gCampaignHistoryNewsLinkRegion[4];
void SelectCampaignHistoryNewsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason ); void SelectCampaignHistoryNewsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReason );
UINT8 gusNewsPage = 0; UINT32 gusNewsPage = 0;
void GameInitCampaignHistory_News() void GameInitCampaignHistory_News()
{ {
@@ -1018,7 +1018,7 @@ void SelectCampaignHistoryNewsRegionCallBack(MOUSE_REGION * pRegion, INT32 iReas
UINT32 uiLink = MSYS_GetRegionUserData( pRegion, 0 ); UINT32 uiLink = MSYS_GetRegionUserData( pRegion, 0 );
// only display existing incidents // only display existing incidents
UINT8 numpages = gCampaignStats.usNumIncidents; UINT32 numpages = gCampaignStats.usNumIncidents;
/*for(int i = 0; i < CAMPAIGNSTATS_NUM_LAST_INCIDENTS; ++i) /*for(int i = 0; i < CAMPAIGNSTATS_NUM_LAST_INCIDENTS; ++i)
{ {
if ( gCampaignStats.lastIncidents[i].usID ) if ( gCampaignStats.lastIncidents[i].usID )
Strategic/PreBattle Interface.cpp
+1 -1
View File
@@ -2209,7 +2209,7 @@ void LogBattleResults( UINT8 ubVictoryCode)
} }
// Flugente: if battle has ended, close this incident, add it to the global incidents, and clear it // Flugente: if battle has ended, close this incident, add it to the global incidents, and clear it
FinishIncident(gWorldSectorX, gWorldSectorY, gbWorldSectorZ); FinishIncident(sSectorX, sSectorY, (INT8)sSectorZ);
} }
void HandlePreBattleInterfaceStates() void HandlePreBattleInterfaceStates()