[Scummvm-git-logs] scummvm master -> 4e5952c7748e4540b7e563183b143ec506eacb00

[sev-]

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:
4e5952c774 DIRECTOR: Lingo: Probe movies in Mac Resource Forks in 'go to movie'


Commit: 4e5952c7748e4540b7e563183b143ec506eacb00
    https://github.com/scummvm/scummvm/commit/4e5952c7748e4540b7e563183b143ec506eacb00
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2017-02-11T09:34:56+01:00

Commit Message:
DIRECTOR: Lingo: Probe movies in Mac Resource Forks in 'go to movie'

Currently, 'Gravity Ball' movie is launched every now and then in
The Apartment 3.0 due to some bug in hadlers call sequence.

Thus, rename it for the time being.

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


diff --git a/engines/director/lingo/lingo-funcs.cpp b/engines/director/lingo/lingo-funcs.cpp
index a6dc3f0..4bd8590 100644
--- a/engines/director/lingo/lingo-funcs.cpp
+++ b/engines/director/lingo/lingo-funcs.cpp
@@ -20,13 +20,16 @@
  *
  */
 
-#include "director/lingo/lingo.h"
-#include "common/file.h"
 #include "audio/decoders/wave.h"
+#include "common/file.h"
+#include "common/macresman.h"
 #include "common/util.h"
+
+#include "graphics/macgui/macwindowmanager.h"
+
+#include "director/lingo/lingo.h"
 #include "director/lingo/lingo-gr.h"
 #include "director/sound.h"
-#include "graphics/macgui/macwindowmanager.h"
 
 namespace Director {
 
@@ -180,8 +183,16 @@ void Lingo::func_goto(Datum &frame, Datum &movie) {
 		Common::File file;
 
 		if (!file.open(*movie.u.s)) {
-			warning("Movie %s does not exist", movie.u.s->c_str());
-			return;
+			if (_vm->getPlatform() == Common::kPlatformMacintosh) {
+				Common::MacResManager resMan;
+				if (!resMan.open(*movie.u.s)) {
+					warning("Movie %s does not exist", movie.u.s->c_str());
+					return;
+				}
+			} else {
+				warning("Movie %s does not exist", movie.u.s->c_str());
+				return;
+			}
 		}
 
 		_vm->_nextMovie = *movie.u.s;