Huge refactoring of data structures.

Replaced IDs of objects by pointers, which saves many lookups, each of which
is horribly ineffective.  Moved a lot of code into methods of structs now
turned into objects.

Tested the new code a lot and seems to work as well as the old code.

svn-id: r45799

1 files changed, 2 insertions, 10 deletions

diff --git a/engines/draci/draci.cpp b/engines/draci/draci.cpp
index d9720b77fd..f759cad4a3 100644
--- a/engines/draci/draci.cpp
+++ b/engines/draci/draci.cpp
@@ -242,7 +242,7 @@ void DraciEngine::handleEvents() {
 					? _game->getEscRoom() : _game->getPreviousRoomNum();
 
 				// Check if there is an escape room defined for the current room
-				if (escRoom != kNoEscRoom) {
+				if (escRoom >= 0) {
 
 					// Schedule room change
 					// TODO: gate 0 is not always the best one for returning from the map
@@ -266,15 +266,7 @@ void DraciEngine::handleEvents() {
 			case Common::KEYCODE_w:
 				// Show walking map toggle
 				_showWalkingMap = !_showWalkingMap;
-				if (_showWalkingMap) {
-					_anims->play(kWalkingMapOverlay);
-					_anims->play(kWalkingShortestPathOverlay);
-					_anims->play(kWalkingObliquePathOverlay);
-				} else {
-					_anims->stop(kWalkingMapOverlay);
-					_anims->stop(kWalkingShortestPathOverlay);
-					_anims->stop(kWalkingObliquePathOverlay);
-				}
+				_game->switchWalkingAnimations(_showWalkingMap);
 				break;
 			case Common::KEYCODE_q:
 				_game->setWantQuickHero(!_game->getWantQuickHero());