[Scummvm-git-logs] scummvm master -> 63c8367ace9ca131aea1194ccaf9cb8906e34a35

[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:
71b3ba59ee DRAGONS: Added workaround for crash in German release. Bug #13925
63c8367ace GRAPHICS: MACGUI: Indicate presence of a table in debug output in MacTextCanvas


Commit: 71b3ba59ee025a7960133c7286d0343d8e74f2cc
    https://github.com/scummvm/scummvm/commit/71b3ba59ee025a7960133c7286d0343d8e74f2cc
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-25T19:46:35-08:00

Commit Message:
DRAGONS: Added workaround for crash in German release. Bug #13925

Changed paths:
    engines/dragons/talk.cpp


diff --git a/engines/dragons/talk.cpp b/engines/dragons/talk.cpp
index 68c4bbbdb5d..9e703295018 100644
--- a/engines/dragons/talk.cpp
+++ b/engines/dragons/talk.cpp
@@ -621,6 +621,12 @@ bool Talk::talkToActor(ScriptOpCall &scriptOpCall) {
 				if (selectedDialogText->iniId != 0) {
 					iniId = selectedDialogText->iniId;
 				}
+
+				// WORKAROUMD: German release has no ini setup which leads to iniId - 1 < 0
+				// Bugreport #13925
+				if (iniId == 0)
+					iniId = 1;
+
 				Actor *iniActor = _vm->_dragonINIResource->getRecord(iniId - 1)->actor;
 				sequenceId = iniActor->_sequenceID;
 //				playSoundFromTxtIndex(selectedDialogText->textIndex1);


Commit: 63c8367ace9ca131aea1194ccaf9cb8906e34a35
    https://github.com/scummvm/scummvm/commit/63c8367ace9ca131aea1194ccaf9cb8906e34a35
Author: Eugene Sandulenko (sev at scummvm.org)
Date: 2023-11-25T19:46:40-08:00

Commit Message:
GRAPHICS: MACGUI: Indicate presence of a table in debug output in MacTextCanvas

Changed paths:
    graphics/macgui/mactext-canvas.cpp


diff --git a/graphics/macgui/mactext-canvas.cpp b/graphics/macgui/mactext-canvas.cpp
index 4411ababbbe..0226ebfa091 100644
--- a/graphics/macgui/mactext-canvas.cpp
+++ b/graphics/macgui/mactext-canvas.cpp
@@ -1379,7 +1379,8 @@ void MacTextCanvas::debugPrint(const char *prefix) {
 	for (uint i = 0; i < _text.size(); i++) {
 		if (prefix)
 			DN(8, "%s: ", prefix);
-		DN(8, "%2d, %c fi: %d, i: %d ", i, _text[i].paragraphEnd ? '$' : '.', _text[i].firstLineIndent, _text[i].indent);
+		DN(8, "%2d, %c %c fi: %d, i: %d ", i, _text[i].paragraphEnd ? '$' : '.', _text[i].table ? 'T' : ' ',
+					_text[i].firstLineIndent, _text[i].indent);
 
 		for (uint j = 0; j < _text[i].chunks.size(); j++)
 			_text[i].chunks[j].debugPrint();