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

[clone2727]

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

Summary:
e4898831a3 PEGASUS: Ease off the CPU in the overview
fdc80fd952 PEGASUS: Improve on the WSC missing AI videos bug


Commit: e4898831a3ec4602ed93cad372526c6df8126126
    https://github.com/scummvm/scummvm/commit/e4898831a3ec4602ed93cad372526c6df8126126
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-10-29T08:17:50-07:00

Commit Message:
PEGASUS: Ease off the CPU in the overview

Changed paths:
    engines/pegasus/pegasus.cpp



diff --git a/engines/pegasus/pegasus.cpp b/engines/pegasus/pegasus.cpp
index 81e8058..420ca39 100644
--- a/engines/pegasus/pegasus.cpp
+++ b/engines/pegasus/pegasus.cpp
@@ -1136,6 +1136,7 @@ void PegasusEngine::doInterfaceOverview() {
 		overviewText.redrawMovieWorld();
 
 		refreshDisplay();
+		_system->delayMillis(10);
 	}
 
 	if (shouldQuit())


Commit: fdc80fd952120ecb8a4941edd4c2e404cdc5fa33
    https://github.com/scummvm/scummvm/commit/fdc80fd952120ecb8a4941edd4c2e404cdc5fa33
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-10-29T08:17:50-07:00

Commit Message:
PEGASUS: Improve on the WSC missing AI videos bug

Made the only hint available into the first hint

Changed paths:
    engines/pegasus/neighborhood/wsc/wsc.cpp



diff --git a/engines/pegasus/neighborhood/wsc/wsc.cpp b/engines/pegasus/neighborhood/wsc/wsc.cpp
index 89c31fa..50b7774 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):