- Fix: dynamic opinion events on finishing battle did not occur due to faulty sector coordinates
- Fix: dynamic dialogue boxes were displayed with bad screen coordinates
- Change: dynamic dialogue is also written into tactical log
- Change: in events that require a leader, any merc can be considered leader, not just IMPs

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7807 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Flugente
2015-04-03 15:35:52 +00:00
parent afd192cde2
commit 98ff352eb0
17 changed files with 1072 additions and 74 deletions
+4 -4
View File
@@ -713,10 +713,7 @@ void FinishIncident(INT16 sX, INT16 sY, INT8 sZ)
}
}
}
// dynamic opinions: if the playerside had a lot of losses, the mercs will blame one of their own
HandleDynamicOpinionBattleLosses();
// due to odd coding, we do not know when an incident starts
// (checking for entering combat isn't enough, as we do that multiple times per battle)
// we thus set the relevant data when finishing an incident
@@ -732,6 +729,9 @@ void FinishIncident(INT16 sX, INT16 sY, INT8 sZ)
if ( gCampaignStats.usHighestID == 1 )
gCurrentIncident.usOneTimeEventFlags |= INCIDENT_ONETIMEEVENT_OMERTA;
// dynamic opinions
HandleDynamicOpinionBattleFinished( (gCurrentIncident.usIncidentFlags & INCIDENT_WIN) != 0 );
gCampaignStats.AddNewIncident(gCurrentIncident);
// reset incident after adding it