libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-01-07 10:21:31 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix running clearing IsReloaded().

Browse Source 
Currently, if gate programs used loop(), they exitted immediately due to not
having cleared this flag.

svn-id: r45753
This commit is contained in:
Robert Špalek 2009-11-08 18:55:41 +00:00
parent f8ab3f866e
commit 121baa2660
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
engines/draci/game.cpp
View File

@ -444,6 +444,7 @@ void Game::advanceAnimationsAndTestLoopExit() {
bool walkingFinished = false; bool walkingFinished = false;
if (_walkingState.isActive()) { if (_walkingState.isActive()) {
walkingFinished = !_walkingState.continueWalkingOrClearPath(); walkingFinished = !_walkingState.continueWalkingOrClearPath();
// If walking has finished, the path won't be active anymore.
} }
// Advance animations (this may also call setExitLoop(true) in the // Advance animations (this may also call setExitLoop(true) in the
@ -1355,6 +1356,7 @@ bool Game::enterNewRoom() {
// If the game has been reloaded, force reloading all animations. // If the game has been reloaded, force reloading all animations.
return true; return true;
} }
setIsReloaded(false);
debugC(1, kDraciLogicDebugLevel, "Entering room %d using gate %d", _newRoom, _newGate); debugC(1, kDraciLogicDebugLevel, "Entering room %d using gate %d", _newRoom, _newGate);
_vm->_mouse->cursorOff(); _vm->_mouse->cursorOff();
@ -1444,7 +1446,6 @@ bool Game::enterNewRoom() {
// Reset the loop status. // Reset the loop status.
setLoopStatus(kStatusOrdinary); setLoopStatus(kStatusOrdinary);
setIsReloaded(false);
if (_vm->_script->shouldEndProgram()) { if (_vm->_script->shouldEndProgram()) {
// Escape pressed during the intro or map animations run in the // Escape pressed during the intro or map animations run in the
// init scripts. This flag was turned on to skip the rest of // init scripts. This flag was turned on to skip the rest of