From fc6f8a47f1123661f92be4350c94d9a967559e62 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Mon, 18 Dec 2006 14:33:37 +0000
Subject: 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
---
 engines/gob/game_v2.cpp  | 1 +
 engines/gob/inter_v1.cpp | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'engines')

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) {
-- 
cgit v1.2.3