[Scummvm-cvs-logs] SF.net SVN: scummvm:[53700] scummvm/trunk/engines/kyra
athrxx at users.sourceforge.net
athrxx at users.sourceforge.net
Fri Oct 22 15:10:42 CEST 2010
Revision: 53700
http://scummvm.svn.sourceforge.net/scummvm/?rev=53700&view=rev
Author: athrxx
Date: 2010-10-22 13:10:41 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
LOL: fix possible regressions
Modified Paths:
--------------
scummvm/trunk/engines/kyra/items_lol.cpp
scummvm/trunk/engines/kyra/script_lol.cpp
Modified: scummvm/trunk/engines/kyra/items_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/items_lol.cpp 2010-10-22 02:11:50 UTC (rev 53699)
+++ scummvm/trunk/engines/kyra/items_lol.cpp 2010-10-22 13:10:41 UTC (rev 53700)
@@ -271,6 +271,9 @@
}
void LoLEngine::setHandItem(Item itemIndex) {
+ if (itemIndex == -1)
+ return;
+
if (itemIndex && _itemProperties[_itemsInPlay[itemIndex].itemPropertyIndex].flags & 0x80) {
runItemScript(-1, itemIndex, 0x400, 0, 0);
if (_itemsInPlay[itemIndex].shpCurFrame_flg & 0x8000)
Modified: scummvm/trunk/engines/kyra/script_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/script_lol.cpp 2010-10-22 02:11:50 UTC (rev 53699)
+++ scummvm/trunk/engines/kyra/script_lol.cpp 2010-10-22 13:10:41 UTC (rev 53700)
@@ -700,7 +700,7 @@
break;
case 3:
- setHandItem(b);
+ setHandItem((Item)b);
break;
case 4:
@@ -1065,7 +1065,9 @@
debugC(3, kDebugLevelScriptFuncs, "LoLEngine::olol_createHandItem(%p) (%d, %d, %d)", (const void *)script, stackPos(0), stackPos(1), stackPos(2));
if (_itemInHand)
return 0;
- setHandItem(makeItem(stackPos(0), stackPos(1), stackPos(2)));
+
+ uint16 itm = makeItem(stackPos(0), stackPos(1), stackPos(2));
+ setHandItem((Item)itm);
return 1;
}
@@ -2085,7 +2087,7 @@
_inventoryCurItem = i;
int r = _itemInHand;
- setHandItem(_inventory[i]);
+ setHandItem((Item)_inventory[i]);
_inventory[i] = r;
if (stackPos(1))
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list