aboutsummaryrefslogtreecommitdiff
path: root/engines/cruise
diff options
context:
space:
mode:
authorNorbert Lange2009-08-17 12:58:53 +0000
committerNorbert Lange2009-08-17 12:58:53 +0000
commitcc3a20c13cbf642dd08454d3cbd79edb6b3d3176 (patch)
tree64197760262270bf9c90d367864150ceb4b1f5b4 /engines/cruise
parentc96affd0c1e5480fe1a4a3d3e82583c795570d21 (diff)
parente548e71ba1092a1091da79c5d4652c9d52578e65 (diff)
downloadscummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.tar.gz
scummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.tar.bz2
scummvm-rg350-cc3a20c13cbf642dd08454d3cbd79edb6b3d3176.zip
merge with trunk
svn-id: r43478
Diffstat (limited to 'engines/cruise')
-rw-r--r--engines/cruise/cruise_main.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/engines/cruise/cruise_main.cpp b/engines/cruise/cruise_main.cpp
index 94dfc95cb5..aa3283aab7 100644
--- a/engines/cruise/cruise_main.cpp
+++ b/engines/cruise/cruise_main.cpp
@@ -1738,7 +1738,7 @@ void CruiseEngine::mainLoop(void) {
// Delay for the specified amount of time, but still respond to events
bool skipEvents = false;
- while (currentTick < lastTick + _gameSpeed) {
+ do {
g_system->delayMillis(10);
currentTick = g_system->getMillis();
@@ -1749,7 +1749,7 @@ void CruiseEngine::mainLoop(void) {
if (_vm->getDebugger()->isAttached())
_vm->getDebugger()->onFrame();
- }
+ } while (currentTick < lastTick + _gameSpeed);
} else {
manageEvents();