[Scummvm-cvs-logs] scummvm master -> e4387e754a5de39cf1407ca11777f49a6b5a9f99

[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:
e4387e754a AVALANCHE: Fix CID 1109674 - uninitialized variables. Also fix room variable default values.


Commit: e4387e754a5de39cf1407ca11777f49a6b5a9f99
    https://github.com/scummvm/scummvm/commit/e4387e754a5de39cf1407ca11777f49a6b5a9f99
Author: Strangerke (strangerke at scummvm.org)
Date: 2013-11-09T05:47:45-08:00

Commit Message:
AVALANCHE: Fix CID 1109674 - uninitialized variables. Also fix room variable default values.

Changed paths:
    engines/avalanche/avalanche.cpp
    engines/avalanche/avalot.cpp



diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index ab03cc8..beb6333 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -141,6 +141,32 @@ void AvalancheEngine::initVariables() {
 	_seeScroll = false;
 	_currentMouse = 177;
 	_holdLeftMouse = false;
+
+	_jumpStatus = 0;
+	_mushroomGrowing = false;
+	_crapulusWillTell = false;
+	_enterCatacombsFromLustiesRoom = false;
+	_teetotal = false;
+	_malagauche = 0;
+	_drinking = '\0';
+	_enteredLustiesRoomAsMonk = false;
+	_catacombX = 0;
+	_catacombY = 0;
+	_avvysInTheCupboard = false;
+	_geidaFollows = false;
+	_givenPotionToGeida = false;
+	_lustieIsAsleep = false;
+	_beenTiedUp = false;
+	_sittingInPub = false;
+	_spurgeTalkCount = 0;
+	_metAvaroid = false;
+	_takenMushroom = false;
+	_givenPenToAyles = false;
+	_askedDogfoodAboutNim = false;
+	_ableToAddTimer = false;
+	_spludwickAtHome = false;
+	_passedCwytalotInHerts = false;
+	_lastRoom = _lastRoomNotMap = kRoomDummy;
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index d703fdd..5d360d1 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1458,8 +1458,8 @@ void AvalancheEngine::resetVariables() {
 	_jumpStatus = 0;
 	_mushroomGrowing = false;
 	_spludwickAtHome = false;
-	_lastRoom = 0;
-	_lastRoomNotMap = 0;
+	_lastRoom = kRoomDummy;
+	_lastRoomNotMap = kRoomDummy;
 	_crapulusWillTell = false;
 	_enterCatacombsFromLustiesRoom = false;
 	_teetotal = false;