- added new dynamic opinion events, see http://thepit.ja-galaxy-forum.com/index.php?t=msg&th=21961&goto=333259&#msg_333259

- 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

Laptop/CampaignStats.cpp

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

Laptop/DynamicDialogueWidget.cpp

@@ -57,7 +57,7 @@ DDBox::Init( UINT16 sX, UINT16 sY )
 	SetY( sY );
 
 	SetX_Text( GetX( ) + MYBOX_FACE_OFFSET );
-	SetY_Text( GetY( ) );
+	SetY_Text( WidgetBase::GetY( ) );
 
 	musWidth = min( MYBOX_TEXT_MAXWIDTH, StringPixLength( mText, MYBOX_FONT_DEF ) );
 
@@ -157,7 +157,7 @@ DDBox::Display( )
 	}
 
 	//Display the background
-	ColorFillVideoSurfaceArea( FRAME_BUFFER, GetX_Text( ), GetY( ), GetX_Text( ) + musWidth, GetY( ) + musFontHeight, Get16BPPColor( FROMRGB( 0, 0, 0 ) ) );
+	ColorFillVideoSurfaceArea( FRAME_BUFFER, GetX_Text( ), GetY_Text( ), GetX_Text( ) + musWidth, GetY_Text( ) + musFontHeight, Get16BPPColor( FROMRGB( 0, 0, 0 ) ) );
 
 	DrawTopEntry( );
 
@@ -420,7 +420,7 @@ IMPDialogueChooseBox::Init( UINT16 sX, UINT16 sY )
 	SetY( sY );
 
 	SetX_Text( GetX( ) + MYBOX_FACE_OFFSET );
-	SetY_Text( GetY( ) );
+	SetY_Text( WidgetBase::GetY( ) );
 
 	mSelectedEntry = 0;