aboutsummaryrefslogtreecommitdiff
path: root/common/timer.h
diff options
context:
space:
mode:
authorPaweł Kołodziejski2002-09-18 10:22:36 +0000
committerPaweł Kołodziejski2002-09-18 10:22:36 +0000
commit462d26937c17961834e4226add1766d273ecd517 (patch)
tree87357adc7b555d818e18b384503f258f87c5bc96 /common/timer.h
parent9280c6bfbd9b6a39f4e61588f50dacdc80dbf305 (diff)
downloadscummvm-rg350-462d26937c17961834e4226add1766d273ecd517.tar.gz
scummvm-rg350-462d26937c17961834e4226add1766d273ecd517.tar.bz2
scummvm-rg350-462d26937c17961834e4226add1766d273ecd517.zip
Timer is handled in Engine now
svn-id: r4964
Diffstat (limited to 'common/timer.h')
-rw-r--r--common/timer.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/common/timer.h b/common/timer.h
index d575b73a4c..00a1a2f6b1 100644
--- a/common/timer.h
+++ b/common/timer.h
@@ -22,24 +22,20 @@
#define TIMER_H
#include "scummsys.h"
+#include "engine.h"
#define MAX_TIMERS 5
-class Scumm;
-
-typedef void (*TimerProc)(Scumm *);
+typedef void (*TimerProc)(void *);
#ifdef __MORPHOS__
#include "morphos_timer.h"
#else
-class OSystem;
-
class Timer {
private:
- OSystem *_osystem;
- Scumm *_scumm;
+ Engine *_engine;
bool _initialized;
bool _timerRunning;
void *_timerHandler;
@@ -53,7 +49,7 @@ private:
} _timerSlots[MAX_TIMERS];
public:
- Timer(Scumm *system);
+ Timer(Engine *engine);
~Timer();
int handler(int *t);