mirror of
https://github.com/1dot13/source.git
synced 2026-08-12 14:10:23 +02:00
bug fixes from Overhaul:
- CTD when someone fell off the west side of a building - Assertion failure when Skyrider leaves a sector where a merc cannot be woken up - Boxing fixes: Opponent no longer "seeks cover", ie jumps back out of the ring; no longer will pick up a gun from the ground while boxing - Disappearing corpses (and possibly items) when cursor hovers over a square on the rooftop; also fixes a "write to freed memory" heap check git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@867 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
@@ -2638,12 +2638,19 @@ void RemovePGroup( GROUP *pGroup )
|
||||
|
||||
uniqueIDMask[ index ] -= mask;
|
||||
|
||||
if (gpBattleGroup == pGroup) {
|
||||
gpBattleGroup = NULL;
|
||||
}
|
||||
|
||||
MemFree( pGroup );
|
||||
pGroup = NULL;
|
||||
}
|
||||
|
||||
void RemoveAllGroups()
|
||||
{
|
||||
// Since we are removing all groups, clear the gpBattleGroup
|
||||
gpBattleGroup = NULL;
|
||||
|
||||
gfRemovingAllGroups = TRUE;
|
||||
while( gpGroupList )
|
||||
{
|
||||
@@ -3253,14 +3260,14 @@ BOOLEAN PlayersBetweenTheseSectors( INT16 sSource, INT16 sDest, INT32 *iCountEnt
|
||||
|
||||
if( gpBattleGroup )
|
||||
{
|
||||
Assert( gfPreBattleInterfaceActive );
|
||||
// Assert( gfPreBattleInterfaceActive );
|
||||
sBattleSector = (INT16)SECTOR( gpBattleGroup->ubSectorX, gpBattleGroup->ubSectorY );
|
||||
}
|
||||
|
||||
// debug only
|
||||
if ( gfDisplayPotentialRetreatPaths == TRUE )
|
||||
{
|
||||
Assert( gfPreBattleInterfaceActive );
|
||||
// Assert( gfPreBattleInterfaceActive );
|
||||
}
|
||||
|
||||
|
||||
|
||||
Reference in New Issue
Block a user