VOYEUR: Renamed a couple of event fields

4 files changed, 22 insertions, 18 deletions

diff --git a/engines/voyeur/events.cpp b/engines/voyeur/events.cpp
index b28acfba0f..eb793d3142 100644
--- a/engines/voyeur/events.cpp
+++ b/engines/voyeur/events.cpp
@@ -44,12 +44,12 @@ IntNode::IntNode(uint16 curTime, uint16 timeReset, uint16 flags) {
 
 /*------------------------------------------------------------------------*/
 
-VoyeurEvent::VoyeurEvent(int v1, int v2, int v3, int v4, int v5, int v6, int v7) {
-	_computerNum = v1;
-	_computerBut[0] = v2;
-	_computerBut[1] = v3;
-	_computerBut[2] = v4;
-	_computerBut[3] = v5;
+VoyeurEvent::VoyeurEvent(int hour, int minute, bool isAM, int v4, int v5, int v6, int v7) {
+	_hour = hour;
+	_minute = minute;
+	_isAM = isAM;
+	_field6 = v4;
+	_field8 = v5;
 	_computerOn = v6;
 	_dead = v7;
 }
diff --git a/engines/voyeur/events.h b/engines/voyeur/events.h
index 494b90d6de..c8377487dc 100644
--- a/engines/voyeur/events.h
+++ b/engines/voyeur/events.h
@@ -52,13 +52,16 @@ public:
 
 class VoyeurEvent {
 public:
-	int _computerNum;
-	int _computerBut[4];
+	int _hour;
+	int _minute;
+	bool _isAM;
+	int _field6;
+	int _field8;
 	int _computerOn;
 	int _computerOff;
 	int _dead;
 public:
-	VoyeurEvent(int v1, int v2, int v3, int v4, int v5, int v6, int v7);
+	VoyeurEvent(int hour, int minute, bool isAM, int v4, int v5, int v6, int v7);
 };
 
 class SVoy {
@@ -95,6 +98,9 @@ public:
 	int _field4EE;
 	int _field4F0;
 	int _field4F2;
+	int _eventCount;
+	Common::Array<VoyeurEvent> _events;
+
 
 	int _timeStart;
 	int _duration;
@@ -113,7 +119,6 @@ public:
 	int _numPhonesUsed;
 	int _evidence[20];
 	
-	Common::Array<VoyeurEvent> _events;
 	int _field4376;
 	int _field4378;
 	int _field437A;
diff --git a/engines/voyeur/files_threads.cpp b/engines/voyeur/files_threads.cpp
index ef6022a7bd..229d4c3fb5 100644
--- a/engines/voyeur/files_threads.cpp
+++ b/engines/voyeur/files_threads.cpp
@@ -1170,10 +1170,9 @@ int ThreadResource::doApt() {
 void ThreadResource::doRoom() {
 	VoyeurEngine &vm = *_vm;
 	SVoy &voy = vm._voy;
-
+	
 	vm.makeViewFinderP();
 	voy._field437E = 0;
-	int varE = 0;
 	
 	if (!vm._bVoy->getBoltGroup(vm._playStamp1, true))
 		return;
diff --git a/engines/voyeur/voyeur_game.cpp b/engines/voyeur/voyeur_game.cpp
index 8ebb2c2563..41a657fbc5 100644
--- a/engines/voyeur/voyeur_game.cpp
+++ b/engines/voyeur/voyeur_game.cpp
@@ -26,12 +26,12 @@
 namespace Voyeur {
 
 void VoyeurEngine::addVideoEventStart() {
-	VoyeurEvent &e = _voy._events[_voy._evidence[19]];
-	e._computerNum = _gameHour;
-	e._computerBut[0] = _gameMinute;
-	e._computerBut[1] = _voy._isAM;
-	e._computerBut[2] = 1;
-	e._computerBut[3] = _eventsManager._videoComputerBut4;
+	VoyeurEvent &e = _voy._events[_voy._eventCount];
+	e._hour = _gameHour;
+	e._minute = _gameMinute;
+	e._isAM = _voy._isAM;
+	e._field6 = 1;
+	e._field8 = _eventsManager._videoComputerBut4;
 	e._dead = _eventsManager._videoDead;
 }