[Scummvm-cvs-logs] scummvm master -> 64a0e784738730480a4f40281e06d185f454eb2c
Strangerke
Strangerke at scummvm.org
Tue Feb 25 07:57:43 CET 2014
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
64a0e78473 VOYEUR: Add some missing initializations in SVoy, introduce EVTYPE_NONE even type
Commit: 64a0e784738730480a4f40281e06d185f454eb2c
https://github.com/scummvm/scummvm/commit/64a0e784738730480a4f40281e06d185f454eb2c
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-02-24T22:55:57-08:00
Commit Message:
VOYEUR: Add some missing initializations in SVoy, introduce EVTYPE_NONE even type
Changed paths:
engines/voyeur/data.cpp
engines/voyeur/data.h
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp
index 736267c..2453de1 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 7b16f99..ed94cee 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 };
More information about the Scummvm-git-logs
mailing list