From e48ad7ad5666073c83ecf5470b434dd1b1e05b7e Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Wed, 10 Jul 2013 21:55:22 +0000
Subject: [PATCH] - Bugfixes (by Jazz) o ActionItems: Problem with the adding
 of  new actions to the file ActionItems.xml. o LuaInitNPCs: Wrong data type
 for fUpdateHistory (int -> bool)

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@6212 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 Editor/XML_ActionItems.cpp | 18 +++++++++++++++---
 Strategic/LuaInitNPCs.cpp  |  4 ++--
 2 files changed, 17 insertions(+), 5 deletions(-)

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<int>(ubQuest).Param<int>(sSectorX).Param<int>(sSectorY).Param<int>(fUpdateHistory).Call(4);
+		LuaFunction(_LS.L, "InternalEndQuest" ).Param<int>(ubQuest).Param<int>(sSectorX).Param<int>(sSectorY).Param<bool>(fUpdateHistory).Call(4);
 	}
 	
 	if ( Init == 1 )
 	{
-		LuaFunction(_LS.L, "InternalStartQuest" ).Param<int>(ubQuest).Param<int>(sSectorX).Param<int>(sSectorY).Param<int>(fUpdateHistory).Call(4);
+		LuaFunction(_LS.L, "InternalStartQuest" ).Param<int>(ubQuest).Param<int>(sSectorX).Param<int>(sSectorY).Param<bool>(fUpdateHistory).Call(4);
 	}
 
 	return true;