From 11a4fef956dc955c44fc323bdb28580bcb8888e5 Mon Sep 17 00:00:00 2001
From: Paul Gilbert
Date: Sat, 8 Jun 2013 15:41:22 -0400
Subject: VOYEUR: Some further work implementing fading

---
 engines/voyeur/events.h | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

(limited to 'engines/voyeur/events.h')

diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 1b47109c5c..22626cd003 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -24,6 +24,7 @@
 #define VOYEUR_EVENTS_H
 
 #include "common/scummsys.h"
+#include "common/list.h"
 #include "voyeur/game.h"
 
 namespace Voyeur {
@@ -40,11 +41,12 @@ typedef void (EventsManager::*EventMethodPtr)();
 class IntNode {
 public:
 	EventMethodPtr _intFunc;
-	uint32 _curTime;
-	uint32 _timeReset;
+	uint16 _curTime;
+	uint16 _timeReset;
 	uint32 _flags;
 public:
 	IntNode();
+	IntNode(uint16 curTime, uint16 timeReset, uint16 flags);
 };
 
 class EventsManager {
@@ -59,14 +61,16 @@ private:
 	void mainVoyeurIntFunc();
 private:
 	void checkForNextFrameCounter();
+	void voyeurTimer();
 	void videoTimer();
 	void vDoFadeInt();
 	void vDoCycleInt();
 	void fadeIntFunc();
 public:
-	IntData _audioStruc;
+	IntData _gameData;
 	IntData &_intPtr;
 	IntNode _fadeIntNode;
+	IntNode _fade2IntNode;
 	IntNode _cycleIntNode;
 	IntNode _evintnode;
 	IntNode _mainIntNode;
-- 
cgit v1.2.3