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

[sev-]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://api.github.com/repos/scummvm/scummvm .

Summary:
e5b8bc2389 DIRECTOR: Loosen version checks on score loading


Commit: e5b8bc238998c9f86d41f2f933d60f1140c14e0e
    https://github.com/scummvm/scummvm/commit/e5b8bc238998c9f86d41f2f933d60f1140c14e0e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-11-04T11:43:37+01:00

Commit Message:
DIRECTOR: Loosen version checks on score loading

Configrmed with d11.5 title that the format is the same

Changed paths:
    engines/director/cast.cpp
    engines/director/score.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 46fe782429f..857756a2653 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -1507,7 +1507,7 @@ void Cast::loadCastData(Common::SeekableReadStreamEndian &stream, uint16 id, Res
 		}
 		castDataOffset = stream.pos();
 		castInfoOffset = stream.pos() + castDataSizeToRead;
-	} else if (_version >= kFileVer500 && _version < kFileVer1100) { // After D5 there are no changes, TODO: Check D11, D12
+	} else if (_version >= kFileVer500) { // After D5 there are no changes, TODO: Check D12
 		castType = stream.readUint32();
 		castInfoSize = stream.readUint32();
 		castDataSize = stream.readUint32();
diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index a8846f66995..b72becc0869 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -1849,7 +1849,7 @@ void Score::loadFrames(Common::SeekableReadStreamEndian &stream, uint16 version)
 		_numChannelsDisplayed = 30;
 
 		_firstFramePosition = _framesStream->pos();
-	} else if (version >= kFileVer600 && version < kFileVer1100) {
+	} else if (version >= kFileVer600) {
 		_framesStreamSize = _framesStream->readUint32();
 		int32 ver = (int32)_framesStream->readUint32();
 		uint32 listStart = _framesStream->readUint32();
@@ -1892,7 +1892,7 @@ void Score::loadFrames(Common::SeekableReadStreamEndian &stream, uint16 version)
 		_spriteDetailAccessed[0] = true;
 	}
 
-	if (version >= kFileVer400 && version < kFileVer1100) {
+	if (version >= kFileVer400) {
 		_framesStreamSize = _framesStream->readUint32();
 		_frame1Offset = _framesStream->readUint32();
 		_numOfFrames = _framesStream->readUint32();
@@ -1917,10 +1917,6 @@ void Score::loadFrames(Common::SeekableReadStreamEndian &stream, uint16 version)
 			_framesStreamSize, _frame1Offset, _numOfFrames, _framesVersion, _spriteRecordSize, _numChannels, _numChannelsDisplayed);
 	}
 
-	if (version >= kFileVer1100) {
-		error("STUB: Score::loadFrames(): score not yet supported for version v%d (%d)", humanVersion(version), version);
-	}
-
 	// partically by channels, hence we keep it and read the score from left to right
 	// TODO Merge it with shared cast
 	_currentFrame = new Frame(this, _numChannelsDisplayed);