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

LAB: Move timing functions to the utility class

Browse source
This commit is contained in:
Strangerke 2015-12-12 19:38:00 +01:00 • committed by Willem Jan Palenstijn
parent 0c0b2da235
commit 7bb45a8eaa
9 changed files with 110 additions and 148 deletions
Download patch file Download diff file Expand all files Collapse all files

7
engines/lab/intro.cpp
View file

@ -36,6 +36,7 @@
#include "lab/intro.h"
#include "lab/music.h"
#include "lab/resource.h"
#include "lab/utils.h"
namespace Lab {
@ -131,7 +132,7 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
return;
}
_vm->getTime(&lastSecs, &lastMicros);
_vm->_utils->getTime(&lastSecs, &lastMicros);
}
msg = _vm->getMsg();
@ -139,8 +140,8 @@ void Intro::doPictText(const char *filename, TextFont *msgFont, bool isScreen) {
if (msg == NULL) {
_vm->_music->updateMusic();
_vm->_anim->diffNextFrame();
_vm->getTime(&secs, &micros);
_vm->anyTimeDiff(lastSecs, lastMicros, secs, micros, &secs, &micros);
_vm->_utils->getTime(&secs, &micros);
_vm->_utils->anyTimeDiff(lastSecs, lastMicros, secs, micros, &secs, &micros);
if (secs > timeDelay) {
if (end) {