[Scummvm-cvs-logs] scummvm master -> 8e31d446460ff94661fa99b9bf85df28feca96b4

[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:
8e31d44646 AVALANCHE: refactor initVariables by reusing resetVariables(). That also should fix CID 1109674


Commit: 8e31d446460ff94661fa99b9bf85df28feca96b4
    https://github.com/scummvm/scummvm/commit/8e31d446460ff94661fa99b9bf85df28feca96b4
Author: Strangerke (strangerke at scummvm.org)
Date: 2014-01-02T23:18:08-08:00

Commit Message:
AVALANCHE: refactor initVariables by reusing resetVariables(). That also should fix CID 1109674

Changed paths:
    engines/avalanche/avalanche.cpp



diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 06585cd..dbe434c 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -144,30 +144,7 @@ void AvalancheEngine::initVariables() {
 	_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;
-	_spludwickAtHome = false;
-	_passedCwytalotInHerts = false;
-	_lastRoom = _lastRoomNotMap = kRoomDummy;
+	resetVariables();
 }
 
 Common::ErrorCode AvalancheEngine::initialize() {