[Scummvm-cvs-logs] scummvm master -> 975877b8ed689fd021e1d25d9eeaef01bd97d202

[clone2727]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
975877b8ed PEGASUS: Fix Ares flag not getting reset upon jumping to Mars


Commit: 975877b8ed689fd021e1d25d9eeaef01bd97d202
    https://github.com/scummvm/scummvm/commit/975877b8ed689fd021e1d25d9eeaef01bd97d202
Author: Keith Kaisershot (keithkaisershot at gmail.com)
Date: 2014-04-13T23:21:42-04:00

Commit Message:
PEGASUS: Fix Ares flag not getting reset upon jumping to Mars

Changed paths:
    engines/pegasus/neighborhood/tsa/fulltsa.cpp
    engines/pegasus/neighborhood/tsa/tinytsa.cpp



diff --git a/engines/pegasus/neighborhood/tsa/fulltsa.cpp b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
index 75f652a..c0fa3c4 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -2643,6 +2643,7 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
 				GameState.setMarsReadyForShuttleTransport(false);
 				GameState.setMarsFinishedCanyonChase(false);
 				GameState.setMarsThreadedMaze(false);
+				GameState.setMarsSawRobotLeave(false);
 				break;
 			case kPlayerOnWayToWSC:
 				_vm->jumpToNewEnvironment(kWSCID, kWSC01, kWest);
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index 0326c7f..c808325 100644
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -327,6 +327,7 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
 				GameState.setMarsReadyForShuttleTransport(false);
 				GameState.setMarsFinishedCanyonChase(false);
 				GameState.setMarsThreadedMaze(false);
+				GameState.setMarsSawRobotLeave(false);
 				break;
 			case kPlayerOnWayToWSC:
 				_vm->jumpToNewEnvironment(kWSCID, kWSC01, kWest);