From c091afa297343ae5d0037fc91fad7f07a03ab333 Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 3 Jan 2014 08:06:22 +0100
Subject: AVALANCHE: Move direction reset to Animation::resetVariables()

---
 engines/avalanche/avalot.cpp | 1 -
 1 file changed, 1 deletion(-)

(limited to 'engines/avalanche/avalot.cpp')

diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index ec3f81e55d..52ba3b2189 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1410,7 +1410,6 @@ Common::String AvalancheEngine::intToStr(int32 num) {
 }
 
 void AvalancheEngine::resetVariables() {
-	_animation->setDirection(kDirUp);
 	_carryNum = 0;
 	for (int i = 0; i < kObjectNum; i++)
 		_objects[i] = false;
-- 
cgit v1.2.3


From 9ed37e68d2a5e413ec12487329361480bf290b7a Mon Sep 17 00:00:00 2001
From: Strangerke
Date: Fri, 3 Jan 2014 08:10:40 +0100
Subject: AVALANCHE: Split AvalancheEngine::resetVariables() in two, to make a
 part of it reusable

---
 engines/avalanche/avalot.cpp | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'engines/avalanche/avalot.cpp')

diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index 52ba3b2189..9555bb4505 100644
--- a/engines/avalanche/avalot.cpp
+++ b/engines/avalanche/avalot.cpp
@@ -1478,7 +1478,10 @@ void AvalancheEngine::resetVariables() {
 	_givenPenToAyles = false;
 	_askedDogfoodAboutNim = false;
 	_startTime = getTimeInSeconds();
+}
 
+void AvalancheEngine::resetAllVariables() {
+	resetVariables();
 	_parser->resetVariables();
 	_nim->resetVariables();
 	_animation->resetVariables();
@@ -1500,7 +1503,7 @@ void AvalancheEngine::newGame() {
 	avvy->init(0, true);
 
 	_alive = true;
-	resetVariables();
+	resetAllVariables();
 
 	_dialogs->setBubbleStateNatural();
 
-- 
cgit v1.2.3