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

dkasak13 at users.sourceforge.net dkasak13 at users.sourceforge.net
Thu Jul 30 05:37:05 CEST 2009


Revision: 42915
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42915&view=rev
Author:   dkasak13
Date:     2009-07-30 03:37:04 +0000 (Thu, 30 Jul 2009)

Log Message:
-----------
* Added support for keeping track of gates (exits from rooms)
* Added getters and setters for current room and gate numbers

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-07-30 02:16:58 UTC (rev 42914)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-30 03:37:04 UTC (rev 42915)
@@ -175,6 +175,7 @@
 	_vm->_script->run(dragon->_program, dragon->_init);
 
 	_currentRoom._roomNum = _info._startRoom;
+	_currentGate = 0;
 	changeRoom(_info._startRoom);
 }
 
@@ -350,7 +351,7 @@
 	Common::Array<int> gates;
 
 	for (uint i = 0; i < _currentRoom._numGates; ++i) {
-		gates.push_back(roomReader.readSint16LE());
+		gates.push_back(roomReader.readSint16LE() - 1);
 	}
 
 	// Load the room's objects
@@ -600,6 +601,22 @@
 	loadOverlays();
 }
 
+int Game::getRoomNum() {
+	return _currentRoom;
+}
+
+void Game::setRoomNum(int room) {
+	_currentRoom = room;
+}
+
+int Game::getGateNum() {
+	return _currentGate;
+}
+
+void Game::setGateNum(int gate) {
+	_currentGate = gate;
+}
+
 void Game::setLoopStatus(LoopStatus status) {
 	_loopStatus = status;
 }

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-30 02:16:58 UTC (rev 42914)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h	2009-07-30 03:37:04 UTC (rev 42915)
@@ -204,6 +204,12 @@
 	int getVariable(int varNum);
 	void setVariable(int varNum, int value);	
 
+	int getRoomNum();
+	void setRoomNum(int room);
+
+	int getGateNum();
+	void setGateNum(int gate);
+
 	int getIconStatus(int iconID);
 
 	int getMarkedAnimationIndex();
@@ -230,6 +236,8 @@
 	GameObject *_objects;
 
 	Room _currentRoom;
+	int _currentGate;	
+
 	LoopStatus _loopStatus;
 
 	bool _shouldQuit;


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