thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

VOYEUR: Renamed a couple of event fields

Browse source
This commit is contained in:
Paul Gilbert 2013-12-20 23:03:17 -05:00
parent 171d159489
commit 537ec24e1e
4 changed files with 22 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

12
engines/voyeur/events.cpp
View file

@ -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;
}

13
engines/voyeur/events.h
View file

@ -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;

3
engines/voyeur/files_threads.cpp
View file

@ -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;

12
engines/voyeur/voyeur_game.cpp
View file

@ -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;
}