[Scummvm-cvs-logs] scummvm master -> d4b11837534bc58544a72ae16d8f70db1be0b4fd

[Strangerke]

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:
d4b1183753 MADS: Some more initializations


Commit: d4b11837534bc58544a72ae16d8f70db1be0b4fd
    https://github.com/scummvm/scummvm/commit/d4b11837534bc58544a72ae16d8f70db1be0b4fd
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-05-28T22:19:56+02:00

Commit Message:
MADS: Some more initializations

Changed paths:
    engines/mads/sequence.cpp
    engines/mads/user_interface.cpp



diff --git a/engines/mads/sequence.cpp b/engines/mads/sequence.cpp
index 6461102..f987595 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 e21a0f6..0b4ec69 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