aboutsummaryrefslogtreecommitdiff
path: root/engines
diff options
context:
space:
mode:
authorSven Hesse2006-12-18 14:33:37 +0000
committerSven Hesse2006-12-18 14:33:37 +0000
commitfc6f8a47f1123661f92be4350c94d9a967559e62 (patch)
tree953f0e1f39d28400a54177b696a2b118352660d4 /engines
parent4c46f4a8789894b30a7ffef58c8c218a2bf74b96 (diff)
downloadscummvm-rg350-fc6f8a47f1123661f92be4350c94d9a967559e62.tar.gz
scummvm-rg350-fc6f8a47f1123661f92be4350c94d9a967559e62.tar.bz2
scummvm-rg350-fc6f8a47f1123661f92be4350c94d9a967559e62.zip
Added a waitRetrace in Game_v2::CheckCollisions() and rearranged the delay in o1_keyFunc(), so that the save name dialog is shown and the "Empty Inventory" message is displayed properly as well.
svn-id: r24874
Diffstat (limited to 'engines')
-rw-r--r--engines/gob/game_v2.cpp1
-rw-r--r--engines/gob/inter_v1.cpp6
2 files changed, 4 insertions, 3 deletions
diff --git a/engines/gob/game_v2.cpp b/engines/gob/game_v2.cpp
index b64c9629fb..e18f8a9e37 100644
--- a/engines/gob/game_v2.cpp
+++ b/engines/gob/game_v2.cpp
@@ -475,6 +475,7 @@ int16 Game_v2::checkCollisions(char handleMouse, int16 deltaTime, int16 *pResId,
_vm->_draw->animateCursor(-1);
else
_vm->_draw->blitInvalidated();
+ _vm->_video->waitRetrace(_vm->_global->_videoMode);
}
key = checkKeys(&_vm->_global->_inter_mouseX, &_vm->_global->_inter_mouseY,
diff --git a/engines/gob/inter_v1.cpp b/engines/gob/inter_v1.cpp
index e9796c8380..9ab3f2a97e 100644
--- a/engines/gob/inter_v1.cpp
+++ b/engines/gob/inter_v1.cpp
@@ -1335,13 +1335,13 @@ bool Inter_v1::o1_keyFunc(char &cmdCount, int16 &counter, int16 &retFlag) {
int16 flag;
int16 key;
- // Gob2 busy-waits here, so add a delay
- _vm->_util->longDelay(1);
-
flag = load16();
animPalette();
_vm->_draw->blitInvalidated();
+ // Gob2 busy-waits here, so add a delay
+ _vm->_util->longDelay(1);
+
if (flag != 0) {
if (flag != 1) {