diff options
| author | Paul Gilbert | 2007-11-12 10:09:33 +0000 |
|---|---|---|
| committer | Paul Gilbert | 2007-11-12 10:09:33 +0000 |
| commit | 7bf1b77f3c700cd6b791adf8e10173f889af47fa (patch) | |
| tree | ad0618590d56337687ca4e465264c1129f92cc3a | |
| parent | 705cf3cc87e6a6ef30a686d5aa65fad1510da61d (diff) | |
| download | scummvm-rg350-7bf1b77f3c700cd6b791adf8e10173f889af47fa.tar.gz scummvm-rg350-7bf1b77f3c700cd6b791adf8e10173f889af47fa.tar.bz2 scummvm-rg350-7bf1b77f3c700cd6b791adf8e10173f889af47fa.zip | |
removeSounds was being called too early - it was setting the current area to that of the room being left, rather than the one being entered
svn-id: r29482
| -rw-r--r-- | engines/lure/game.cpp | 2 | ||||
| -rw-r--r-- | engines/lure/room.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/engines/lure/game.cpp b/engines/lure/game.cpp index 8b7c7cdb20..c8abff2b92 100644 --- a/engines/lure/game.cpp +++ b/engines/lure/game.cpp @@ -330,8 +330,6 @@ void Game::playerChangeRoom() { delayList.clear(); - Sound.removeSounds(); - RoomData *roomData = res.getRoom(roomNum); assert(roomData); roomData->flags |= HOTSPOTFLAG_FOUND; diff --git a/engines/lure/room.cpp b/engines/lure/room.cpp index b74d3bf849..12e58a1be6 100644 --- a/engines/lure/room.cpp +++ b/engines/lure/room.cpp @@ -28,6 +28,7 @@ #include "lure/events.h" #include "lure/strings.h" #include "lure/scripts.h" +#include "lure/sound.h" namespace Lure { @@ -502,6 +503,8 @@ void Room::setRoomNumber(uint16 newRoomNumber, bool showOverlay) { // disk cursor as a room changes _screen.paletteFadeOut(GAME_COLOURS - 1); leaveRoom(); + + Sound.removeSounds(); } _screen.empty(); |