aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/engine/kgraphics.cpp
diff options
context:
space:
mode:
authorAndre Heider2009-02-21 15:40:14 +0000
committerAndre Heider2009-02-21 15:40:14 +0000
commite514d9780afa2703c6293c782e1f50712ad764fa (patch)
treec8ac4114189d38a0d44d7c85c2c2db6d89d2c27f /engines/sci/engine/kgraphics.cpp
parent03769a6d561168fa54af647785321564056483f1 (diff)
downloadscummvm-rg350-e514d9780afa2703c6293c782e1f50712ad764fa.tar.gz
scummvm-rg350-e514d9780afa2703c6293c782e1f50712ad764fa.tar.bz2
scummvm-rg350-e514d9780afa2703c6293c782e1f50712ad764fa.zip
use OSystem::getMillis() for last_wait_time and get rid of game_start_time
svn-id: r38701
Diffstat (limited to 'engines/sci/engine/kgraphics.cpp')
-rw-r--r--engines/sci/engine/kgraphics.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/engines/sci/engine/kgraphics.cpp b/engines/sci/engine/kgraphics.cpp
index 55ecad6529..ef90bc3231 100644
--- a/engines/sci/engine/kgraphics.cpp
+++ b/engines/sci/engine/kgraphics.cpp
@@ -23,6 +23,8 @@
*
*/
+#include "common/system.h"
+
#include "sci/include/sciresource.h"
#include "sci/include/engine.h"
#include "sci/include/gfx_widgets.h"
@@ -645,14 +647,12 @@ reg_t kTextSize(EngineState *s, int funct_nr, int argc, reg_t *argv) {
int debug_sleeptime_factor = 1;
reg_t kWait(EngineState *s, int funct_nr, int argc, reg_t *argv) {
- GTimeVal time;
+ uint32 time;
int sleep_time = UKPV(0);
- sci_get_current_time(&time);
-
- s->r_acc = make_reg(0, ((time.tv_usec - s->last_wait_time.tv_usec) * 60 / 1000000) + (time.tv_sec - s->last_wait_time.tv_sec) * 60);
-
- memcpy(&(s->last_wait_time), &time, sizeof(GTimeVal));
+ time = g_system->getMillis();
+ s->r_acc = make_reg(0, ((time - s->last_wait_time) / 1000) * 60);
+ s->last_wait_time = time;
// Reset optimization flags: Game is playing along nicely anyway
s->kernel_opt_flags &= ~(KERNEL_OPT_FLAG_GOT_EVENT | KERNEL_OPT_FLAG_GOT_2NDEVENT);