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

moralrecordings code at moral.net.au
Wed May 6 10:36:48 UTC 2020


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:
ac90807d4f DIRECTOR: Remove Mac platform conditional in frame loader


Commit: ac90807d4f5cd6bb0295ed4f77383c49e921a4f9
    https://github.com/scummvm/scummvm/commit/ac90807d4f5cd6bb0295ed4f77383c49e921a4f9
Author: Scott Percival (code at moral.net.au)
Date: 2020-05-06T18:35:51+08:00

Commit Message:
DIRECTOR: Remove Mac platform conditional in frame loader

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 4cbd55071c..da26988325 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -298,7 +298,7 @@ void Frame::readChannels(Common::ReadStreamEndian *stream) {
 			sprite._height = stream->readUint16();
 			sprite._width = stream->readUint16();
 
-			if (_vm->getPlatform() == Common::kPlatformMacintosh && _vm->getVersion() == 4) {
+			if (_vm->getVersion() == 4) {
 				sprite._scriptId = stream->readUint16();
 				// & 0x0f scorecolor
 				// 0x10 forecolor is rgb




More information about the Scummvm-git-logs mailing list