[Scummvm-cvs-logs] SF.net SVN: scummvm: [24874] scummvm/trunk/engines/gob

[drmccoy at users.sourceforge.net]

Revision: 24874
          http://scummvm.svn.sourceforge.net/scummvm/?rev=24874&view=rev
Author:   drmccoy
Date:     2006-12-18 06:33:37 -0800 (Mon, 18 Dec 2006)

Log Message:
-----------
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.

Modified Paths:
--------------
    scummvm/trunk/engines/gob/game_v2.cpp
    scummvm/trunk/engines/gob/inter_v1.cpp

Modified: scummvm/trunk/engines/gob/game_v2.cpp
===================================================================
--- scummvm/trunk/engines/gob/game_v2.cpp	2006-12-18 13:00:09 UTC (rev 24873)
+++ scummvm/trunk/engines/gob/game_v2.cpp	2006-12-18 14:33:37 UTC (rev 24874)
@@ -475,6 +475,7 @@
 				_vm->_draw->animateCursor(-1);
 			else
 				_vm->_draw->blitInvalidated();
+			_vm->_video->waitRetrace(_vm->_global->_videoMode);
 		}
 
 		key = checkKeys(&_vm->_global->_inter_mouseX, &_vm->_global->_inter_mouseY,

Modified: scummvm/trunk/engines/gob/inter_v1.cpp
===================================================================
--- scummvm/trunk/engines/gob/inter_v1.cpp	2006-12-18 13:00:09 UTC (rev 24873)
+++ scummvm/trunk/engines/gob/inter_v1.cpp	2006-12-18 14:33:37 UTC (rev 24874)
@@ -1335,13 +1335,13 @@
 	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) {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.