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

clone2727 clone2727 at gmail.com
Sat Oct 27 05:23:45 CEST 2012


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:
f67bd1f2e7 PEGASUS: Don't error out for two missing WSC AI videos


Commit: f67bd1f2e74034c46fd2af3988efdd04b27c27b0
    https://github.com/scummvm/scummvm/commit/f67bd1f2e74034c46fd2af3988efdd04b27c27b0
Author: Matthew Hoops (clone2727 at gmail.com)
Date: 2012-10-26T20:22:27-07:00

Commit Message:
PEGASUS: Don't error out for two missing WSC AI videos

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 f3bf113..89c31fa 100644
--- a/engines/pegasus/neighborhood/wsc/wsc.cpp
+++ b/engines/pegasus/neighborhood/wsc/wsc.cpp
@@ -779,8 +779,14 @@ Common::String WSC::getHintMovie(uint hintNum) {
 		}
 		break;
 	case MakeRoomView(kWSC03, kNorth):
-		if (inSynthesizerGame())
+		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);
+		}
 
 		return Common::String::format("Images/AI/WSC/XWPH%d", hintNum);
 	case MakeRoomView(kWSC01, kNorth):






More information about the Scummvm-git-logs mailing list