aboutsummaryrefslogtreecommitdiff
path: root/engines/kyra/kyra_v2.cpp
diff options
context:
space:
mode:
authorFlorian Kagerer2008-03-16 02:00:14 +0000
committerFlorian Kagerer2008-03-16 02:00:14 +0000
commitb75c790c7adb19ef33203a6f760133067d59ff39 (patch)
tree18b696befc7cd2bece62786f86b256769a46d153 /engines/kyra/kyra_v2.cpp
parent707413227644b56e69b4632dc5b2a7534847d2b9 (diff)
downloadscummvm-rg350-b75c790c7adb19ef33203a6f760133067d59ff39.tar.gz
scummvm-rg350-b75c790c7adb19ef33203a6f760133067d59ff39.tar.bz2
scummvm-rg350-b75c790c7adb19ef33203a6f760133067d59ff39.zip
- add opcode 146 - resetInputColorCode()
- add updateWaterFlasks() - some fixes for mouse pointer positioning in sjis mode - bug fix for tim player svn-id: r31136
Diffstat (limited to 'engines/kyra/kyra_v2.cpp')
-rw-r--r--engines/kyra/kyra_v2.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/kyra_v2.cpp b/engines/kyra/kyra_v2.cpp
index 6180645368..295c917c83 100644
--- a/engines/kyra/kyra_v2.cpp
+++ b/engines/kyra/kyra_v2.cpp
@@ -1867,7 +1867,7 @@ void KyraEngine_v2::cauldronItemAnim(int item) {
else if (mouseY > mouseDstY)
mouseY -= 2;
uint32 waitEnd = _system->getMillis() + _tickLength;
- _system->warpMouse(mouseX, mouseY);
+ setMousePos(mouseX, mouseY);
_system->updateScreen();
delayUntil(waitEnd);
}
@@ -1878,7 +1878,7 @@ void KyraEngine_v2::cauldronItemAnim(int item) {
else if (mouseX > mouseDstX)
mouseX -= 2;
uint32 waitEnd = _system->getMillis() + _tickLength;
- _system->warpMouse(mouseX, mouseY);
+ setMousePos(mouseX, mouseY);
_system->updateScreen();
delayUntil(waitEnd);
}
@@ -2264,7 +2264,7 @@ void KyraEngine_v2::setupOpcodeTable() {
// 0x90
Opcode(o2_clearSpecialSceneScriptState),
Opcode(o2_querySpecialSceneScriptState),
- OpcodeUnImpl(),
+ Opcode(o2_resetInputColorCode),
Opcode(o2_setHiddenItemsEntry),
// 0x94
Opcode(o2_getHiddenItemsEntry),