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

dreammaster at users.sourceforge.net dreammaster at users.sourceforge.net
Sat Nov 17 12:03:18 CET 2007


Revision: 29537
          http://scummvm.svn.sourceforge.net/scummvm/?rev=29537&view=rev
Author:   dreammaster
Date:     2007-11-17 03:03:18 -0800 (Sat, 17 Nov 2007)

Log Message:
-----------
Bugfix to properly clear previous room layers and fade in the screen when restoring a game

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

Modified: scummvm/trunk/engines/lure/room.cpp
===================================================================
--- scummvm/trunk/engines/lure/room.cpp	2007-11-17 10:49:14 UTC (rev 29536)
+++ scummvm/trunk/engines/lure/room.cpp	2007-11-17 11:03:18 UTC (rev 29537)
@@ -112,13 +112,6 @@
 void Room::leaveRoom() {
 	Resources &r = Resources::getReference();
 
-	// Deallocate graphical layers from the room
-	for (int layerNum = 0; layerNum < _numLayers; ++layerNum)
-		if (_layers[layerNum]) {
-			delete _layers[layerNum];
-			_layers[layerNum] = NULL;
-		}
-
 	// Scan through the hotspot list and remove any uneeded entries 
 
 	HotspotList &list = r.activeHotspots();
@@ -545,6 +538,14 @@
 		// disk cursor as a room changes
 		_screen.paletteFadeOut(GAME_COLOURS - 1);
 
+		// Deallocate graphical layers from the room
+		for (int layerNum = 0; layerNum < _numLayers; ++layerNum) {
+			if (_layers[layerNum]) {
+				delete _layers[layerNum];
+				_layers[layerNum] = NULL;
+			}
+		}
+
 		if (leaveFlag) {
 			leaveRoom();
 			Sound.removeSounds();
@@ -595,7 +596,7 @@
 	update();
 	_screen.update();
 
-	if (leaveFlag)
+	if (fadeFlag)
 		_screen.paletteFadeIn(&p);
 	else
 		_screen.setPalette(&p);


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




More information about the Scummvm-git-logs mailing list