[Scummvm-cvs-logs] SF.net SVN: scummvm:[43162] scummvm/branches/gsoc2009-draci/engines/draci/ game.cpp

[dkasak13 at users.sourceforge.net]

Revision: 43162
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43162&view=rev
Author:   dkasak13
Date:     2009-08-09 04:24:52 +0000 (Sun, 09 Aug 2009)

Log Message:
-----------
Moved cursor state setting (when entering a new room) from Game::loadRoom() to Game::start() (just after running the gate program). This fixes a black cursor bug when the game starts (the cursor should not be even displayed then).

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/game.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-09 04:12:36 UTC (rev 43161)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-09 04:24:52 UTC (rev 43162)
@@ -183,6 +183,16 @@
 
 			// Run the program for the gate the dragon came through
 			runGateProgram(_newGate);
+
+			// Set cursor state
+			// Need to do this after we set the palette since the cursors use it
+			if (_currentRoom._mouseOn) {
+				debugC(6, kDraciLogicDebugLevel, "Mouse: ON");
+				_vm->_mouse->cursorOn();
+			} else {
+				debugC(6, kDraciLogicDebugLevel, "Mouse: OFF");
+				_vm->_mouse->cursorOff();
+			}
  		}
 
 		// Mimic the original engine by setting the loop status to Ordinary before
@@ -614,16 +624,6 @@
 	f = _vm->_paletteArchive->getFile(_currentRoom._palette);
 	_vm->_screen->setPalette(f->_data, 0, kNumColours);
 
-	// Set cursor state
-	// Need to do this after we set the palette since the cursors use it
-	if (_currentRoom._mouseOn) {
-		debugC(6, kDraciLogicDebugLevel, "Mouse: ON");
-		_vm->_mouse->cursorOn();
-	} else {
-		debugC(6, kDraciLogicDebugLevel, "Mouse: OFF");
-		_vm->_mouse->cursorOff();
-	}
-
 	// HACK: Create a visible overlay from the walking map so we can test it
 	byte *wlk = new byte[kScreenWidth * kScreenHeight];
 	memset(wlk, 255, kScreenWidth * kScreenHeight);


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