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

[dkasak13 at users.sourceforge.net]

Revision: 43392
          http://scummvm.svn.sourceforge.net/scummvm/?rev=43392&view=rev
Author:   dkasak13
Date:     2009-08-15 02:53:14 +0000 (Sat, 15 Aug 2009)

Log Message:
-----------
Removed _roomChange hack since it's no longer needed.

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-08-15 02:42:34 UTC (rev 43391)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-08-15 02:53:14 UTC (rev 43392)
@@ -194,12 +194,10 @@
 			if (event.kbd.keycode == Common::KEYCODE_RIGHT) {
 				_game->setRoomNum(_game->nextRoomNum());
 				_game->setGateNum(0);
-				_game->_roomChange = true;
 			}
 			else if (event.kbd.keycode == Common::KEYCODE_LEFT) {
 				_game->setRoomNum(_game->prevRoomNum());
 				_game->setGateNum(0);
-				_game->_roomChange = true;
 			}
 			else if (event.kbd.keycode == Common::KEYCODE_ESCAPE) {
 				int escRoom = _game->getEscRoom();
@@ -210,7 +208,6 @@
 					// Schedule room change
 					_game->setRoomNum(_game->getEscRoom());
 					_game->setGateNum(0);
-					_game->_roomChange = true;
 					_game->setExitLoop(true);
 
 					// End any currently running GPL programs

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-15 02:42:34 UTC (rev 43391)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-15 02:53:14 UTC (rev 43392)
@@ -189,9 +189,6 @@
 			_currentRoom._roomNum = _newRoom;
 			_currentGate = _newGate;
 
-			// HACK: Won't be needed once I've implemented the loop properly
-			_roomChange = false;
-
 			// Run the program for the gate the dragon came through
 			runGateProgram(_newGate);
 
@@ -225,9 +222,6 @@
 
 	_vm->_mouse->setCursorType(kNormalCursor);
 
-	// HACK: Won't be needed once I've implemented the loop properly
-	_roomChange = false;
-
 	_loopStatus = kStatusOrdinary;
 	_objUnderCursor = kOverlayImage;
 

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-08-15 02:42:34 UTC (rev 43391)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-08-15 02:53:14 UTC (rev 43392)
@@ -300,8 +300,6 @@
 	void schedulePalette(int paletteID);
 	int getScheduledPalette();
 
-	bool _roomChange;
-
 private:
 	DraciEngine *_vm;
 

Modified: scummvm/branches/gsoc2009-draci/engines/draci/script.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-08-15 02:42:34 UTC (rev 43391)
+++ scummvm/branches/gsoc2009-draci/engines/draci/script.cpp	2009-08-15 02:53:14 UTC (rev 43392)
@@ -607,9 +607,6 @@
 
 	_vm->_game->setRoomNum(room);
 	_vm->_game->setGateNum(gate);
-
-	// HACK: Won't be needed once I've implemented the loop properly
-	_vm->_game->_roomChange = true;
 }
 
 void Script::talk(Common::Queue<int> &params) {


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