* 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

svn-id: r42916

2 files changed, 6 insertions, 7 deletions

diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp
index 90cdf77434..7b6e3608e7 100644
--- a/engines/draci/game.cpp
+++ b/engines/draci/game.cpp
@@ -176,6 +176,10 @@ void Game::init() {
 
 	_currentRoom._roomNum = _info._startRoom;
 	_currentGate = 0;
+
+	_variables[0] = _currentRoom._roomNum;
+	_variables[1] = _currentGate;
+
 	changeRoom(_info._startRoom);
 }
 
@@ -602,11 +606,11 @@ void Game::changeRoom(uint roomNum) {
 }
 
 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 @@ LoopStatus Game::getLoopStatus() {
 	return _loopStatus;
 }
 
-int Game::getRoomNum() {
-	return _currentRoom._roomNum;
-}
-
 int Game::getVariable(int numVar) {
 	return _variables[numVar];
 }
diff --git a/engines/draci/game.h b/engines/draci/game.h
index ba69673642..c6168d6d49 100644
--- a/engines/draci/game.h
+++ b/engines/draci/game.h
@@ -164,7 +164,6 @@ public:
 	void loop();
 
 	void changeRoom(uint roomNum);
-	int getRoomNum();
 
 	// HACK: this is only for testing
 	int nextRoomNum() {