VOYEUR: Did some refactoring of game files

1 files changed, 90 insertions, 1 deletions

diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 0b78bc2dd8..efc7ac4c47 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -27,7 +27,6 @@
 #include "common/list.h"
 #include "graphics/surface.h"
 #include "voyeur/files.h"
-#include "voyeur/game.h"
 
 namespace Voyeur {
 
@@ -51,6 +50,96 @@ public:
 	IntNode(uint16 curTime, uint16 timeReset, uint16 flags);
 };
 
+class Event {
+public:
+	int _hours;
+	int _minutes;
+	int _seconds;
+	int _type;
+	int _data1;
+	int _data2;
+	byte *_data;
+};
+
+class SVoy {
+public:
+	int _delaySecs;
+	int _RTANum;
+	int _RTVNum;
+	int _switchBGNum;
+	int _group;
+	int _resolvePtr;
+	int _seconds;
+	int _minutes;
+	int _hours;
+	int _morning;
+	int _timeChangeFlag;
+	int _totalSeconds;
+	int _gameSeconds;
+	int _vCursorOn[160];
+	int _vCursorOff[160];
+	int _aCursorOn[60];
+	int _aCursorOff[60];
+	int _eCursorOn[60];
+	int _eCursorOff[60];
+	int _timeStart;
+	int _duration;
+	int _vidStart;
+	int _doApt;
+	int _function;
+	int _anim;
+	int _level;
+	int _levelDone;
+	int _flags;
+	int _evGroup;
+	byte *_evPicPtrs[6];
+	byte *_evCmPtrs[6];
+	int _audioTime;
+	int _phones[5];
+	int _numPhonesUsed;
+	int _evidence[20];
+	int _computerNum;
+	int _computerBut;
+	int _computerOn;
+	int _computerOff;
+	int _dead;
+	int _deadTime;
+	int _eventCnt;
+	Event _eventTable[1000];
+	int _curICF0;
+	int _curICF1;
+	int _fadeICF0;
+	int _fadeICF1;
+	int _fadeFunc;
+	int _lastInplay;
+	int _incriminate;
+	int _policeEvent;
+};
+
+class IntData {
+public:
+	bool _field9;
+	bool _flipWait;
+	int field16;
+	int field1A;
+	int field1E;
+	int field22;
+	int field24;
+	int field26;
+	int field2A;
+	bool _hasPalette;
+	int field38;
+	int field3B;
+	int field3D;
+	int _palStartIndex;
+	int _palEndIndex;
+	byte *_palette;
+public:
+	IntData();
+
+	void audioInit();
+};
+
 class EventsManager {
 private:
 	VoyeurEngine *_vm;