thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Removed _roomChange hack since it's no longer needed.

Browse source 
svn-id: r43392
This commit is contained in:
Denis Kasak 2009-08-15 02:53:14 +00:00
parent abf10049bb
commit 1c0df34b4d
4 changed files with 0 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

3
engines/draci/draci.cpp
View file

@ -194,12 +194,10 @@ bool DraciEngine::handleEvents() {
if (event.kbd.keycode == Common::KEYCODE_RIGHT) { if (event.kbd.keycode == Common::KEYCODE_RIGHT) {
_game->setRoomNum(_game->nextRoomNum()); _game->setRoomNum(_game->nextRoomNum());
_game->setGateNum(0); _game->setGateNum(0);
_game->_roomChange = true;
} }
else if (event.kbd.keycode == Common::KEYCODE_LEFT) { else if (event.kbd.keycode == Common::KEYCODE_LEFT) {
_game->setRoomNum(_game->prevRoomNum()); _game->setRoomNum(_game->prevRoomNum());
_game->setGateNum(0); _game->setGateNum(0);
_game->_roomChange = true;
} }
else if (event.kbd.keycode == Common::KEYCODE_ESCAPE) { else if (event.kbd.keycode == Common::KEYCODE_ESCAPE) {
int escRoom = _game->getEscRoom(); int escRoom = _game->getEscRoom();
@ -210,7 +208,6 @@ bool DraciEngine::handleEvents() {
// Schedule room change // Schedule room change
_game->setRoomNum(_game->getEscRoom()); _game->setRoomNum(_game->getEscRoom());
_game->setGateNum(0); _game->setGateNum(0);
_game->_roomChange = true;
_game->setExitLoop(true); _game->setExitLoop(true);
// End any currently running GPL programs // End any currently running GPL programs

6
engines/draci/game.cpp
View file

@ -189,9 +189,6 @@ void Game::start() {
_currentRoom._roomNum = _newRoom; _currentRoom._roomNum = _newRoom;
_currentGate = _newGate; _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 // Run the program for the gate the dragon came through
runGateProgram(_newGate); runGateProgram(_newGate);
@ -225,9 +222,6 @@ void Game::init() {
_vm->_mouse->setCursorType(kNormalCursor); _vm->_mouse->setCursorType(kNormalCursor);
// HACK: Won't be needed once I've implemented the loop properly
_roomChange = false;
_loopStatus = kStatusOrdinary; _loopStatus = kStatusOrdinary;
_objUnderCursor = kOverlayImage; _objUnderCursor = kOverlayImage;

2
engines/draci/game.h
View file

@ -300,8 +300,6 @@ public:
void schedulePalette(int paletteID); void schedulePalette(int paletteID);
int getScheduledPalette(); int getScheduledPalette();
bool _roomChange;
private: private:
DraciEngine *_vm; DraciEngine *_vm;

3
engines/draci/script.cpp
View file

@ -607,9 +607,6 @@ void Script::newRoom(Common::Queue<int> &params) {
_vm->_game->setRoomNum(room); _vm->_game->setRoomNum(room);
_vm->_game->setGateNum(gate); _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> &params) { void Script::talk(Common::Queue<int> &params) {