[Scummvm-cvs-logs] SF.net SVN: scummvm:[45749] scummvm/trunk/engines/draci/game.cpp

[spalek at users.sourceforge.net]

Revision: 45749
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45749&view=rev
Author:   spalek
Date:     2009-11-08 06:56:30 +0000 (Sun, 08 Nov 2009)

Log Message:
-----------
Fix enabling mouse cursor when entering a room.

It used to have a wrong palette.

Modified Paths:
--------------
    scummvm/trunk/engines/draci/game.cpp

Modified: scummvm/trunk/engines/draci/game.cpp
===================================================================
--- scummvm/trunk/engines/draci/game.cpp	2009-11-08 06:46:24 UTC (rev 45748)
+++ scummvm/trunk/engines/draci/game.cpp	2009-11-08 06:56:30 UTC (rev 45749)
@@ -1356,6 +1356,7 @@
 		return true;
 	}
 	debugC(1, kDraciLogicDebugLevel, "Entering room %d using gate %d", _newRoom, _newGate);
+	_vm->_mouse->cursorOff();
 
 	// TODO: maybe wait till all sounds end instead of stopping them.
 	// In any case, make sure all sounds are stopped before we deallocate
@@ -1411,6 +1412,13 @@
 	// cleaned up.  Some rooms (e.g., the map) don't support walking.
 	_walkingState.stopWalking();
 
+	// Reset the flag allowing to run the scripts.  It may have been turned
+	// on by pressing Escape in the intro or in the map room.
+	_vm->_script->endCurrentProgram(false);
+
+	loadRoom(_newRoom);
+	loadOverlays();
+
 	// Clean the mouse and animation title.  It gets first updated in
 	// loop(), hence if the hero walks during the initialization scripts,
 	// the old values would remain otherwise.
@@ -1420,13 +1428,6 @@
 	Text *title = reinterpret_cast<Text *>(titleAnim->getCurrentFrame());
 	title->setText("");
 
-	// Reset the flag allowing to run the scripts.  It may have been turned
-	// on by pressing Escape in the intro or in the map room.
-	_vm->_script->endCurrentProgram(false);
-
-	loadRoom(_newRoom);
-	loadOverlays();
-
 	// Run the program for the gate the dragon came through
 	runGateProgram(_newGate);
 


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