[Scummvm-git-logs] scummvm master -> 15ffcd872645ea6006e3280e9285730aa002662e

[sev-]

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

Summary:
228a4e8513 DIRECTOR: LINGO: Allow floats be as arguments in b_sound
15ffcd8726 DIRECTOR: Print out debug output so the buildbot stays happy


Commit: 228a4e8513c261ae88e4d1653f3415977c5cb295
    https://github.com/scummvm/scummvm/commit/228a4e8513c261ae88e4d1653f3415977c5cb295
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-27T23:52:13+01:00

Commit Message:
DIRECTOR: LINGO: Allow floats be as arguments in b_sound

Used in 'pepperon-win-fr', --start-movie=W4_ZC_3.DIR

  sound(#fadeOut, 1, 1.5 * 60)

Changed paths:
    engines/director/lingo/lingo-builtins.cpp


diff --git a/engines/director/lingo/lingo-builtins.cpp b/engines/director/lingo/lingo-builtins.cpp
index 276045b18d0..cddf3619a59 100644
--- a/engines/director/lingo/lingo-builtins.cpp
+++ b/engines/director/lingo/lingo-builtins.cpp
@@ -2979,8 +2979,8 @@ void LB::b_sound(int nargs) {
 		soundManager->stopSound(firstArg.u.i);
 	} else if (verb.u.s->equalsIgnoreCase("fadeIn")) {
 		if (nargs > 2) {
-			TYPECHECK(secondArg, INT);
-			ticks = secondArg.u.i;
+			TYPECHECK2(secondArg, INT, FLOAT);
+			ticks = secondArg.asInt();
 		} else {
 			ticks = 15 * (60 / score->_currentFrameRate);
 		}
@@ -2991,14 +2991,14 @@ void LB::b_sound(int nargs) {
 		return;
 	} else if (verb.u.s->equalsIgnoreCase("fadeOut")) {
 		if (nargs > 2) {
-			TYPECHECK(secondArg, INT);
-			ticks = secondArg.u.i;
+			TYPECHECK2(secondArg, INT, FLOAT);
+			ticks = secondArg.asInt();
 		} else {
 			ticks = 15 * (60 / score->_currentFrameRate);
 		}
 
-		TYPECHECK(firstArg, INT);
-		soundManager->registerFade(firstArg.u.i, false, ticks);
+		TYPECHECK2(firstArg, INT, FLOAT);
+		soundManager->registerFade(firstArg.asInt(), false, ticks);
 		score->_activeFade = firstArg.u.i;
 		return;
 	} else if (verb.u.s->equalsIgnoreCase("playFile")) {


Commit: 15ffcd872645ea6006e3280e9285730aa002662e
    https://github.com/scummvm/scummvm/commit/15ffcd872645ea6006e3280e9285730aa002662e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-01-28T00:08:22+01:00

Commit Message:
DIRECTOR: Print out debug output so the buildbot stays happy

easternmind-win-en, --start-movie=TRANSCRI/AUTODEMO.DIR, contains
over 1300 cast members. Since we're currently preloading everything,
buildbot is not happy as that takes longer than 20 secs.

Changed paths:
    engines/director/cast.cpp


diff --git a/engines/director/cast.cpp b/engines/director/cast.cpp
index 3b45d0394a8..beacc5b66cb 100644
--- a/engines/director/cast.cpp
+++ b/engines/director/cast.cpp
@@ -552,11 +552,16 @@ void Cast::loadCast() {
 	if (cast.size() > 0) {
 		debugC(2, kDebugLoading, "****** Loading %d CASt resources", cast.size());
 
+		int idx = 0;
+
 		for (Common::Array<uint16>::iterator iterator = cast.begin(); iterator != cast.end(); ++iterator) {
 			Common::SeekableReadStreamEndian *stream = _castArchive->getResource(MKTAG('C', 'A', 'S', 't'), *iterator);
 			Resource res = _castArchive->getResourceDetail(MKTAG('C', 'A', 'S', 't'), *iterator);
 			loadCastData(*stream, res.castId, &res);
 			delete stream;
+
+			if (debugChannelSet(-1, kDebugFewFramesOnly) && idx++ > 0 && !(idx % 200))
+				debug("Loaded %d cast resources", idx);
 		}
 	}
 
@@ -793,6 +798,8 @@ void Cast::loadCastMemberData() {
 
 	Common::HashMap<int, PaletteV4>::iterator p = _vm->getLoadedPalettes().find(0);
 
+	int idx = 0;
+
 	for (Common::HashMap<int, CastMember *>::iterator c = _loadedCast->begin(); c != _loadedCast->end(); ++c) {
 		if (!c->_value)
 			continue;
@@ -816,6 +823,9 @@ void Cast::loadCastMemberData() {
 			default:
 				break;
 		}
+
+		if (debugChannelSet(-1, kDebugFewFramesOnly) && idx++ > 0 && !(idx % 200))
+			debug("Loaded %d casts data", idx);
 	}
 }