diff options
| author | Johannes Schickel | 2010-10-22 02:10:22 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-22 02:10:22 +0000 |
| commit | 03e2d54ca7f3d5533cbae376921cf617736caee5 (patch) | |
| tree | 989df6c2dc37bd783ad678744a60e446b8b74007 /engines/kyra/script_mr.cpp | |
| parent | 3653613443d8def9ae7f552eb799d1f039fd8097 (diff) | |
| download | scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.tar.gz scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.tar.bz2 scummvm-rg350-03e2d54ca7f3d5533cbae376921cf617736caee5.zip | |
KYRA: Adapt Kyra2+3 to use the newly added item type too.
svn-id: r53697
Diffstat (limited to 'engines/kyra/script_mr.cpp')
| -rw-r--r-- | engines/kyra/script_mr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/script_mr.cpp b/engines/kyra/script_mr.cpp index ae125b5b99..fb6bd4ebe7 100644 --- a/engines/kyra/script_mr.cpp +++ b/engines/kyra/script_mr.cpp @@ -216,7 +216,7 @@ int KyraEngine_MR::o3_removeInventoryItemInstances(EMCState *script) { const int item = stackPos(0); for (int i = 0; i < 10; ++i) { if (_mainCharacter.inventory[i] == item) - _mainCharacter.inventory[i] = 0xFFFF; + _mainCharacter.inventory[i] = kItemNone; } return 0; } @@ -594,7 +594,7 @@ int KyraEngine_MR::o3_updateConversations(EMCState *script) { int KyraEngine_MR::o3_removeItemSlot(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_MR::o3_removeItemSlot(%p) (%d)", (const void *)script, stackPos(0)); deleteItemAnimEntry(stackPos(0)); - _itemList[stackPos(0)].id = 0xFFFF; + _itemList[stackPos(0)].id = kItemNone; return 1; } @@ -642,7 +642,7 @@ int KyraEngine_MR::o3_removeItemInstances(EMCState *script) { for (int i = 0; i < 10; ++i) { if (_mainCharacter.inventory[i] == item) { - _mainCharacter.inventory[i] = 0xFFFF; + _mainCharacter.inventory[i] = kItemNone; ++deleted; } } @@ -654,7 +654,7 @@ int KyraEngine_MR::o3_removeItemInstances(EMCState *script) { for (int i = 0; i < 50; ++i) { if (_itemList[i].id == item) { - _itemList[i].id = 0xFFFF; + _itemList[i].id = kItemNone; ++deleted; } } |