diff options
author | Denis Kasak | 2009-07-30 03:43:44 +0000 |
---|---|---|
committer | Denis Kasak | 2009-07-30 03:43:44 +0000 |
commit | 167b6da23050a60ee0d56c6b435c3c1bbb159d8a (patch) | |
tree | 36e9db277576b014caabeda79433cd5a6155906c /engines/draci/game.cpp | |
parent | 181b155a2f50a05ec2982fa581d7ad5893746a35 (diff) | |
download | scummvm-rg350-167b6da23050a60ee0d56c6b435c3c1bbb159d8a.tar.gz scummvm-rg350-167b6da23050a60ee0d56c6b435c3c1bbb159d8a.tar.bz2 scummvm-rg350-167b6da23050a60ee0d56c6b435c3c1bbb159d8a.zip |
* 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
Diffstat (limited to 'engines/draci/game.cpp')
-rw-r--r-- | engines/draci/game.cpp | 12 |
1 files changed, 6 insertions, 6 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]; } |