[Scummvm-cvs-logs] SF.net SVN: scummvm: [29482] scummvm/trunk/engines/lure

[dreammaster at users.sourceforge.net]

Revision: 29482
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29482&view=rev
Author:   dreammaster
Date:     2007-11-12 02:09:33 -0800 (Mon, 12 Nov 2007)

Log Message:
-----------
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

Modified Paths:
--------------
    scummvm/trunk/engines/lure/game.cpp
    scummvm/trunk/engines/lure/room.cpp

Modified: scummvm/trunk/engines/lure/game.cpp
===================================================================
--- scummvm/trunk/engines/lure/game.cpp	2007-11-12 09:53:10 UTC (rev 29481)
+++ scummvm/trunk/engines/lure/game.cpp	2007-11-12 10:09:33 UTC (rev 29482)
@@ -330,8 +330,6 @@
 
 	delayList.clear();
 
-	Sound.removeSounds();
-
 	RoomData *roomData = res.getRoom(roomNum);
 	assert(roomData);
 	roomData->flags |= HOTSPOTFLAG_FOUND;

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2007-11-12 09:53:10 UTC (rev 29481)
+++ scummvm/trunk/engines/lure/room.cpp	2007-11-12 10:09:33 UTC (rev 29482)
@@ -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 @@
 		// disk cursor as a room changes
 		_screen.paletteFadeOut(GAME_COLOURS - 1);
 		leaveRoom();
+
+		Sound.removeSounds();
 	}
 
 	_screen.empty();


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.