diff options
| author | Strangerke | 2014-02-25 07:55:57 +0100 |
|---|---|---|
| committer | Strangerke | 2014-02-25 07:55:57 +0100 |
| commit | 64a0e784738730480a4f40281e06d185f454eb2c (patch) | |
| tree | 6ef48774ed967a4237f6be304e1e2f482cd6fc64 | |
| parent | c03ed78a24a92f6b73f589b50a16753dc4ac5961 (diff) | |
| download | scummvm-rg350-64a0e784738730480a4f40281e06d185f454eb2c.tar.gz scummvm-rg350-64a0e784738730480a4f40281e06d185f454eb2c.tar.bz2 scummvm-rg350-64a0e784738730480a4f40281e06d185f454eb2c.zip | |
VOYEUR: Add some missing initializations in SVoy, introduce EVTYPE_NONE even type
| -rw-r--r-- | engines/voyeur/data.cpp | 16 | ||||
| -rw-r--r-- | engines/voyeur/data.h | 9 |
2 files changed, 23 insertions, 2 deletions
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp index 736267c72c..2453de1048 100644 --- a/engines/voyeur/data.cpp +++ b/engines/voyeur/data.cpp @@ -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) diff --git a/engines/voyeur/data.h b/engines/voyeur/data.h index 7b16f990f7..ed94cee490 100644 --- a/engines/voyeur/data.h +++ b/engines/voyeur/data.h @@ -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 }; |