1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-07-22 13:40:22 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix: Fixed crash, when clicking on "Done" button after "Auto Resolve" has been finished (pGroup NULL pointer)

Browse Source 
git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@8008 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
Wanne
2016-01-03 11:43:38 +00:00
parent ec66894c75
commit 48413a9242
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Strategic/Strategic Movement.cpp
+18 -15
View File
@@ -4770,25 +4770,28 @@ void ResetMovementForNonPlayerGroup( GROUP *pGroup )
{
if ( pGroup->ubSectorX == pOtherGroup->ubSectorX && pGroup->ubSectorY == pOtherGroup->ubSectorY )
{
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
if ( pGroup->uiArrivalTime < min( pGroup->uiArrivalTime, pOtherGroup->uiArrivalTime ) + 5 )
if (pGroup != NULL)
{
DeleteStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->ubGroupID );
MoveSAIGroupToSector( &pGroup, (UINT8)SECTOR( pOtherGroup->ubNextX, pOtherGroup->ubNextY ), DIRECT, PURSUIT );
// 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 ) )
// the group has to be delayed - otherwise they could arrive at the same time as the player, resulting in odd behaviour during insertion
if (pGroup != NULL && pGroup->uiArrivalTime < min( pGroup->uiArrivalTime, pOtherGroup->uiArrivalTime ) + 5 )
{
AssertMsg( 0, "Failed to add movement event." );
break;
}
}
DeleteStrategicEvent( EVENT_GROUP_ARRIVAL, pGroup->ubGroupID );
sucess = TRUE;
// 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;
}
break;
}