thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LAB: Get rid of the rest of the custom time delay functions

Browse source
This commit is contained in:
Filippos Karapetis 2015-12-13 04:53:12 +02:00 • committed by Willem Jan Palenstijn
parent 1b0a7db0b6
commit 452c20ab8a
6 changed files with 12 additions and 111 deletions
Download patch file Download diff file Expand all files Collapse all files

23
engines/lab/intro.cpp
View file

@ -75,19 +75,13 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
char path[50] = "Lab:rooms/Intro/";
strcat(path, filename);
uint timeDelay;
if (isScreen) {
_vm->_music->updateMusic();
timeDelay = 35;
} else {
_vm->_music->updateMusic();
timeDelay = 7;
}
uint timeDelay = (isScreen) ? 35 : 7;
_vm->_music->updateMusic();
if (_quitIntro)
return;
uint32 lastSecs = 0L, lastMicros = 0L, secs = 0L, micros = 0L;
uint32 lastMillis = 0;
IntuiMessage *msg;
bool drawNextText = true, end = false, begin = true;
@ -132,9 +126,7 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
return;
}
uint32 t = g_system->getMillis();
lastSecs = t / 1000;
lastMicros = t % 1000;
lastMillis = g_system->getMillis();
}
msg = _vm->getMsg();
@ -143,12 +135,9 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
_vm->_music->updateMusic();
_vm->_anim->diffNextFrame();
uint32 t = g_system->getMillis();
secs = t / 1000;
micros = t % 1000;
_vm->_utils->anyTimeDiff(lastSecs, lastMicros, secs, micros, &secs, &micros);
uint32 elapsedSeconds = (g_system->getMillis() - lastMillis) / 1000;
if (secs > timeDelay) {
if (elapsedSeconds > timeDelay) {
if (end) {
if (isScreen)
_vm->_graphics->fade(false, 0);