libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-18 07:39:08 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

VOYEUR: Add some missing initializations in SVoy, introduce EVTYPE_NONE even type

Browse Source
This commit is contained in:
Strangerke 2014-02-25 07:55:57 +01:00
parent c03ed78a24
commit 64a0e78473
2 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
engines/voyeur/data.cpp
View File

@ -77,6 +77,19 @@ SVoy::SVoy() {
_aptLoadMode = -1;
_eventFlags |= EVTFLAG_100;
_totalPhoneCalls = 0;
for (int i = 0; i < 6; i++)
_evPicPtrs[i] = nullptr;
for (int i = 0; i < 1000; i++) {
_events[i]._hour = 0;
_events[i]._minute = 0;
_events[i]._isAM = true;
_events[i]._type = EVTYPE_NONE;
_events[i]._audioVideoId = -1;
_events[i]._computerOn = 0;
_events[i]._computerOff = 0;
_events[i]._dead = 0;
}
}
void SVoy::setVm(VoyeurEngine *vm) {
@ -344,6 +357,9 @@ bool SVoy::checkForKey() {
break;
}
break;
default:
break;
}
if (_vm->_controlPtr->_state->_victimEvidenceIndex == _vm->_controlPtr->_state->_victimIndex)

9
engines/voyeur/data.h
View File

@ -31,8 +31,13 @@ namespace Voyeur {
#define TOTAL_EVENTS 1000
enum VoyeurEventType { EVTYPE_VIDEO = 1, EVTYPE_AUDIO = 2, EVTYPE_EVID = 3,
EVTYPE_COMPUTER = 4 };
enum VoyeurEventType {
EVTYPE_NONE = 0,
EVTYPE_VIDEO = 1,
EVTYPE_AUDIO = 2,
EVTYPE_EVID = 3,
EVTYPE_COMPUTER = 4
};
enum EventFlag { EVTFLAG_TIME_DISABLED = 1, EVTFLAG_2 = 2, EVTFLAG_8 = 8, EVTFLAG_RECORDING = 0x10,
EVTFLAG_40 = 0x40, EVTFLAG_VICTIM_PRESET = 0x80, EVTFLAG_100 = 0x100 };