aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorJohannes Schickel2008-03-16 12:34:23 +0000
committerJohannes Schickel2008-03-16 12:34:23 +0000
commit7a690dae10ae3fdc6037efdf247ef1cf1a456a64 (patch)
tree929b8732de6e8772a31218cfcdecfc71e05096cb /engines
parentb75c790c7adb19ef33203a6f760133067d59ff39 (diff)
downloadscummvm-rg350-7a690dae10ae3fdc6037efdf247ef1cf1a456a64.tar.gz
scummvm-rg350-7a690dae10ae3fdc6037efdf247ef1cf1a456a64.tar.bz2
scummvm-rg350-7a690dae10ae3fdc6037efdf247ef1cf1a456a64.zip
- fixed mouse position in Kyra1 after savegame loading
- enabled some code in KyraEngine_v2::enterNewScene svn-id: r31137
Diffstat (limited to 'engines')
-rw-r--r--engines/kyra/saveload_v1.cpp4
-rw-r--r--engines/kyra/scene_v2.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/saveload_v1.cpp b/engines/kyra/saveload_v1.cpp
index 3061632094..bd4aa24cf1 100644
--- a/engines/kyra/saveload_v1.cpp
+++ b/engines/kyra/saveload_v1.cpp
@@ -245,8 +245,8 @@ void KyraEngine_v1::loadGame(const char *fileName) {
_abortWalkFlag = true;
_abortWalkFlag2 = false;
_mousePressFlag = false;
- _system->warpMouse(brandonX, brandonY);
-
+ setMousePos(brandonX, brandonY);
+
if (in->ioFailed())
error("Load failed.");
else
diff --git a/engines/kyra/scene_v2.cpp b/engines/kyra/scene_v2.cpp
index 9e1ac7e0da..121b2a7dae 100644
--- a/engines/kyra/scene_v2.cpp
+++ b/engines/kyra/scene_v2.cpp
@@ -48,7 +48,7 @@ void KyraEngine_v2::enterNewScene(uint16 newScene, int facing, int unk1, int unk
if (!unk3) {
updateWaterFlasks();
- //displayInvWsaLastFrame();
+ displayInvWsaLastFrame();
}
if (unk1) {