diff options
| author | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
|---|---|---|
| committer | Kamil Zbróg | 2014-01-07 00:13:05 +0000 |
| commit | e94fabc37407a7d300af04493b0f5cbced42a092 (patch) | |
| tree | 998bfaa03109a49d2bb9ec5b17e817ef7cc32a4c /engines/avalanche/avalot.cpp | |
| parent | 165b8be77f4621ff5de8a483c6cd9ac497492a0a (diff) | |
| parent | 4f6c3efa15c68dfa49bf5e6fe75dec034abe903b (diff) | |
| download | scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.gz scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.tar.bz2 scummvm-rg350-e94fabc37407a7d300af04493b0f5cbced42a092.zip | |
Merge remote-tracking branch 'sync/master' into prince-malik
Diffstat (limited to 'engines/avalanche/avalot.cpp')
| -rw-r--r-- | engines/avalanche/avalot.cpp | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/engines/avalanche/avalot.cpp b/engines/avalanche/avalot.cpp index ec3f81e55d..9555bb4505 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; @@ -1479,7 +1478,10 @@ void AvalancheEngine::resetVariables() { _givenPenToAyles = false; _askedDogfoodAboutNim = false; _startTime = getTimeInSeconds(); +} +void AvalancheEngine::resetAllVariables() { + resetVariables(); _parser->resetVariables(); _nim->resetVariables(); _animation->resetVariables(); @@ -1501,7 +1503,7 @@ void AvalancheEngine::newGame() { avvy->init(0, true); _alive = true; - resetVariables(); + resetAllVariables(); _dialogs->setBubbleStateNatural(); |