[Scummvm-git-logs] scummvm master -> 43ece97722c26911ae32bb22140d0e70de9d3efe

[AndywinXp]

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:
43ece97722 SCUMM: GUI: Initialize _internalGUIControls at boot up


Commit: 43ece97722c26911ae32bb22140d0e70de9d3efe
    https://github.com/scummvm/scummvm/commit/43ece97722c26911ae32bb22140d0e70de9d3efe
Author: AndywinXp (andywinxp at gmail.com)
Date: 2025-09-22T11:01:48+02:00

Commit Message:
SCUMM: GUI: Initialize _internalGUIControls at boot up

Tames #16205:
"SCUMM: TTS can read text for buttons that are not currently active, or even no longer there"

There shouldn't be any uninitialized data access now.

Changed paths:
    engines/scumm/scumm.cpp


diff --git a/engines/scumm/scumm.cpp b/engines/scumm/scumm.cpp
index 62b9d3fdf2a..081376d34b8 100644
--- a/engines/scumm/scumm.cpp
+++ b/engines/scumm/scumm.cpp
@@ -1531,6 +1531,28 @@ Common::Error ScummEngine::init() {
 	}
 #endif
 
+	for (int i = 0; i < ARRAYSIZE(_internalGUIControls); i++) {
+		_internalGUIControls[i].xPos = 0;
+		_internalGUIControls[i].relativeCenterX = -1;
+		_internalGUIControls[i].relativeCenterY = 0;
+		_internalGUIControls[i].xPos = 0;
+		_internalGUIControls[i].yPos = 0;
+		_internalGUIControls[i].normalFillColor = 0;
+		_internalGUIControls[i].topLineColor = 0;
+		_internalGUIControls[i].bottomLineColor = 0;
+		_internalGUIControls[i].leftLineColor = 0;
+		_internalGUIControls[i].rightLineColor = 0;
+		_internalGUIControls[i].normalTextColor = 0;
+		_internalGUIControls[i].highlightedTextColor = 0;
+		_internalGUIControls[i].highlightedFillColor = 0;
+		_internalGUIControls[i].centerText = false;
+		_internalGUIControls[i].label = "";
+#ifdef USE_TTS
+		_internalGUIControls[i].alternateTTSLabel = "";
+#endif
+		_internalGUIControls[i].doubleLinesFlag = false;
+	}
+
 	_setupIsComplete = true;
 
 	syncSoundSettings();