From 2483ac7f1bf548c5f20c0b698f4ea82a529dae77 Mon Sep 17 00:00:00 2001 From: Strangerke Date: Mon, 11 Jan 2016 06:45:14 +0100 Subject: MADS: Initialize some variables in conversation code --- engines/mads/conversations.cpp | 12 ++++++++++++ engines/mads/conversations.h | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) 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 -- cgit v1.2.3