From 43fb42e91730f894e32eaaa3d4997f5134184f4e Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Wed, 30 Oct 2013 22:43:29 +0100
Subject: AVALANCHE: Fix CID 1109678, 1109674

---
 engines/avalanche/animation.cpp |  2 ++
 engines/avalanche/avalanche.cpp | 18 +++++++++++++-----
 2 files changed, 15 insertions(+), 5 deletions(-)

(limited to 'engines')

diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index 4ddeedce94..6bce59ddc0 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -49,6 +49,7 @@ const int32 Animation::kCatacombMap[8][8] = {
 AnimationType::AnimationType(Animation *anim) {
 	_anim = anim;
 
+	_xLength = 0;
 	_yLength = 0;
 	for (int i = 0; i < 24; i++) {
 		_mani[i] = nullptr;
@@ -77,6 +78,7 @@ AnimationType::AnimationType(Animation *anim) {
 	_eachStepProc = Animation::kProcNone;
 	_fgBubbleCol = kColorWhite;
 	_bgBubbleCol = kColorBlack;
+	_id = 177;
 }
 
 /**
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 9c83c2c9f5..ef03c51107 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -75,7 +75,8 @@ AvalancheEngine::~AvalancheEngine() {
 }
 
 void AvalancheEngine::initVariables() {
-	// Needed because of Lucerna::load_also()
+	resetVariables();
+
 	for (int i = 0; i < 31; i++) {
 		_also[i][0] = nullptr;
 		_also[i][1] = nullptr;
@@ -117,11 +118,18 @@ void AvalancheEngine::initVariables() {
 	_doingSpriteRun = false;
 	_isLoaded = false;
 	_soundFx = true;
-	_spludwickAtHome = false;
-	_passedCwytalotInHerts = false;
 	_holdTheDawn = false;
-	_lastRoom = 0;
-	_lastRoomNotMap = 0;
+
+	_lineNum = 0;
+	for (int i = 0; i < 50; i++)
+		_lines[i]._color = kColorWhite;
+	_dropsOk = false;
+	_cheat = false;
+	_letMeOut = false;
+	_thinks = 2;
+	_thinkThing = true;
+	_seeScroll = false;
+	_currentMouse = 177;
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {
-- 
cgit v1.2.3