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

[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:
c091afa297 AVALANCHE: Move direction reset to Animation::resetVariables()


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

Commit Message:
AVALANCHE: Move direction reset to Animation::resetVariables()

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



diff --git a/engines/avalanche/animation.cpp b/engines/avalanche/animation.cpp
index cef4088..66097b2 100644
--- a/engines/avalanche/animation.cpp
+++ b/engines/avalanche/animation.cpp
@@ -1433,6 +1433,7 @@ int Animation::getAvvyClothes() {
 }
 
 void Animation::resetVariables() {
+	setDirection(kDirUp);
 	_geidaSpin = 0;
 	_geidaTime = 0;
 	_arrowTriggered = false;
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp
index ec3f81e..52ba3b2 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;