[Scummvm-cvs-logs] SF.net SVN: scummvm:[42628] scummvm/branches/gsoc2009-draci/engines/draci

[dkasak13 at users.sourceforge.net]

Revision: 42628
          http://scummvm.svn.sourceforge.net/scummvm/?rev=42628&view=rev
Author:   dkasak13
Date:     2009-07-20 17:34:19 +0000 (Mon, 20 Jul 2009)

Log Message:
-----------
Made 'show walking map overlay' setting persist when changing rooms.

Modified Paths:
--------------
    scummvm/branches/gsoc2009-draci/engines/draci/animation.h
    scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
    scummvm/branches/gsoc2009-draci/engines/draci/game.cpp

Modified: scummvm/branches/gsoc2009-draci/engines/draci/animation.h
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/animation.h	2009-07-20 17:25:57 UTC (rev 42627)
+++ scummvm/branches/gsoc2009-draci/engines/draci/animation.h	2009-07-20 17:34:19 UTC (rev 42628)
@@ -30,7 +30,7 @@
 
 namespace Draci {
 
-enum { kOverlayImage = -1, kUnused = -2 };
+enum { kOverlayImage = -1, kWalkingMapOverlay = -2, kUnused = -3 };
 
 enum { kCurrentFrame = -1 };
 

Modified: scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-20 17:25:57 UTC (rev 42627)
+++ scummvm/branches/gsoc2009-draci/engines/draci/draci.cpp	2009-07-20 17:34:19 UTC (rev 42628)
@@ -181,23 +181,27 @@
 			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());
-				else if (event.kbd.keycode == Common::KEYCODE_w) { // Show walking map toggle
-					// Toggle
+
+				// Show walking map toggle
+				else if (event.kbd.keycode == Common::KEYCODE_w) { 
 					showWalkingMap = !showWalkingMap;
-
-					if (showWalkingMap) {
-						_anims->play(-2);
-					} else {
-						_anims->stop(-2);
-					}
 				}
 				break;					
 			default:
 				_mouse->handleEvent(event);
 			}		
 		}
+
+		// Show walking map overlay
+		if (showWalkingMap) {
+			_anims->play(kWalkingMapOverlay);
+		} else {
+			_anims->stop(kWalkingMapOverlay);
+		}
+
 		_game->loop();
 		_anims->drawScene(_screen->getSurface());
 		_screen->copyToScreen();

Modified: scummvm/branches/gsoc2009-draci/engines/draci/game.cpp
===================================================================
--- scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-20 17:25:57 UTC (rev 42627)
+++ scummvm/branches/gsoc2009-draci/engines/draci/game.cpp	2009-07-20 17:34:19 UTC (rev 42628)
@@ -345,7 +345,7 @@
 
 	Sprite *ov = new Sprite(wlk, kScreenWidth, kScreenHeight, 0, 0, false);
 
-	Animation *map = _vm->_anims->addAnimation(-2, 255, false);
+	Animation *map = _vm->_anims->addAnimation(kWalkingMapOverlay, 255, false);
 	map->addFrame(ov);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.