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

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.

Browse Source 
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
Download Patch File Download Diff File Expand all files Collapse all files
Tactical/TeamTurns.cpp
+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");
Utils/XML_Items.cpp
+6 -6
View File
@@ -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);