From fdc80fd952120ecb8a4941edd4c2e404cdc5fa33 Mon Sep 17 00:00:00 2001
From: Matthew Hoops
Date: Mon, 29 Oct 2012 11:16:51 -0400
Subject: PEGASUS: Improve on the WSC missing AI videos bug

Made the only hint available into the first hint
---
 engines/pegasus/neighborhood/wsc/wsc.cpp | 26 ++++++++++++--------------
 1 file changed, 12 insertions(+), 14 deletions(-)

(limited to 'engines/pegasus')

diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index 89c31fa7e9..50b7774da4 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -646,11 +646,13 @@ uint WSC::getNumHints() {
 			return 1;
 		break;
 	case MakeRoomView(kWSC03, kNorth):
-		if (inSynthesizerGame() || (_vm->getEnergyDeathReason() == kDeathDidntStopPoison &&
-				!_privateFlags.getFlag(kWSCPrivateInMoleculeGameFlag) &&
-				!GameState.getWSCDesignedAntidote()))
-			return 3;
-		break;
+		// WORKAROUND: The original game is missing the first two hint movies and
+		// just plays nothing in its stead. We'll just return that we have one
+		// hint available.
+		if (inSynthesizerGame())
+			return 1;
+
+		// fall through
 	case MakeRoomView(kWSC01, kNorth):
 	case MakeRoomView(kWSC01, kSouth):
 	case MakeRoomView(kWSC01, kEast):
@@ -779,16 +781,12 @@ Common::String WSC::getHintMovie(uint hintNum) {
 		}
 		break;
 	case MakeRoomView(kWSC03, kNorth):
-		if (inSynthesizerGame()) {
-			// WORKAROUND: The original game is missing the first two hint movies and
-			// just plays nothing in its stead.
-			if (hintNum != 3)
-				return "";
-
-			return Common::String::format("Images/AI/WSC/XW03NH%d", hintNum);
-		}
+		// WORKAROUND: The original game is missing the first two hint movies and
+		// just plays nothing in its stead. We just make it the first hint.
+		if (inSynthesizerGame())
+			return "Images/AI/WSC/XW03NH3";
 
-		return Common::String::format("Images/AI/WSC/XWPH%d", hintNum);
+		// fall through
 	case MakeRoomView(kWSC01, kNorth):
 	case MakeRoomView(kWSC01, kSouth):
 	case MakeRoomView(kWSC01, kEast):
-- 
cgit v1.2.3