[Scummvm-git-logs] scummvm master -> f0f6915e5238063b83ef2d15482c64039c4b2756

sev- sev at scummvm.org
Wed Feb 8 01:29:44 CET 2017


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:
f0f6915e52 DIRECTOR: Specify Shared Cast name for D4+ Mac movies


Commit: f0f6915e5238063b83ef2d15482c64039c4b2756
    https://github.com/scummvm/scummvm/commit/f0f6915e5238063b83ef2d15482c64039c4b2756
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-08T01:29:38+01:00

Commit Message:
DIRECTOR: Specify Shared Cast name for D4+ Mac movies

Changed paths:
    engines/director/director.cpp
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/director.cpp b/engines/director/director.cpp
index ab45e92..d9bf8cd 100644
--- a/engines/director/director.cpp
+++ b/engines/director/director.cpp
@@ -136,10 +136,14 @@ Common::Error DirectorEngine::run() {
 	//_mainArchive = new RIFFArchive();
 	//_mainArchive->openFile("bookshelf_example.mmm");
 
-	if (getPlatform() == Common::kPlatformWindows)
+	if (getPlatform() == Common::kPlatformWindows) {
 		_sharedCastFile = "SHARDCST.MMM";
-	else
-		_sharedCastFile = "Shared Cast";
+	} else {
+		if (getVersion() < 3)
+			_sharedCastFile = "Shared Cast";
+		else
+			_sharedCastFile = "Shared.dir";
+	}
 
 	loadSharedCastsFrom(_sharedCastFile);
 
diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 552030a..905c6e7 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -1161,12 +1161,6 @@ void Lingo::b_moveToFront(int nargs) {
 	g_lingo->dropStack(nargs);
 }
 
-void Lingo::b_window(int nargs) {
-	g_lingo->printSTUBWithArglist("b_window", nargs);
-	g_lingo->dropStack(nargs);
-	g_lingo->push(Datum(0));
-}
-
 
 ///////////////////
 // Point
@@ -1349,5 +1343,11 @@ void Lingo::b_me(int nargs) {
 	g_lingo->dropStack(nargs);
 }
 
+void Lingo::b_window(int nargs) {
+	g_lingo->printSTUBWithArglist("b_window", nargs);
+	g_lingo->dropStack(nargs);
+	g_lingo->push(Datum(0));
+}
+
 
 } // End of namespace Director





More information about the Scummvm-git-logs mailing list