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

[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:
bb2b4b37ba DIRECTOR: JANITORIAL: Consistently refer to Director versions as D[number] in the comments


Commit: bb2b4b37bac8bd813667a20d0c22e748808d00e9
    https://github.com/scummvm/scummvm/commit/bb2b4b37bac8bd813667a20d0c22e748808d00e9
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-04-29T14:22:27+02:00

Commit Message:
DIRECTOR: JANITORIAL: Consistently refer to Director versions as D[number] in the comments

Changed paths:
    engines/director/cast.cpp
    engines/director/lingo/lingo-bytecode.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 26f3df8f314..0b9deef3184 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -274,7 +274,7 @@ bool Cast::loadConfig() {
 	_castArrayStart = stream->readUint16();
 	_castArrayEnd = stream->readUint16();
 
-	// v3 and below use this, override for v4 and over
+	// D3 and below use this, override for D4 and over
 	// actual framerates are, on average: { 3.75, 4, 4.35, 4.65, 5, 5.5, 6, 6.6, 7.5, 8.5, 10, 12, 20, 30, 60 }
 	Common::Array<int> frameRates = { 3, 4, 4, 4, 5, 5, 6, 6, 7, 8, 10, 12, 15, 20, 30, 60 };
 	byte readRate = stream->readByte();
@@ -500,7 +500,7 @@ void Cast::loadCast() {
 		delete r;
 	}
 
-	// Font Mapping V4
+	// Font Mapping D4
 	if ((r = _castArchive->getMovieResourceIfPresent(MKTAG('F', 'm', 'a', 'p'))) != nullptr) {
 		loadFontMapV4(*r);
 		delete r;
@@ -529,7 +529,7 @@ void Cast::loadCast() {
 		delete r;
 	}
 
-	// Cast library mapping, used in V5 and up
+	// Cast library mapping, used in D5+
 	if ((r = _castArchive->getMovieResourceIfPresent(MKTAG('M', 'C', 's', 'L'))) != nullptr) {
 		loadCastLibMapping(*r);
 		delete r;
@@ -998,7 +998,7 @@ LingoContextEntry::LingoContextEntry(int32 i, int16 n)
 
 void Cast::loadLingoContext(Common::SeekableReadStreamEndian &stream) {
 	if (_version >= kFileVer400) {
-		debugC(1, kDebugCompile, "Add V4 script context");
+		debugC(1, kDebugCompile, "Add D4 script context");
 
 		if (debugChannelSet(5, kDebugLoading)) {
 			debugC(5, kDebugLoading, "Lctx header:");
diff --git a/engines/director/lingo/lingo-bytecode.cpp b/engines/director/lingo/lingo-bytecode.cpp
index 051adf34bff..9adcbea978f 100644
--- a/engines/director/lingo/lingo-bytecode.cpp
+++ b/engines/director/lingo/lingo-bytecode.cpp
@@ -1381,10 +1381,10 @@ ScriptContext *LingoCompiler::compileLingoV4(Common::SeekableReadStreamEndian &s
 		// Size of an entry in the consts index.
 		int constEntrySize = 0;
 		if (version >= kFileVer500) {
-			// For V5 this is uint32 type + uint32 offset
+			// For D5 this is uint32 type + uint32 offset
 			constEntrySize = 8;
 		} else {
-			// For V4 this is uint16 type + uint32 offset
+			// For D4 this is uint16 type + uint32 offset
 			constEntrySize = 6;
 		}