[Scummvm-cvs-logs] scummvm master -> a456295cbdac8fc0921b013f50df2ad4eb02ac8a

[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:
a456295cbd PEGASUS: Fix returning from Mars after destroying the robot's shuttle


Commit: a456295cbdac8fc0921b013f50df2ad4eb02ac8a
    https://github.com/scummvm/scummvm/commit/a456295cbdac8fc0921b013f50df2ad4eb02ac8a
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2014-02-11T18:07:34-08:00

Commit Message:
PEGASUS: Fix returning from Mars after destroying the robot's shuttle

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 99efe10..75f652a 100644
--- a/engines/pegasus/neighborhood/tsa/fulltsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/fulltsa.cpp
@@ -2691,16 +2691,18 @@ void FullTSA::receiveNotification(Notification *notification, const Notification
 			}
 			break;
 		case kTSA37DownloadToOpMemReview:
-			switch (GameState.getTSAState()) {
-			case kPlayerOnWayToNorad:
-				g_opticalChip->playOpMemMovie(kPoseidonSpotID);
-				break;
-			case kPlayerOnWayToMars:
-				g_opticalChip->playOpMemMovie(kAriesSpotID);
-				break;
-			case kPlayerOnWayToWSC:
-				g_opticalChip->playOpMemMovie(kMercurySpotID);
-				break;
+			if (_vm->itemInBiochips(kOpticalBiochip)) {
+				switch (GameState.getTSAState()) {
+				case kPlayerOnWayToNorad:
+					g_opticalChip->playOpMemMovie(kPoseidonSpotID);
+					break;
+				case kPlayerOnWayToMars:
+					g_opticalChip->playOpMemMovie(kAriesSpotID);
+					break;
+				case kPlayerOnWayToWSC:
+					g_opticalChip->playOpMemMovie(kMercurySpotID);
+					break;
+				}
 			}
 
 			if (GameState.allTimeZonesFinished()) {
diff --git a/engines/pegasus/neighborhood/tsa/tinytsa.cpp b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
index 0d11f5d..0326c7f 100644
--- a/engines/pegasus/neighborhood/tsa/tinytsa.cpp
+++ b/engines/pegasus/neighborhood/tsa/tinytsa.cpp
@@ -372,16 +372,18 @@ void TinyTSA::receiveNotification(Notification *notification, const Notification
 			}
 			break;
 		case kTinyTSA37DownloadToOpMemReview:
-			switch (GameState.getTSAState()) {
-			case kPlayerOnWayToNorad:
-				g_opticalChip->playOpMemMovie(kPoseidonSpotID);
-				break;
-			case kPlayerOnWayToMars:
-				g_opticalChip->playOpMemMovie(kAriesSpotID);
-				break;
-			case kPlayerOnWayToWSC:
-				g_opticalChip->playOpMemMovie(kMercurySpotID);
-				break;
+			if (_vm->itemInBiochips(kOpticalBiochip)) {
+				switch (GameState.getTSAState()) {
+				case kPlayerOnWayToNorad:
+					g_opticalChip->playOpMemMovie(kPoseidonSpotID);
+					break;
+				case kPlayerOnWayToMars:
+					g_opticalChip->playOpMemMovie(kAriesSpotID);
+					break;
+				case kPlayerOnWayToWSC:
+					g_opticalChip->playOpMemMovie(kMercurySpotID);
+					break;
+				}
 			}
 
 			requestExtraSequence(kTinyTSA37OpMemReviewToMainMenu, kExtraCompletedFlag, kFilterNoInput);