aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2016-01-11 06:45:14 +0100
committerStrangerke2016-01-11 06:45:14 +0100
commit2483ac7f1bf548c5f20c0b698f4ea82a529dae77 (patch)
tree73db7d30fa3636034cdc8cd282fb32e1164bfd2a
parentd76fe85af4c160a83dd82e6df0fc6cb5e9f68790 (diff)
downloadscummvm-rg350-2483ac7f1bf548c5f20c0b698f4ea82a529dae77.tar.gz
scummvm-rg350-2483ac7f1bf548c5f20c0b698f4ea82a529dae77.tar.bz2
scummvm-rg350-2483ac7f1bf548c5f20c0b698f4ea82a529dae77.zip
MADS: Initialize some variables in conversation code
-rw-r--r--engines/mads/conversations.cpp12
-rw-r--r--engines/mads/conversations.h2
2 files changed, 13 insertions, 1 deletions
diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 85093d1885..2ae07ba0bf 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 812896566c..188f074749 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