[Scummvm-git-logs] scummvm master -> 564747e3be0bb2457acccc70e2f6fbb626ee506c

[mduggan]

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:
87a4470a44 DGDS: Fix accidental replacement of 320 with SCREEN_WIDTH
564747e3be DGDS: Only search for title before CR


Commit: 87a4470a44e727fa8ab1bb7f2627958b143b960b
    https://github.com/scummvm/scummvm/commit/87a4470a44e727fa8ab1bb7f2627958b143b960b
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-30T16:00:38+11:00

Commit Message:
DGDS: Fix accidental replacement of 320 with SCREEN_WIDTH

This 320 represents the number of palette fade steps.

Changed paths:
    engines/dgds/ttm.cpp


diff --git a/engines/dgds/ttm.cpp b/engines/dgds/ttm.cpp
index c08ccd00903..9bdae9d7852 100644
--- a/engines/dgds/ttm.cpp
+++ b/engines/dgds/ttm.cpp
@@ -786,7 +786,7 @@ void TTMInterpreter::handleOperation(TTMEnviro &env, TTMSeq &seq, uint16 op, byt
 			// Speed 4 should complete fade in 2 seconds (eg, Dynamix logo fade)
 
 			// TODO: this is a pretty bad way to do it - should pump messages in this loop?
-			for (int i = 0; i < SCREEN_WIDTH; i += ivals[3]) {
+			for (int i = 0; i < 320; i += ivals[3]) {
 				int fade = MIN(i / 5, 63);
 				_vm->getGamePals()->setFade(ivals[0], ivals[1], ivals[2], fade * 4);
 				g_system->updateScreen();


Commit: 564747e3be0bb2457acccc70e2f6fbb626ee506c
    https://github.com/scummvm/scummvm/commit/564747e3be0bb2457acccc70e2f6fbb626ee506c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2024-11-30T16:01:10+11:00

Commit Message:
DGDS: Only search for title before CR

Colons are allowed to appear in the dialog string if they appear after a CR.

This fixes #15535.

Changed paths:
    engines/dgds/dialog.cpp


diff --git a/engines/dgds/dialog.cpp b/engines/dgds/dialog.cpp
index 72951913a93..8b4607c0d00 100644
--- a/engines/dgds/dialog.cpp
+++ b/engines/dgds/dialog.cpp
@@ -179,7 +179,8 @@ void Dialog::drawType2(Graphics::ManagedSurface *dst, DialogDrawStage stage) {
 	Common::String title;
 	Common::String txt;
 	uint32 colonpos = _str.find(':');
-	if (colonpos != Common::String::npos) {
+	uint32 crpos = _str.find('\r');
+	if (colonpos != Common::String::npos && (crpos == Common::String::npos || crpos > colonpos)) {
 		title = _str.substr(0, colonpos);
 		txt = _str.substr(colonpos + 1);
 		// Most have a CR after the colon? trim it to remove a blank line.