From 83c4ebc8c6fdfb03163baadf26c0750739f72b26 Mon Sep 17 00:00:00 2001
From: MaddMugsy <MaddMugsy@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Thu, 12 Apr 2012 18:42:41 +0000
Subject: [PATCH] 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
---
 Tactical/TeamTurns.cpp |  7 +++++--
 Utils/XML_Items.cpp    | 12 ++++++------
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/Tactical/TeamTurns.cpp b/Tactical/TeamTurns.cpp
index 777dde608..04501699e 100644
--- a/Tactical/TeamTurns.cpp
+++ b/Tactical/TeamTurns.cpp
@@ -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");
 
diff --git a/Utils/XML_Items.cpp b/Utils/XML_Items.cpp
index c9a95cbfc..c1a2d8e6d 100644
--- a/Utils/XML_Items.cpp
+++ b/Utils/XML_Items.cpp
@@ -256,9 +256,9 @@ itemStartElementHandle(void *userData, const XML_Char *name, const XML_Char **at
 				strcmp(name, "overheatCooldownModificator") == 0 ||
 				strcmp(name, "overheatJamThresholdModificator") == 0 ||
 				strcmp(name, "overheatDamageThresholdModificator") == 0 ||
-				strcmp(name, "attachmentclass") == 0 ||
-				strcmp(name, "tripwireactivation") == 0 ||
-				strcmp(name, "tripwire") == 0 ||
+				strcmp(name, "AttachmentClass") == 0 ||
+				strcmp(name, "TripWireActivation") == 0 ||
+				strcmp(name, "TripWire") == 0 ||
 
 				strcmp(name, "fFlags") == 0 ))
 		{
@@ -1280,17 +1280,17 @@ itemEndElementHandle(void *userData, const XML_Char *name)
 			pData->curElement = ELEMENT;
 			pData->curItem.overheatDamageThresholdModificator  = (FLOAT) atof(pData->szCharData);
 		}
-		else if(strcmp(name, "attachmentclass")	 == 0)
+		else if(strcmp(name, "AttachmentClass")	 == 0)
 		{
 			pData->curElement = ELEMENT;
 			pData->curItem.attachmentclass   = (UINT32) atol(pData->szCharData);
 		}
-		else if(strcmp(name, "tripwireactivation")	 == 0)
+		else if(strcmp(name, "TripWireActivation")	 == 0)
 		{
 			pData->curElement = ELEMENT;
 			pData->curItem.tripwireactivation   = (BOOLEAN) atol(pData->szCharData);
 		}
-		else if(strcmp(name, "tripwire")	 == 0)
+		else if(strcmp(name, "TripWire")	 == 0)
 		{
 			pData->curElement = ELEMENT;
 			pData->curItem.tripwire   = (BOOLEAN) atol(pData->szCharData);