diff options
author | Max Horn | 2002-08-14 00:14:50 +0000 |
---|---|---|
committer | Max Horn | 2002-08-14 00:14:50 +0000 |
commit | bc4b4452d32743b18c524ec98b41df6ed3e43a8d (patch) | |
tree | ca2a4f2119c3f56193149f247cc0af7a01f298bd | |
parent | 96baaa974ad983f61bb9c25700d4237ef7657171 (diff) | |
download | scummvm-rg350-bc4b4452d32743b18c524ec98b41df6ed3e43a8d.tar.gz scummvm-rg350-bc4b4452d32743b18c524ec98b41df6ed3e43a8d.tar.bz2 scummvm-rg350-bc4b4452d32743b18c524ec98b41df6ed3e43a8d.zip |
unix line endings
svn-id: r4738
-rw-r--r-- | timer.h | 33 |
1 files changed, 16 insertions, 17 deletions
@@ -25,6 +25,8 @@ #define MAX_TIMERS 3 +typedef int (*TimerProc)(int); + #ifdef __MORPHOS__ #include "morphos/morphos_timer.h" #else @@ -33,34 +35,31 @@ class OSystem; class Timer { -protected: - private: - OSystem * _osystem; - Scumm * _scumm; + OSystem *_osystem; + Scumm *_scumm; bool _initialized; bool _timerRunning; - void * _timerHandler; + void *_timerHandler; int32 _thisTime; int32 _lastTime; - void * _mutex; + void *_mutex; -struct TimerSlots -{ - int ((*procedure)(int)); - int32 interval; - int32 counter; -} _timerSlots [MAX_TIMERS]; + struct TimerSlots { + int ((*procedure) (int)); + int32 interval; + int32 counter; + } _timerSlots[MAX_TIMERS]; public: - Timer(Scumm * system); - ~Timer(); + Timer(Scumm *system); + ~Timer(); - int handler(int * t); + int handler(int *t); bool init(); void release(); - bool installProcedure (int ((*procedure)(int)), int32 interval); - void releaseProcedure (int ((*procedure)(int))); + bool installProcedure(TimerProc procedure, int32 interval); + void releaseProcedure(TimerProc procedure); }; #endif |