[Scummvm-cvs-logs] SF.net SVN: scummvm:[42916] scummvm/branches/gsoc2009-draci/engines/draci
dkasak13 at users.sourceforge.net
dkasak13 at users.sourceforge.net
Thu Jul 30 05:43:44 CEST 2009
Revision: 42916
http://scummvm.svn.sourceforge.net/scummvm/?rev=42916&view=rev
Author: dkasak13
Date: 2009-07-30 03:43:44 +0000 (Thu, 30 Jul 2009)
Log Message:
-----------
* Woops, Game::getRoomNum() was already implemented. Removed the superfluous implementation.
* Set the first two game variables to the gate and room number in Game::init()
* Fixed compilation
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 03:37:04 UTC (rev 42915)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp 2009-07-30 03:43:44 UTC (rev 42916)
@@ -176,6 +176,10 @@
_currentRoom._roomNum = _info._startRoom;
_currentGate = 0;
+
+ _variables[0] = _currentRoom._roomNum;
+ _variables[1] = _currentGate;
+
changeRoom(_info._startRoom);
}
@@ -602,11 +606,11 @@
}
int Game::getRoomNum() {
- return _currentRoom;
+ return _currentRoom._roomNum;
}
void Game::setRoomNum(int room) {
- _currentRoom = room;
+ _currentRoom._roomNum = room;
}
int Game::getGateNum() {
@@ -625,10 +629,6 @@
return _loopStatus;
}
-int Game::getRoomNum() {
- return _currentRoom._roomNum;
-}
-
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-07-30 03:37:04 UTC (rev 42915)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.h 2009-07-30 03:43:44 UTC (rev 42916)
@@ -164,7 +164,6 @@
void loop();
void changeRoom(uint roomNum);
- int getRoomNum();
// HACK: this is only for testing
int nextRoomNum() {
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