[Scummvm-cvs-logs] scummvm master -> 2483ac7f1bf548c5f20c0b698f4ea82a529dae77

[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:
2483ac7f1b MADS: Initialize some variables in conversation code


Commit: 2483ac7f1bf548c5f20c0b698f4ea82a529dae77
    https://github.com/scummvm/scummvm/commit/2483ac7f1bf548c5f20c0b698f4ea82a529dae77
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-11T06:45:14+01:00

Commit Message:
MADS: Initialize some variables in conversation code

Changed paths:
    engines/mads/conversations.cpp
    engines/mads/conversations.h



diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 85093d1..2ae07ba 100644
--- a/engines/mads/conversations.cpp
+++ b/engines/mads/conversations.cpp
@@ -580,6 +580,18 @@ void ConversationData::load(const Common::String &filename) {
 
 /*------------------------------------------------------------------------*/
 
+ConversationConditionals::ConversationConditionals() : _numImports(0) {
+	_currentNode = -1;
+	_fieldC = 0;
+	_fieldE = 0;
+	_field10 = 0;
+	_field12 = 0;
+	_field28 = 0;
+	_field3C = 0;
+	_field50 = 0;
+	_field64 = 0;
+}
+
 void ConversationConditionals::load(const Common::String &filename) {
 	Common::File inFile;
 	Common::SeekableReadStream *convFile;
diff --git a/engines/mads/conversations.h b/engines/mads/conversations.h
index 8128965..188f074 100644
--- a/engines/mads/conversations.h
+++ b/engines/mads/conversations.h
@@ -236,7 +236,7 @@ struct ConversationConditionals {
 	/**
 	 * Constructor
 	 */
-	ConversationConditionals() : _numImports(0) {}
+	ConversationConditionals();
 
 	/**
 	 * Load the specified conversation conditionals resource file