From b8c3d260132ae85284cc102504c7be62a137b4f2 Mon Sep 17 00:00:00 2001 From: Flugente Date: Wed, 8 Jul 2015 21:06:31 +0000 Subject: [PATCH] If an enemy group pursuits a player group that just retreated, make sure they don't arrive before or at the same time as the player group. git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@7907 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Strategic/Strategic Movement.cpp | 21 ++++++++++++--------- 1 file changed, 12 insertions(+), 9 deletions(-) diff --git a/Strategic/Strategic Movement.cpp b/Strategic/Strategic Movement.cpp index 59b084df4..24306e84e 100644 --- a/Strategic/Strategic Movement.cpp +++ b/Strategic/Strategic Movement.cpp @@ -4771,16 +4771,19 @@ void ResetMovementForNonPlayerGroup( GROUP *pGroup ) MoveSAIGroupToSector( &pGroup, (UINT8)SECTOR( pOtherGroup->ubNextX, pOtherGroup->ubNextY ), DIRECT, PURSUIT ); // the group has to be delayed - otherwise they could arrive at the same time as the player, resulting in odd behaviour during insertion - DeleteStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->ubGroupID ); - - // NOTE: This can cause the arrival time to be > GetWorldTotalMin() + TraverseTime, so keep that in mind - // if you have any code that uses these 3 values to figure out how far along its route a group is! - SetGroupArrivalTime( pGroup, pOtherGroup->uiArrivalTime + 5 ); - - if ( !AddStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->uiArrivalTime, pGroup->ubGroupID ) ) + if ( pGroup->uiArrivalTime < min( pGroup->uiArrivalTime, pOtherGroup->uiArrivalTime ) + 5 ) { - AssertMsg( 0, "Failed to add movement event." ); - break; + DeleteStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->ubGroupID ); + + // NOTE: This can cause the arrival time to be > GetWorldTotalMin() + TraverseTime, so keep that in mind + // if you have any code that uses these 3 values to figure out how far along its route a group is! + SetGroupArrivalTime( pGroup, pOtherGroup->uiArrivalTime + 5 ); + + if ( !AddStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->uiArrivalTime, pGroup->ubGroupID ) ) + { + AssertMsg( 0, "Failed to add movement event." ); + break; + } } sucess = TRUE;