diff options
| author | Paul Gilbert | 2014-02-16 23:38:05 -0500 |
|---|---|---|
| committer | Paul Gilbert | 2014-02-16 23:38:05 -0500 |
| commit | b2bf4c6b17116a6747a283d6e9dc11c79767cd72 (patch) | |
| tree | c2b548d4286207d69a2e69a310058ca01a8dace4 /engines/voyeur | |
| parent | 56a32b365210b3f517952674fbd4b16700ba27ca (diff) | |
| download | scummvm-rg350-b2bf4c6b17116a6747a283d6e9dc11c79767cd72.tar.gz scummvm-rg350-b2bf4c6b17116a6747a283d6e9dc11c79767cd72.tar.bz2 scummvm-rg350-b2bf4c6b17116a6747a283d6e9dc11c79767cd72.zip | |
VOYEUR: Changed SVoy initialisation to individual field values
Diffstat (limited to 'engines/voyeur')
| -rw-r--r-- | engines/voyeur/data.cpp | 38 |
1 files changed, 34 insertions, 4 deletions
diff --git a/engines/voyeur/data.cpp b/engines/voyeur/data.cpp index db59760e13..3a7c75fc2e 100644 --- a/engines/voyeur/data.cpp +++ b/engines/voyeur/data.cpp @@ -39,8 +39,40 @@ void VoyeurEvent::synchronize(Common::Serializer &s) { /*------------------------------------------------------------------------*/ SVoy::SVoy() { - // Initialize all the data fields of SVoy to empty values - Common::fill((byte *)this, (byte *)this + sizeof(SVoy), 0); + // Initialize all the data fields + _abortInterface = false; + _fadeICF0 = false; + _isAM = false; + Common::fill(&_phoneCallsReceived[0], &_phoneCallsReceived[5], false); + Common::fill(&_roomHotspotsEnabled[0], &_roomHotspotsEnabled[20], false); + _victimMurdered = false; + + _audioVisualStartTime = 0; + _audioVisualDuration = 0; + _boltGroupId2 = 0; + _computerTextId = 0; + _computerTimeMin = _computerTimeMax = 0; + _curICF0 = 0; + _eventCount = 0; + _fadingStep1 = 0; + _fadingStep2 = 0; + _fadingType = 0; + _incriminatedVictimNumber = 0; + _musicStartTime = 0; + _playStampMode = 0; + _switchBGNum = 0; + _transitionId = 0; + _victimNumber = 0; + _videoEventId = 0; + _vocSecondsOffset = 0; + _RTANum = 0; + _RTVLimit = 0; + _RTVNum = 0; + _viewBounds = nullptr; + Common::fill(&_evPicPtrs[0], &_evPicPtrs[6], (PictureResource *)nullptr); + Common::fill(&_evCmPtrs[0], &_evCmPtrs[6], (CMapResource *)nullptr); + _curICF1 = 0; + _policeEvent = 0; _eventFlags = EVTFLAG_TIME_DISABLED; _fadingAmount1 = _fadingAmount2 = 127; @@ -48,8 +80,6 @@ SVoy::SVoy() { _aptLoadMode = -1; _eventFlags |= EVTFLAG_100; _totalPhoneCalls = 0; - _victimMurdered = false; - _computerTimeMin = _computerTimeMax = 0; } void SVoy::setVm(VoyeurEngine *vm) { |