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

sev- noreply at scummvm.org
Thu Oct 9 20:20:08 UTC 2025


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:
bb98dbe701 DIRECTOR: Do not print excessive empty channels in 'channels' debug command


Commit: bb98dbe701a1f45ebf38a49f79ce32fe0ab4a88a
    https://github.com/scummvm/scummvm/commit/bb98dbe701a1f45ebf38a49f79ce32fe0ab4a88a
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2025-10-09T22:19:22+02:00

Commit Message:
DIRECTOR: Do not print excessive empty channels in 'channels' debug command

Changed paths:
    engines/director/score.cpp


diff --git a/engines/director/score.cpp b/engines/director/score.cpp
index e8ee72a0b58..e33bf72e05a 100644
--- a/engines/director/score.cpp
+++ b/engines/director/score.cpp
@@ -2362,6 +2362,8 @@ Common::String Score::formatChannelInfo() {
 	result += Common::String::format("SND: 2  sound2: %d, soundType2: %d\n", frame._mainChannels.sound2.member, frame._mainChannels.soundType2);
 	result += Common::String::format("LSCR:   actionId: %s\n", frame._mainChannels.actionId.asString().c_str());
 
+	bool skipped = false;
+
 	for (int i = 0; (i < frame._numChannels && ((i + 1) < (int)_channels.size())); i++) {
 		Channel &channel = *_channels[i + 1];
 		Sprite &sprite = *channel._sprite;
@@ -2381,8 +2383,17 @@ Common::String Score::formatChannelInfo() {
 				}
 				result += Common::String::format("\n");
 			}
+
+			skipped = false;
 		} else {
-			result += Common::String::format("CH: %-3d castId: 000\n", i + 1);
+			if (i == frame._numChannels - 1 || (i > 0 && _channels[i]->_sprite->_castId.member)) {
+				result += Common::String::format("CH: %-3d castId: 000\n", i + 1);
+			} else {
+				if (!skipped) {
+					result += "...\n";
+					skipped = true;
+				}
+			}
 		}
 	}
 




More information about the Scummvm-git-logs mailing list