[Scummvm-cvs-logs] scummvm master -> 2c158d0e4171006d7da886271ed5d96f9ec78ba5

[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:
2c158d0e41 MADS: initialize some variables


Commit: 2c158d0e4171006d7da886271ed5d96f9ec78ba5
    https://github.com/scummvm/scummvm/commit/2c158d0e4171006d7da886271ed5d96f9ec78ba5
Author: Strangerke (strangerke at scummvm.org)
Date: 2015-11-24T17:59:44+01:00

Commit Message:
MADS: initialize some variables

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



diff --git a/engines/mads/conversations.cpp b/engines/mads/conversations.cpp
index 86f38b2..5328b21 100644
--- a/engines/mads/conversations.cpp
+++ b/engines/mads/conversations.cpp
@@ -79,6 +79,7 @@ struct ConvData {
 GameConversation::GameConversation(MADSEngine *vm)
 	: _vm(vm) {
 	_running = _restoreRunning = 0;
+	_nextStartNode = nullptr;
 }
 
 GameConversation::~GameConversation() {
diff --git a/engines/mads/game.cpp b/engines/mads/game.cpp
index 607b7a4..0454102 100644
--- a/engines/mads/game.cpp
+++ b/engines/mads/game.cpp
@@ -92,6 +92,32 @@ Game::Game(MADSEngine *vm)
 
 	// Load the quotes
 	loadQuotes();
+
+	_camX._panAllowedFl = false;
+	_camX._activeFl = false;
+	_camX._currentFrameFl = false;
+	_camX._manualFl = false;
+	_camX._speed = -1;
+	_camX._rate = -1;
+	_camX._target = -1;
+	_camX._distOffCenter = -1;
+	_camX._startTolerance = -1;
+	_camX._endTolerance = -1;
+	_camX._direction = -1;
+	_camX._timer = 0;
+
+	_camY._panAllowedFl = false;
+	_camY._activeFl = false;
+	_camY._currentFrameFl = false;
+	_camY._manualFl = false;
+	_camY._speed = -1;
+	_camY._rate = -1;
+	_camY._target = -1;
+	_camY._distOffCenter = -1;
+	_camY._startTolerance = -1;
+	_camY._endTolerance = -1;
+	_camY._direction = -1;
+	_camY._timer = 0;
 }
 
 Game::~Game() {