diff options
| author | Florian Kagerer | 2008-03-15 00:16:11 +0000 |
|---|---|---|
| committer | Florian Kagerer | 2008-03-15 00:16:11 +0000 |
| commit | 9cedcd059b6e9f0e3ec768b1c159cc1d8eaacf75 (patch) | |
| tree | b0aa0d53b99c01ee761ce6139b535027a25bb3d0 /engines/kyra/kyra_v2.cpp | |
| parent | 6547ef6e129fb42c75c20f24e1f24dff1458f727 (diff) | |
| download | scummvm-rg350-9cedcd059b6e9f0e3ec768b1c159cc1d8eaacf75.tar.gz scummvm-rg350-9cedcd059b6e9f0e3ec768b1c159cc1d8eaacf75.tar.bz2 scummvm-rg350-9cedcd059b6e9f0e3ec768b1c159cc1d8eaacf75.zip | |
animations for inventory items and mouse pointers
svn-id: r31122
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
| -rw-r--r-- | engines/kyra/kyra_v2.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp index f33b69b7c9..69375a36f4 100644 --- a/engines/kyra/kyra_v2.cpp +++ b/engines/kyra/kyra_v2.cpp @@ -95,6 +95,9 @@ KyraEngine_v2::KyraEngine_v2(OSystem *system, const GameFlags &flags) : KyraEngi _currentTalkSections.ENDTim = NULL; _invWsa.wsa = 0; + _itemAnimTable = 0; + _nextAnimItem = 0; + _holdItemAnims = false; _colorCodeFlag1 = 0; _colorCodeFlag2 = -1; @@ -578,7 +581,7 @@ void KyraEngine_v2::update() { updateMouse(); updateSpecialSceneScripts(); _timer->update(); - //sub_274C0(); + updateItemAnimations(); updateInvWsa(); //sub_1574C(); _screen->updateScreen(); @@ -591,7 +594,7 @@ void KyraEngine_v2::updateWithText() { //sub_157C(); updateSpecialSceneScripts(); _timer->update(); - //sub_274C0(); + updateItemAnimations(); updateInvWsa(); restorePage3(); drawAnimObjects(); @@ -697,7 +700,7 @@ void KyraEngine_v2::updateMouse() { } if (type != 0 && _handItemSet != type) { - _handItemSet = type; + _mouseState = _handItemSet = type; _screen->hideMouse(); _screen->setMouseCursor(xOffset, yOffset, getShapePtr(shapeIndex)); _screen->showMouse(); @@ -705,6 +708,7 @@ void KyraEngine_v2::updateMouse() { if (type == 0 && _handItemSet != _itemInHand) { if ((mouse.y > 145) || (mouse.x > 6 && mouse.x < 312 && mouse.y > 6 && mouse.y < 135)) { + _mouseState = 0; _handItemSet = _itemInHand; _screen->hideMouse(); if (_itemInHand == -1) |