diff options
author | Robert Špalek | 2010-04-11 06:02:41 +0000 |
---|---|---|
committer | Robert Špalek | 2010-04-11 06:02:41 +0000 |
commit | c66e47cad4bfc390dcc4c31f0b2c200b6a584814 (patch) | |
tree | 5419407c3682a845ec3a0dab7440cdb073292279 /engines/draci | |
parent | 726500a2f3048b274364ba6f82203c0712bd8248 (diff) | |
download | scummvm-rg350-c66e47cad4bfc390dcc4c31f0b2c200b6a584814.tar.gz scummvm-rg350-c66e47cad4bfc390dcc4c31f0b2c200b6a584814.tar.bz2 scummvm-rg350-c66e47cad4bfc390dcc4c31f0b2c200b6a584814.zip |
Fix bug 2983187 on continuing palette change
svn-id: r48615
Diffstat (limited to 'engines/draci')
-rw-r--r-- | engines/draci/game.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp index d985c2dee0..8e7bc1a708 100644 --- a/engines/draci/game.cpp +++ b/engines/draci/game.cpp @@ -1289,6 +1289,9 @@ void Game::enterNewRoom() { // cleaned up. Some rooms (e.g., the map) don't support walking. _walkingState.stopWalking(); + // Stop a possible palette fading. + _fadePhases = _fadePhase = 0; + _currentRoom.load(_newRoom, _vm->_roomsArchive); loadWalkingMap(getMapID()); loadRoomObjects(); |