[Scummvm-git-logs] scummvm master -> d87db4db51f3144c7bfac1372cf1c9b6264c213c

[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:
395469773b DGDS: Ignore space as well as empty str in inventory objects
d87db4db51 DGDS: Use a different font for HOC DE dialogs


Commit: 395469773bf21068354aa1759571b13266765b9c
    https://github.com/scummvm/scummvm/commit/395469773bf21068354aa1759571b13266765b9c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-04-04T20:05:32+11:00

Commit Message:
DGDS: Ignore space as well as empty str in inventory objects

Most versions of the game have empty strings in the inventory request data, but
the DE version of Heart of China has a single space. Treat it the same as empty
string. This fixes #15841.

Changed paths:
    engines/dgds/request.cpp


diff --git a/engines/dgds/request.cpp b/engines/dgds/request.cpp
index d0687243b35..60bff9287dc 100644
--- a/engines/dgds/request.cpp
+++ b/engines/dgds/request.cpp
@@ -919,7 +919,7 @@ void RequestData::drawInvType(Graphics::ManagedSurface *dst) {
 	}
 
 	for (const auto &textItem : _textItemList) {
-		if (!textItem._txt.empty())
+		if (!textItem._txt.empty() && textItem._txt != " ")
 			error("TODO: RequestData::drawInvType: Implement support for drawing text item.");
 	}
 


Commit: d87db4db51f3144c7bfac1372cf1c9b6264c213c
    https://github.com/scummvm/scummvm/commit/d87db4db51f3144c7bfac1372cf1c9b6264c213c
Author: Matthew Duggan (mgithub at guarana.org)
Date: 2025-04-04T20:05:32+11:00

Commit Message:
DGDS: Use a different font for HOC DE dialogs

Looking at a video of the original, it looks like the DE version should use the
same font for the dialogs and menus in order to get the umlauts.

This fixes #15817.

Changed paths:
    engines/dgds/dialog.cpp


diff --git a/engines/dgds/dialog.cpp b/engines/dgds/dialog.cpp
index 4dea77728d5..95c84790416 100644
--- a/engines/dgds/dialog.cpp
+++ b/engines/dgds/dialog.cpp
@@ -60,15 +60,18 @@ void Dialog::draw(Graphics::ManagedSurface *dst, DialogDrawStage stage) {
 
 
 const DgdsFont *Dialog::getDlgTextFont() const {
-	const FontManager *fontman = DgdsEngine::getInstance()->getFontMan();
+	DgdsEngine *engine = DgdsEngine::getInstance();
+	const FontManager *fontman = engine->getFontMan();
 	FontManager::FontType fontType = FontManager::kGameDlgFont;
 	if (_fontSize == 1)
 		fontType = FontManager::k8x8Font;
 	else if (_fontSize == 3)
 		fontType = FontManager::k4x5Font;
-	else if (_fontSize == 4 && DgdsEngine::getInstance()->getGameId() == GID_WILLY)
+	else if (_fontSize == 4 && engine->getGameId() == GID_WILLY)
 		fontType = FontManager::kGameDlgFont;
-	else if (_fontSize == 5 && DgdsEngine::getInstance()->getGameId() == GID_HOC)
+	else if (_fontSize == 4 && engine->getGameId() == GID_HOC && engine->getGameLang() == Common::DE_DEU)
+		fontType = FontManager::kGameFont;
+	else if (_fontSize == 5 && engine->getGameId() == GID_HOC)
 		fontType = FontManager::kChinaFont;
 	return fontman->getFont(fontType);
 }