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

Strategic/Strategic Movement.cpp

@@ -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 );
 	}
 
 

Strategic/mapscreen.cpp

@@ -12322,11 +12322,10 @@ void HandleNewDestConfirmation( INT16 sMapX, INT16 sMapY )
 		// tell player the route was CONFIRMED
 		// NOTE: We don't this this for the helicopter any more, since it clashes with Skyrider's own confirmation msg
 		MapScreenMessage( FONT_MCOLOR_LTYELLOW, MSG_MAP_UI_POSITION_MIDDLE, pMapPlotStrings[ 1 ] );
+
+		// wake up anybody who needs to be awake to travel
+		WakeUpAnySleepingSelectedMercsOnFootOrDriving();
 	}
-
-
-	// wake up anybody who needs to be awake to travel
-	WakeUpAnySleepingSelectedMercsOnFootOrDriving();
 }