[Scummvm-git-logs] scummvm master -> 9f71bcab74ae2075cb290342470d54581b87b461

[sluicebox]

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:
9f71bcab74 SCI32: Return correct KPlatform32 value on Mac


Commit: 9f71bcab74ae2075cb290342470d54581b87b461
    https://github.com/scummvm/scummvm/commit/9f71bcab74ae2075cb290342470d54581b87b461
Author: sluicebox (22204938+sluicebox at users.noreply.github.com)
Date: 2019-10-24T14:36:17-07:00

Commit Message:
SCI32: Return correct KPlatform32 value on Mac

Fixes GK1 Mac intro and other slideshow movies

Changed paths:
    engines/sci/engine/kmisc.cpp


diff --git a/engines/sci/engine/kmisc.cpp b/engines/sci/engine/kmisc.cpp
index 4c2bb2f..4348793 100644
--- a/engines/sci/engine/kmisc.cpp
+++ b/engines/sci/engine/kmisc.cpp
@@ -663,10 +663,14 @@ reg_t kPlatform32(EngineState *s, int argc, reg_t *argv) {
 			return make_reg(0, kSciPlatformWindows);
 		case Common::kPlatformMacintosh:
 			// For Mac versions, kPlatform(0) with other args has more functionality
-			if (argc > 1)
+			if (argc > 1) {
 				return kMacPlatform(s, argc - 1, argv + 1);
-			else
-				return make_reg(0, kSciPlatformMacintosh);
+			} else {
+				// SCI32 Mac claims to be DOS. GK1 depends on this in order to play its
+				//  view-based slideshow movies. It appears that Sierra opted to change
+				//  this return value instead of updating the game scripts for Mac.
+				return make_reg(0, kSciPlatformDOS);
+			}
 		default:
 			error("Unknown platform %d", g_sci->getPlatform());
 		}