aboutsummaryrefslogtreecommitdiff
path: root/engines/sci/sfx/timer
diff options
context:
space:
mode:
authorJordi Vilalta Prat2009-02-15 08:34:13 +0000
committerJordi Vilalta Prat2009-02-15 08:34:13 +0000
commit003317e89d890944fc12e622190aa916aad6418c (patch)
tree321c42b2dd44c66cf1eaf7f71b19e3fc57944931 /engines/sci/sfx/timer
parent1ef23afe6b0441393b6b43ee136552e887c80707 (diff)
downloadscummvm-rg350-003317e89d890944fc12e622190aa916aad6418c.tar.gz
scummvm-rg350-003317e89d890944fc12e622190aa916aad6418c.tar.bz2
scummvm-rg350-003317e89d890944fc12e622190aa916aad6418c.zip
SCI: Get rid of the include directory hack (it compiles but it doesn't link yet)
svn-id: r38201
Diffstat (limited to 'engines/sci/sfx/timer')
-rw-r--r--engines/sci/sfx/timer/scummvm.cpp4
-rw-r--r--engines/sci/sfx/timer/timers.c4
2 files changed, 4 insertions, 4 deletions
diff --git a/engines/sci/sfx/timer/scummvm.cpp b/engines/sci/sfx/timer/scummvm.cpp
index f4e08d441a..c7d225e80c 100644
--- a/engines/sci/sfx/timer/scummvm.cpp
+++ b/engines/sci/sfx/timer/scummvm.cpp
@@ -1,6 +1,6 @@
#include "common/timer.h"
#include "engines/engine.h"
-#include "sfx_timer.h"
+#include "sci/include/sfx_timer.h"
#define FREQ 60
@@ -32,7 +32,7 @@ int scummvm_timer_start(void (*func)(void *), void *data) {
scummvm_timer_callback = func;
scummvm_timer_callback_data = data;
- ::g_engine->_timer->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
+ ::g_engine->getTimerManager()->installTimerProc(&scummvm_timer_update_internal, DELAY, NULL);
return SFX_OK;
}
diff --git a/engines/sci/sfx/timer/timers.c b/engines/sci/sfx/timer/timers.c
index b2a51d6062..353ae11ca7 100644
--- a/engines/sci/sfx/timer/timers.c
+++ b/engines/sci/sfx/timer/timers.c
@@ -25,8 +25,8 @@
***************************************************************************/
-#include <sfx_timer.h>
-#include <resource.h>
+#include "sci/include/sfx_timer.h"
+#include "sci/include/resource.h"
#ifdef SCUMMVM
extern sfx_timer_t sfx_timer_scummvm;