Merged trunk into the GUI branch.

Fixed MSVS9 project files.

svn-id: r32702

1 files changed, 16 insertions, 3 deletions

diff --git a/engines/kyra/timer.h b/engines/kyra/timer.h
index 0991f0a1b1..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,9 +49,11 @@ struct TimerEntry {
 
 class TimerManager {
 public:
-	TimerManager(KyraEngine *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0) {}
+	TimerManager(KyraEngine_v1 *vm, OSystem *sys) : _vm(vm), _system(sys), _timers(), _nextRun(0), _isPaused(0), _pauseStart(0) {}
 	~TimerManager() { reset(); }
 
+	void pause(bool p);
+
 	void reset();
 
 	void addTimer(uint8 id, TimerFunc *func, int countdown, bool enabled);
@@ -77,15 +79,26 @@ public:
 private:
 	void resync();
 
-	KyraEngine *_vm;
+	KyraEngine_v1 *_vm;
 	OSystem *_system;
 	Common::List<TimerEntry> _timers;
 	uint32 _nextRun;
 
+	uint _isPaused;
+	uint32 _pauseStart;
+
 	typedef Common::List<TimerEntry>::iterator Iterator;
 	typedef Common::List<TimerEntry>::const_iterator CIterator;
 };
 
+class PauseTimer {
+public:
+	PauseTimer(TimerManager &timer) : _timer(timer) { _timer.pause(true); }
+	~PauseTimer() { _timer.pause(false); }
+private:
+	TimerManager &_timer;
+};
+
 } // end of namespace Kyra
 
 #endif