diff options
author | Denis Kasak | 2009-08-15 02:53:14 +0000 |
---|---|---|
committer | Denis Kasak | 2009-08-15 02:53:14 +0000 |
commit | 1c0df34b4dd47fb686b4af67abdcc13a50d24f7e (patch) | |
tree | 5586d33c9828f667c14c750866693843acca268e /engines/draci | |
parent | abf10049bb50d55020ee0f791646a6ca0c0baea8 (diff) | |
download | scummvm-rg350-1c0df34b4dd47fb686b4af67abdcc13a50d24f7e.tar.gz scummvm-rg350-1c0df34b4dd47fb686b4af67abdcc13a50d24f7e.tar.bz2 scummvm-rg350-1c0df34b4dd47fb686b4af67abdcc13a50d24f7e.zip |
Removed _roomChange hack since it's no longer needed.
svn-id: r43392
Diffstat (limited to 'engines/draci')
-rw-r--r-- | engines/draci/draci.cpp | 3 | ||||
-rw-r--r-- | engines/draci/game.cpp | 6 | ||||
-rw-r--r-- | engines/draci/game.h | 2 | ||||
-rw-r--r-- | engines/draci/script.cpp | 3 |
4 files changed, 0 insertions, 14 deletions
diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp index a09f5488a9..e14c9343c2 100644 --- a/engines/draci/draci.cpp +++ b/engines/draci/draci.cpp @@ -194,12 +194,10 @@ bool DraciEngine::handleEvents() { if (event.kbd.keycode == Common::KEYCODE_RIGHT) { _game->setRoomNum(_game->nextRoomNum()); _game->setGateNum(0); - _game->_roomChange = true; } else if (event.kbd.keycode == Common::KEYCODE_LEFT) { _game->setRoomNum(_game->prevRoomNum()); _game->setGateNum(0); - _game->_roomChange = true; } else if (event.kbd.keycode == Common::KEYCODE_ESCAPE) { int escRoom = _game->getEscRoom(); @@ -210,7 +208,6 @@ bool DraciEngine::handleEvents() { // Schedule room change _game->setRoomNum(_game->getEscRoom()); _game->setGateNum(0); - _game->_roomChange = true; _game->setExitLoop(true); // End any currently running GPL programs diff --git a/engines/draci/game.cpp b/engines/draci/game.cpp index cfd06201b6..5d78011e8d 100644 --- a/engines/draci/game.cpp +++ b/engines/draci/game.cpp @@ -189,9 +189,6 @@ void Game::start() { _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); @@ -225,9 +222,6 @@ void Game::init() { _vm->_mouse->setCursorType(kNormalCursor); - // HACK: Won't be needed once I've implemented the loop properly - _roomChange = false; - _loopStatus = kStatusOrdinary; _objUnderCursor = kOverlayImage; diff --git a/engines/draci/game.h b/engines/draci/game.h index 8445bf7a72..0dcd68cd68 100644 --- a/engines/draci/game.h +++ b/engines/draci/game.h @@ -300,8 +300,6 @@ public: void schedulePalette(int paletteID); int getScheduledPalette(); - bool _roomChange; - private: DraciEngine *_vm; diff --git a/engines/draci/script.cpp b/engines/draci/script.cpp index e30af8f00c..fdc2624b73 100644 --- a/engines/draci/script.cpp +++ b/engines/draci/script.cpp @@ -607,9 +607,6 @@ void Script::newRoom(Common::Queue<int> ¶ms) { _vm->_game->setRoomNum(room); _vm->_game->setGateNum(gate); - - // HACK: Won't be needed once I've implemented the loop properly - _vm->_game->_roomChange = true; } void Script::talk(Common::Queue<int> ¶ms) { |