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/scene_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/scene_mr.cpp')
| -rw-r--r-- | engines/kyra/scene_mr.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/engines/kyra/scene_mr.cpp b/engines/kyra/scene_mr.cpp index 95243e9d5c..f1ea79f49b 100644 --- a/engines/kyra/scene_mr.cpp +++ b/engines/kyra/scene_mr.cpp @@ -176,8 +176,8 @@ void KyraEngine_MR::enterNewScene(uint16 sceneId, int facing, int unk1, int unk2 setNextIdleAnimTimer(); if (_itemInHand < 0) { - _itemInHand = -1; - _mouseState = -1; + _itemInHand = kItemNone; + _mouseState = kItemNone; _screen->setMouseCursor(0, 0, _gameShapes[0]); } @@ -556,8 +556,8 @@ void KyraEngine_MR::initSceneAnims(int unk1) { for (int i = 0; i < 50; ++i) { obj = &_animObjects[i+17]; - const Item &item = _itemList[i]; - if (item.id != 0xFFFF && item.sceneId == _mainCharacter.sceneId) { + const ItemDefinition &item = _itemList[i]; + if (item.id != kItemNone && item.sceneId == _mainCharacter.sceneId) { obj->xPos1 = item.x; obj->yPos1 = item.y; animSetupPaletteEntry(obj); |