* Implemented the "escape room" feature of the original engine which lets a user switch to another location (or skip the intro) by pressing ESC (the escRoom for every location is stored in the data files).

* Reworked the left and right arrow key commands so they don't call changeRoom() themselves but instead schedule the room change via Game::setRoomNum(). In this way, changing rooms like that is still a hack but a bit more "natural", since the loop doesn't get skipped, the gate scripts get run, etc.

svn-id: r43065

1 files changed, 15 insertions, 6 deletions

diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp
index 612f255fc6..87408dbccf 100644
--- a/engines/draci/draci.cpp
+++ b/engines/draci/draci.cpp
@@ -191,12 +191,21 @@ bool DraciEngine::handleEvents() {
 			_game->setQuit(true);
 			break;
 		case Common::EVENT_KEYDOWN:
-			if (event.kbd.keycode == Common::KEYCODE_RIGHT)
-				_game->changeRoom(_game->nextRoomNum());
-
-			else if (event.kbd.keycode == Common::KEYCODE_LEFT)
-				_game->changeRoom(_game->prevRoomNum());
-
+			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) {
+				_game->setRoomNum(_game->getEscRoom());
+				_game->setGateNum(0);
+				_game->_roomChange = true;
+			}
 			// Show walking map toggle
 			else if (event.kbd.keycode == Common::KEYCODE_w) { 
 				_showWalkingMap = !_showWalkingMap;