diff --git a/Editor/XML_ActionItems.cpp b/Editor/XML_ActionItems.cpp index 676d183d1..75ad25368 100644 --- a/Editor/XML_ActionItems.cpp +++ b/Editor/XML_ActionItems.cpp @@ -13,6 +13,8 @@ #include "LuaInitNPCs.h" #endif +#include "Action Items.h" + struct { PARSE_STAGE curElement; @@ -107,9 +109,19 @@ actionItemsEndElementHandle(void *userData, const XML_Char *name) wcscpy(gszActionItemDesc[pData->curActionItems.uiIndex], pData->curActionItems.szName); #endif - ActionItemsValues[pData->curActionItems.uiIndex].ActionID = pData->curActionItems.ActionID; - ActionItemsValues[pData->curActionItems.uiIndex].BlowUp = pData->curActionItems.BlowUp; - ActionItemsValues[pData->curActionItems.uiIndex].BombItem = pData->curActionItems.BombItem; + // not ACTION_ITEM_BLOW_UP + if ( pData->curActionItems.ActionID != ACTION_ITEM_BLOW_UP ) + { + ActionItemsValues[pData->curActionItems.uiIndex].ActionID = pData->curActionItems.ActionID; + ActionItemsValues[pData->curActionItems.uiIndex].BlowUp = 0; + ActionItemsValues[pData->curActionItems.uiIndex].BombItem = 0; + } + else + { + ActionItemsValues[pData->curActionItems.uiIndex].ActionID = pData->curActionItems.ActionID; + ActionItemsValues[pData->curActionItems.uiIndex].BlowUp = pData->curActionItems.BlowUp; + ActionItemsValues[pData->curActionItems.uiIndex].BombItem = pData->curActionItems.BombItem; + } } else diff --git a/Strategic/LuaInitNPCs.cpp b/Strategic/LuaInitNPCs.cpp index eec66f6c4..5f088012b 100644 --- a/Strategic/LuaInitNPCs.cpp +++ b/Strategic/LuaInitNPCs.cpp @@ -2566,12 +2566,12 @@ BOOLEAN LuaInternalQuest( UINT8 ubQuest, INT16 sSectorX, INT16 sSectorY, BOOLEAN if ( Init == 0 ) { - LuaFunction(_LS.L, "InternalEndQuest" ).Param(ubQuest).Param(sSectorX).Param(sSectorY).Param(fUpdateHistory).Call(4); + LuaFunction(_LS.L, "InternalEndQuest" ).Param(ubQuest).Param(sSectorX).Param(sSectorY).Param(fUpdateHistory).Call(4); } if ( Init == 1 ) { - LuaFunction(_LS.L, "InternalStartQuest" ).Param(ubQuest).Param(sSectorX).Param(sSectorY).Param(fUpdateHistory).Call(4); + LuaFunction(_LS.L, "InternalStartQuest" ).Param(ubQuest).Param(sSectorX).Param(sSectorY).Param(fUpdateHistory).Call(4); } return true;