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

[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:
9f0534445b DIRECTOR: Read second sound channel info in D4 on all platforms


Commit: 9f0534445bc1cc6c054a79ac3e52ced5e6ae6849
    https://github.com/scummvm/scummvm/commit/9f0534445bc1cc6c054a79ac3e52ced5e6ae6849
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2021-08-17T17:13:35+02:00

Commit Message:
DIRECTOR: Read second sound channel info in D4 on all platforms

Changed paths:
    engines/director/frame.cpp


diff --git a/engines/director/frame.cpp b/engines/director/frame.cpp
index 2e74aaddd9..703bf6a7b2 100644
--- a/engines/director/frame.cpp
+++ b/engines/director/frame.cpp
@@ -145,15 +145,9 @@ void Frame::readChannels(Common::ReadStreamEndian *stream, uint16 version) {
 		_tempo = stream->readByte();
 		_transType = static_cast<TransitionType>(stream->readByte());
 		_sound1 = CastMemberID(stream->readUint16(), 0);
+		_sound2 = CastMemberID(stream->readUint16(), 0);
+		_soundType2 = stream->readByte();
 
-		if (_vm->getPlatform() == Common::kPlatformMacintosh || _vm->getPlatform() == Common::kPlatformMacintoshII) {
-			_sound2 = CastMemberID(stream->readUint16(), 0);
-			_soundType2 = stream->readByte();
-		} else {
-			stream->read(unk, 3);
-			if (unk[0] != 0 || unk[1] != 0 || unk[2] != 0)
-				warning("Frame::readChannels(): unk1: %x unk2: %x unk3: %x", unk[0], unk[1], unk[2]);
-		}
 		_skipFrameFlag = stream->readByte();
 		_blend = stream->readByte();