[Scummvm-git-logs] scummvm master -> 02b528b9ad2420dd51b49470684961b013ab864e

[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:
dacf06dd76 DIRECTOR: DEBUGGER: Fix display of 1 frame movies in Score
02b528b9ad DIRECTOR: DEBUGGER: Print out ink name in Channels window


Commit: dacf06dd76e63e3c7f7e5bc97b90ca9b7665ed17
    https://github.com/scummvm/scummvm/commit/dacf06dd76e63e3c7f7e5bc97b90ca9b7665ed17
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-31T12:50:45+02:00

Commit Message:
DIRECTOR: DEBUGGER: Fix display of 1 frame movies in Score

Also fix highlights of the current frame and selected sprite

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 010cb891697..67d6bfe0128 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -3026,21 +3026,21 @@ static void displayScoreChannel(int ch, int mode, int modeSel) {
 		ImGui::Unindent(indentSize);
 	}
 
-	numFrames -= _state->_scoreFrameOffset;
+	numFrames -= _state->_scoreFrameOffset - 1;
 	numFrames = MIN<uint>(numFrames, kMaxColumnsInTable - 2);
 
 	for (int f = 0; f < (int)numFrames; f++) {
-		Frame &frame = *score->_scoreCache[f + _state->_scoreFrameOffset];
+		Frame &frame = *score->_scoreCache[f + _state->_scoreFrameOffset - 1];
 		Sprite &sprite = *frame._sprites[ch];
 
+		ImGui::TableNextColumn();
+
 		if (f + _state->_scoreFrameOffset == (int)currentFrameNum)
 			ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, cell_bg_color);
 
-		ImGui::TableNextColumn();
-
-		if (f == _state->_selectedScoreCast.frame + _state->_scoreFrameOffset &&
+		if (f == _state->_selectedScoreCast.frame + _state->_scoreFrameOffset - 1 &&
 		  ch == _state->_selectedScoreCast.channel && mode <= kModeExtended)
-			ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ImGui::GetColorU32(ImVec4(0.7f, 0.7f, 0.7f, 0.3f)));
+			ImGui::TableSetBgColor(ImGuiTableBgTarget_CellBg, ImGui::GetColorU32(ImVec4(1.0f, 0.3f, 0.3f, 0.6f)));
 
 		switch (mode) {
 		case kModeMember:
@@ -3103,7 +3103,7 @@ static void displayScoreChannel(int ch, int mode, int modeSel) {
 		}
 
 		if (ImGui::IsItemClicked(0)) {
-			_state->_selectedScoreCast.frame = f + _state->_scoreFrameOffset;
+			_state->_selectedScoreCast.frame = f + _state->_scoreFrameOffset - 1;
 			_state->_selectedScoreCast.channel = ch;
 		}
 	}


Commit: 02b528b9ad2420dd51b49470684961b013ab864e
    https://github.com/scummvm/scummvm/commit/02b528b9ad2420dd51b49470684961b013ab864e
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2024-05-31T12:50:46+02:00

Commit Message:
DIRECTOR: DEBUGGER: Print out ink name in Channels window

Changed paths:
    engines/director/debugtools.cpp


diff --git a/engines/director/debugtools.cpp b/engines/director/debugtools.cpp
index 67d6bfe0128..bc4413b52e5 100644
--- a/engines/director/debugtools.cpp
+++ b/engines/director/debugtools.cpp
@@ -2486,7 +2486,7 @@ static void showChannels() {
 					ImGui::TableNextColumn();
 					ImGui::Text("0x%02x", sprite._inkData);
 					ImGui::TableNextColumn();
-					ImGui::Text("%d", sprite._ink);
+					ImGui::Text("%d (%s)", sprite._ink, inkType2str(sprite._ink));
 					ImGui::TableNextColumn();
 					ImGui::Checkbox("", &sprite._trails);
 					ImGui::TableNextColumn();