diff options
| author | Johannes Schickel | 2010-10-22 02:09:16 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2010-10-22 02:09:16 +0000 |
| commit | 3653613443d8def9ae7f552eb799d1f039fd8097 (patch) | |
| tree | b8732b6d508e53252596c61d778ac7319f755cf0 /engines/kyra/script_lok.cpp | |
| parent | 38463e61619fe1e4d2b6c59313d99c40482d7411 (diff) | |
| download | scummvm-rg350-3653613443d8def9ae7f552eb799d1f039fd8097.tar.gz scummvm-rg350-3653613443d8def9ae7f552eb799d1f039fd8097.tar.bz2 scummvm-rg350-3653613443d8def9ae7f552eb799d1f039fd8097.zip | |
KYRA: Add a datatype for the item ids and convert Kyra1 to use it.
svn-id: r53696
Diffstat (limited to 'engines/kyra/script_lok.cpp')
| -rw-r--r-- | engines/kyra/script_lok.cpp | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/engines/kyra/script_lok.cpp b/engines/kyra/script_lok.cpp index 1b4a11f793..a2bad8035e 100644 --- a/engines/kyra/script_lok.cpp +++ b/engines/kyra/script_lok.cpp @@ -37,6 +37,7 @@ #include "kyra/sound.h" namespace Kyra { + int KyraEngine_LoK::o1_magicInMouseItem(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_magicInMouseItem(%p) (%d, %d)", (const void *)script, stackPos(0), stackPos(1)); magicInMouseItem(stackPos(0), stackPos(1), -1); @@ -203,9 +204,7 @@ int KyraEngine_LoK::o1_getElapsedSeconds(EMCState *script) { int KyraEngine_LoK::o1_mouseIsPointer(EMCState *script) { debugC(3, kDebugLevelScriptFuncs, "KyraEngine_LoK::o1_mouseIsPointer(%p) ()", (const void *)script); - if (_itemInHand == -1) - return 1; - return 0; + return (_itemInHand == kItemNone); } int KyraEngine_LoK::o1_runSceneAnimUntilDone(EMCState *script) { |