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

dkasak13 at users.sourceforge.net dkasak13 at users.sourceforge.net
Thu Jul 16 14:07:41 CEST 2009


Revision: 42532
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42532&view=rev
Author:   dkasak13
Date:     2009-07-16 12:07:41 +0000 (Thu, 16 Jul 2009)

Log Message:
-----------
Added proper cursor state handling (when in rooms that don't use the mouse). Added a HACK note for running the gates' scripts.

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-16 11:42:07 UTC (rev 42531)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-16 12:07:41 UTC (rev 42532)
@@ -139,9 +139,6 @@
 
 	_game->init();
 
-	_mouse->setCursorType(kNormalCursor);
-	_mouse->cursorOn();
-
 	Common::Event event;
 	bool quit = false;
 	while (!quit) {

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-16 11:42:07 UTC (rev 42531)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-16 12:07:41 UTC (rev 42532)
@@ -142,6 +142,8 @@
 	_vm->_script->run(dragon->_program, dragon->_init);
 
 	changeRoom(_info._startRoom);
+
+	_vm->_mouse->setCursorType(kNormalCursor);
 }
 
 void Game::loadRoom(int roomNum) {
@@ -190,6 +192,17 @@
 	debugC(4, kDraciLogicDebugLevel, "_escRoom: %d", _currentRoom._escRoom);
 	debugC(4, kDraciLogicDebugLevel, "_numGates: %d", _currentRoom._numGates);
 
+
+	// Set cursor state
+	if (_currentRoom._mouseOn) {
+		debugC(6, kDraciLogicDebugLevel, "Mouse: ON");
+		_vm->_mouse->cursorOn();
+	} else {
+		debugC(6, kDraciLogicDebugLevel, "Mouse: OFF");
+		_vm->_mouse->cursorOff();
+	}
+
+
 	Common::Array<int> gates;
 
 	for (uint i = 0; i < _currentRoom._numGates; ++i) {
@@ -226,6 +239,8 @@
 	debugC(4, kDraciLogicDebugLevel, "Running room init program...");
 	_vm->_script->run(_currentRoom._program, _currentRoom._init);
 
+	// HACK: Gates' scripts shouldn't be run unconditionally
+	// This is for testing
 	for (uint i = 0; i < _currentRoom._numGates; ++i) {
 		debugC(6, kDraciLogicDebugLevel, "Running program for gate %d", i);
 		_vm->_script->run(_currentRoom._program, gates[i]);


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