aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStrangerke2014-01-03 08:18:08 +0100
committerStrangerke2014-01-03 08:18:08 +0100
commit8e31d446460ff94661fa99b9bf85df28feca96b4 (patch)
treed7b3e0abd7eb10e0150118bb1983e523d7894d8c
parent9ed37e68d2a5e413ec12487329361480bf290b7a (diff)
downloadscummvm-rg350-8e31d446460ff94661fa99b9bf85df28feca96b4.tar.gz
scummvm-rg350-8e31d446460ff94661fa99b9bf85df28feca96b4.tar.bz2
scummvm-rg350-8e31d446460ff94661fa99b9bf85df28feca96b4.zip
AVALANCHE: refactor initVariables by reusing resetVariables(). That also should fix CID 1109674
-rw-r--r--engines/avalanche/avalanche.cpp25
1 files changed, 1 insertions, 24 deletions
diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index 06585cd98c..dbe434cde3 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() {