Fixed a bug in TeamTurns.cpp -- sometimes it would look for the LATEST_INTERRUPT_GUY, but he wouldn't actually exist and it would crash.

New TripWire tags pascal cased in xml file (only).

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5201 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
MaddMugsy
2012-04-12 18:42:41 +00:00
parent b59abfdc17
commit 83c4ebc8c6
2 changed files with 11 additions and 8 deletions
+5 -2
View File
@@ -1055,8 +1055,11 @@ void StartInterrupt( void )
if ( !gfHiddenInterrupt )
{
// Stop this guy....
MercPtrs[ LATEST_INTERRUPT_GUY ]->AdjustNoAPToFinishMove( TRUE );
MercPtrs[ LATEST_INTERRUPT_GUY ]->flags.bTurningFromPronePosition = TURNING_FROM_PRONE_OFF;
if (MercPtrs[LATEST_INTERRUPT_GUY]->exists() )//MM: this was crashing if the LATEST_INTERRUPT_GUY wasn't set
{
MercPtrs[ LATEST_INTERRUPT_GUY ]->AdjustNoAPToFinishMove( TRUE );
MercPtrs[ LATEST_INTERRUPT_GUY ]->flags.bTurningFromPronePosition = TURNING_FROM_PRONE_OFF;
}
}
DebugMsg (TOPIC_JA2INTERRUPT,DBG_LEVEL_3,"StartInterrupt done");