1dot13/source
1
0
Fork 0
mirror of https://github.com/1dot13/source.git synced 2026-08-05 14:00:23 +02:00
Code Issues Packages Projects Releases Wiki Activity

- Bugfixes (by Jazz)

Browse Source 
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
This commit is contained in:
Wanne
2013-07-10 21:55:22 +00:00
parent 0650b2b3ed
commit e48ad7ad56
2 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Editor/XML_ActionItems.cpp
+15 -3
View File
@@ -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
Strategic/LuaInitNPCs.cpp
+2 -2
View File
@@ -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;