diff options
| author | Strangerke | 2014-05-28 22:19:56 +0200 |
|---|---|---|
| committer | Strangerke | 2014-05-28 22:19:56 +0200 |
| commit | d4b11837534bc58544a72ae16d8f70db1be0b4fd (patch) | |
| tree | 9f30a41759d2caa31532a8d29ce32c8489820448 | |
| parent | 88bc539b3e01d068529ad9945a843b6ace52a109 (diff) | |
| download | scummvm-rg350-d4b11837534bc58544a72ae16d8f70db1be0b4fd.tar.gz scummvm-rg350-d4b11837534bc58544a72ae16d8f70db1be0b4fd.tar.bz2 scummvm-rg350-d4b11837534bc58544a72ae16d8f70db1be0b4fd.zip | |
MADS: Some more initializations
| -rw-r--r-- | engines/mads/sequence.cpp | 10 | ||||
| -rw-r--r-- | engines/mads/user_interface.cpp | 4 |
2 files changed, 13 insertions, 1 deletions
diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp index 6461102a5e..f987595f05 100644 --- a/engines/mads/sequence.cpp +++ b/engines/mads/sequence.cpp @@ -45,9 +45,17 @@ SequenceEntry::SequenceEntry() { _numTicks = 0; _extraTicks = 0; _timeout = 0; + _active = false; + _nonFixed = false; + _flags = 0; + for (int i = 0; i < 5; ++i) + _entries._mode[i] = SEQUENCE_TRIGGER_EXPIRE; _entries._count = 0; - Common::fill(&_entries._mode[0], &_entries._mode[SEQUENCE_ENTRY_SUBSET_MAX], SEQUENCE_TRIGGER_EXPIRE); + _actionNouns._verbId = VERB_NONE; + _actionNouns._objectNameId = -1; + _actionNouns._indirectObjectId = -1; + Common::fill(&_entries._frameIndex[0], &_entries._frameIndex[SEQUENCE_ENTRY_SUBSET_MAX], 0); Common::fill(&_entries._trigger[0], &_entries._trigger[SEQUENCE_ENTRY_SUBSET_MAX], 0); } diff --git a/engines/mads/user_interface.cpp b/engines/mads/user_interface.cpp index e21a0f6243..0b4ec69f8f 100644 --- a/engines/mads/user_interface.cpp +++ b/engines/mads/user_interface.cpp @@ -331,6 +331,10 @@ UserInterface::UserInterface(MADSEngine *vm) : _vm(vm), _dirtyAreas(vm), _highlightedItemVocabIndex = -1; _dirtyAreas.resize(50); _inventoryChanged = false; + _noSegmentsActive = 0; + _someSegmentsActive = 0; + _rectP = nullptr; + Common::fill(&_categoryIndexes[0], &_categoryIndexes[7], 0); // Map the user interface to the bottom of the game's screen surface |