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

urukgit urukgit at users.noreply.github.com
Tue Nov 5 20:46:26 CET 2013


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:
e9c5265d45 AVALANCHE: Repair initVariables(), restore the call of it.


Commit: e9c5265d45dd83913fb4d65b8980fbf504252ff7
    https://github.com/scummvm/scummvm/commit/e9c5265d45dd83913fb4d65b8980fbf504252ff7
Author: urukgit (koppirnyo at gmail.com)
Date: 2013-11-05T11:45:50-08:00

Commit Message:
AVALANCHE: Repair initVariables(), restore the call of it.

We don't have to call resetVariables() here. It's called in newGame()
as well as in loadGame(). Calling it here would end up in calling
setDirection(), but we didn't even istaniate _animation here yet.

Changed paths:
    engines/avalanche/avalanche.cpp



diff --git a/engines/avalanche/avalanche.cpp b/engines/avalanche/avalanche.cpp
index aa0d515..b45f178 100644
--- a/engines/avalanche/avalanche.cpp
+++ b/engines/avalanche/avalanche.cpp
@@ -57,6 +57,7 @@ AvalancheEngine::AvalancheEngine(OSystem *syst, const AvalancheGameDescription *
 	_sound = nullptr;
 
 	_platform = gd->desc.platform;
+    initVariables();
 }
 
 AvalancheEngine::~AvalancheEngine() {
@@ -88,8 +89,6 @@ AvalancheEngine::~AvalancheEngine() {
 }
 
 void AvalancheEngine::initVariables() {
-	resetVariables();
-
 	for (int i = 0; i < 31; i++) {
 		_also[i][0] = nullptr;
 		_also[i][1] = nullptr;






More information about the Scummvm-git-logs mailing list