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/scene_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/scene_lok.cpp')
-rw-r--r-- | engines/kyra/scene_lok.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/engines/kyra/scene_lok.cpp b/engines/kyra/scene_lok.cpp index f71c3bd756..f7ada5d623 100644 --- a/engines/kyra/scene_lok.cpp +++ b/engines/kyra/scene_lok.cpp @@ -824,13 +824,14 @@ void KyraEngine_LoK::initSceneScreen(int brandonAlive) { _emc->run(&_scriptClick); setTextFadeTimerCountdown(-1); + if (_currentCharacter->sceneId == 210) { - if (_itemInHand != -1) + if (_itemInHand != kItemNone) magicOutMouseItem(2, -1); _screen->hideMouse(); for (int i = 0; i < 10; ++i) { - if (_currentCharacter->inventoryItems[i] != 0xFF) + if (_currentCharacter->inventoryItems[i] != kItemNone) magicOutMouseItem(2, i); } _screen->showMouse(); |