[Scummvm-git-logs] scummvm master -> 306d3fb2f6692425efae4c3ff99ed266e8f1bf43

SupSuper noreply at scummvm.org
Sun Jul 7 11:21:25 UTC 2024


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:
2e8a2a841f DIRECTOR: Fix truncation of double to float
306d3fb2f6 DIRECTOR: Fix uninitialized variable


Commit: 2e8a2a841f9cd66899bf5cc076f1dc438e3d0de5
    https://github.com/scummvm/scummvm/commit/2e8a2a841f9cd66899bf5cc076f1dc438e3d0de5
Author: SupSuper (supsuper at gmail.com)
Date: 2024-07-07T12:18:36+01:00

Commit Message:
DIRECTOR: Fix truncation of double to float

Changed paths:
    engines/director/debugger/dt-lists.cpp
    engines/director/debugger/dt-score.cpp


diff --git a/engines/director/debugger/dt-lists.cpp b/engines/director/debugger/dt-lists.cpp
index 924075c0a4f..59e11ec8cb6 100644
--- a/engines/director/debugger/dt-lists.cpp
+++ b/engines/director/debugger/dt-lists.cpp
@@ -257,7 +257,7 @@ void showArchive() {
 	ImVec2 pos(40, 40);
 	ImGui::SetNextWindowPos(pos, ImGuiCond_FirstUseEver);
 
-	ImVec2 windowSize = ImGui::GetMainViewport()->Size * 0.8;
+	ImVec2 windowSize = ImGui::GetMainViewport()->Size * 0.8f;
 	ImGui::SetNextWindowSize(windowSize, ImGuiCond_FirstUseEver);
 
 	if (ImGui::Begin("Archive", &_state->_w.archive)) {
diff --git a/engines/director/debugger/dt-score.cpp b/engines/director/debugger/dt-score.cpp
index 1d3701d6478..0193e14cfc4 100644
--- a/engines/director/debugger/dt-score.cpp
+++ b/engines/director/debugger/dt-score.cpp
@@ -61,13 +61,13 @@ static void displayScoreChannel(int ch, int mode, int modeSel) {
 	{
 		ImGui::TableNextColumn();
 
-		float indentSize = 17.0;
+		float indentSize = 17.0f;
 
 		if (mode < kChTempo && modeSel == kModeExtended)
-			indentSize = 10.0;
+			indentSize = 10.0f;
 
 		if (modeSel == kModeExtended && mode == kModeExtended)
-			indentSize = 0.1;
+			indentSize = 0.1f;
 
 		ImGui::Indent(indentSize);
 


Commit: 306d3fb2f6692425efae4c3ff99ed266e8f1bf43
    https://github.com/scummvm/scummvm/commit/306d3fb2f6692425efae4c3ff99ed266e8f1bf43
Author: SupSuper (supsuper at gmail.com)
Date: 2024-07-07T12:19:01+01:00

Commit Message:
DIRECTOR: Fix uninitialized variable

Changed paths:
    engines/director/debugger/dt-score.cpp


diff --git a/engines/director/debugger/dt-score.cpp b/engines/director/debugger/dt-score.cpp
index 0193e14cfc4..bea8aa2a044 100644
--- a/engines/director/debugger/dt-score.cpp
+++ b/engines/director/debugger/dt-score.cpp
@@ -223,7 +223,7 @@ void showScore() {
 			ImGui::BeginChild("Image", ImVec2(200.0f, 70.0f));
 
 			if (castMember || shape) {
-				ImGuiImage imgID;
+				ImGuiImage imgID = {};
 
 				if (castMember)
 					imgID = getImageID(castMember);




More information about the Scummvm-git-logs mailing list