diff options
| author | Johannes Schickel | 2008-05-11 23:16:50 +0000 |
|---|---|---|
| committer | Johannes Schickel | 2008-05-11 23:16:50 +0000 |
| commit | bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2 (patch) | |
| tree | a27c1f8806b2b17ed04041677e4d167fd5beb22a /engines/kyra/timer.h | |
| parent | ea301f9c7bbf02e0fc67fbc1447aac5a489db70b (diff) | |
| download | scummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.tar.gz scummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.tar.bz2 scummvm-rg350-bb035967442df0f9cb7de3e3da3d73ce2f4ce5d2.zip | |
- Renamed KyraEngine to KyraEngine_v1
- kyra.* -> kyra_v1.*
- scene.cpp -> scene_v1.cpp
svn-id: r32044
Diffstat (limited to 'engines/kyra/timer.h')
| -rw-r--r-- | engines/kyra/timer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h index 264590845e..691bac3fb5 100644 --- a/engines/kyra/timer.h +++ b/engines/kyra/timer.h @@ -26,7 +26,7 @@ #ifndef KYRA_TIMER_H #define KYRA_TIMER_H -#include "kyra/kyra.h" +#include "kyra/kyra_v1.h" #include "common/list.h" #include "common/stream.h" @@ -49,7 +49,7 @@ struct TimerEntry { class TimerManager { public: - TimerManager(KyraEngine *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0), _isPaused(0), _pauseStart(0) {} + TimerManager(KyraEngine_v1 *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0), _isPaused(0), _pauseStart(0) {} ~TimerManager() { reset(); } void pause(bool p); @@ -79,7 +79,7 @@ public: private: void resync(); - KyraEngine *_vm; + KyraEngine_v1 *_vm; OSystem *_system; Common::List<TimerEntry> _timers; uint32 _nextRun; |