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

[dkasak13 at users.sourceforge.net]

Revision: 42971
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42971&view=rev
Author:   dkasak13
Date:     2009-08-01 03:07:18 +0000 (Sat, 01 Aug 2009)

Log Message:
-----------
* Added support for loop substatus
* Set loop substatus to Ordinary when changing rooms

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

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-01 02:49:40 UTC (rev 42970)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-08-01 03:07:18 UTC (rev 42971)
@@ -154,16 +154,22 @@
 void Game::start() {
 	while (!shouldQuit()) {
 
+		// If the scheduled room differs from the current one, do a room change
 		if (_newRoom != _currentRoom._roomNum) {
 
+			setLoopSubstatus(kStatusOrdinary);
+	
+			// Do the actual change
 			changeRoom(_newRoom);
 			
+			// Set the current room / gate to the new value
 			_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);
  		}
 
@@ -679,10 +685,18 @@
 	_loopStatus = status;
 }
 
+void Game::setLoopSubstatus(LoopStatus status) {
+	_loopSubstatus = status;
+}
+
 LoopStatus Game::getLoopStatus() {
 	return _loopStatus;
 }
 
+LoopStatus Game::getLoopSubstatus() {
+	return _loopSubstatus;
+}
+
 int Game::getVariable(int numVar) {
 	return _variables[numVar];
 }

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-08-01 02:49:40 UTC (rev 42970)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-08-01 03:07:18 UTC (rev 42971)
@@ -216,7 +216,9 @@
 	void setMarkedAnimationIndex(int index);
 
 	void setLoopStatus(LoopStatus status);
+	void setLoopSubstatus(LoopStatus status);
 	LoopStatus getLoopStatus();
+	LoopStatus getLoopSubstatus();
 
 	bool shouldQuit() { return _shouldQuit; }
 	void setQuit(bool quit) { _shouldQuit = quit; }
@@ -245,6 +247,7 @@
 	int _newGate;
 
 	LoopStatus _loopStatus;
+	LoopStatus _loopSubstatus;
 
 	bool _shouldQuit;
 	bool _shouldExitLoop;


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