[Scummvm-cvs-logs] CVS: scummvm/sky intro.cpp,1.45,1.45.2.1
Nicolas Bacca
arisme at users.sourceforge.net
Fri Mar 5 01:15:04 CET 2004
Update of /cvsroot/scummvm/scummvm/sky
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv12931
Modified Files:
Tag: branch-0-6-0
intro.cpp
Log Message:
Yearly CE BASS intro synch fix
Index: intro.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/sky/intro.cpp,v
retrieving revision 1.45
retrieving revision 1.45.2.1
diff -u -d -r1.45 -r1.45.2.1
--- intro.cpp 6 Jan 2004 12:45:32 -0000 1.45
+++ intro.cpp 5 Mar 2004 08:52:25 -0000 1.45.2.1
@@ -794,7 +794,11 @@
}
_system->copy_rect(scrollPos, GAME_SCREEN_WIDTH, 0, 0, GAME_SCREEN_WIDTH, GAME_SCREEN_HEIGHT);
_system->update_screen();
+#ifndef _WIN32_WCE
if (!escDelay(40))
+#else
+ if (!escDelay(15))
+#endif
doContinue = false;
}
memcpy(_skyScreen->giveCurrent(), scrollPos, FRAME_SIZE);
@@ -887,6 +891,10 @@
OSystem::Event event;
do {
+#ifdef _WIN32_WCE
+ uint32 startTimeLoop = _system->get_msecs();
+ uint32 delta;
+#endif
while (_system->poll_event(&event)) {
if (event.event_code == OSystem::EVENT_KEYDOWN) {
if (event.kbd.keycode == 27)
@@ -902,7 +910,15 @@
uint8 nDelay = (msecs > 50) ? (50) : ((uint8)msecs);
#endif
_system->delay_msecs(nDelay);
+#ifdef _WIN32_WCE
+ delta = _system->get_msecs() - startTimeLoop;
+ if (delta > msecs)
+ break;
+ else
+ msecs -= delta;
+#else
msecs -= nDelay;
+#endif
} while (msecs > 0);
return true;
}
More information about the Scummvm-git-logs
mailing list