[Scummvm-cvs-logs] SF.net SVN: scummvm:[42197] scummvm/trunk/engines/cruise/cruise_main.cpp
dreammaster at users.sourceforge.net
dreammaster at users.sourceforge.net
Tue Jul 7 04:49:33 CEST 2009
Revision: 42197
http://scummvm.svn.sourceforge.net/scummvm/?rev=42197&view=rev
Author: dreammaster
Date: 2009-07-07 02:49:33 +0000 (Tue, 07 Jul 2009)
Log Message:
-----------
Bugfix so that user delays work correctly
Modified Paths:
--------------
scummvm/trunk/engines/cruise/cruise_main.cpp
Modified: scummvm/trunk/engines/cruise/cruise_main.cpp
===================================================================
--- scummvm/trunk/engines/cruise/cruise_main.cpp 2009-07-07 01:14:55 UTC (rev 42196)
+++ scummvm/trunk/engines/cruise/cruise_main.cpp 2009-07-07 02:49:33 UTC (rev 42197)
@@ -1292,11 +1292,6 @@
buttonDown = 0;
}
- if (userDelay && !userWait) {
- userDelay--;
- return 0;
- }
-
// Check for Exit 'X' key
if (keyboardCode == Common::KEYCODE_x)
return 1;
@@ -1796,6 +1791,11 @@
enableUser = 0;
}
+ if (userDelay && !userWait) {
+ userDelay--;
+ continue;
+ }
+
if (isUserWait & !userWait) {
// User waiting has ended
changeScriptParamInList(-1, -1, &procHead, 9999, 0);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list