[Scummvm-git-logs] scummvm master -> 9505e3b9054406e6dbe31fbd3d0e2eff6f64cb34

[AndywinXp]

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:
82818aa260 SCUMM: HE: Fix trailing spaces behavior in savegame strings
9505e3b905 SCUMM: INDY4 (DOS/Mac Jap): Fix fontHeight for Jap charset


Commit: 82818aa26010db0c845e01c253f8ebe66a28d1b8
    https://github.com/scummvm/scummvm/commit/82818aa26010db0c845e01c253f8ebe66a28d1b8
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-12T11:25:36+01:00

Commit Message:
SCUMM: HE: Fix trailing spaces behavior in savegame strings

Taken from disasm.

Changed paths:
    engines/scumm/string.cpp


diff --git a/engines/scumm/string.cpp b/engines/scumm/string.cpp
index a8cd4044f68..b16d68fd503 100644
--- a/engines/scumm/string.cpp
+++ b/engines/scumm/string.cpp
@@ -1236,7 +1236,9 @@ void ScummEngine::drawString(int a, const byte *msg) {
 
 	fontHeight = _charset->getFontHeight();
 
-	if (_game.version >= 4) {
+	// Disabled in HE games starting from Freddi1 because
+	// of issues when writing a savegame name containing spaces...
+	if (_game.version >= 4 && _game.heversion < 70) {
 		// trim from the right
 		byte *tmp = buf;
 		space = nullptr;


Commit: 9505e3b9054406e6dbe31fbd3d0e2eff6f64cb34
    https://github.com/scummvm/scummvm/commit/9505e3b9054406e6dbe31fbd3d0e2eff6f64cb34
Author: AndywinXp (andywinxp at gmail.com)
Date: 2023-11-12T11:26:19+01:00

Commit Message:
SCUMM: INDY4 (DOS/Mac Jap): Fix fontHeight for Jap charset

Taken from disasm.

Changed paths:
    engines/scumm/charset.cpp


diff --git a/engines/scumm/charset.cpp b/engines/scumm/charset.cpp
index c042509f808..f83ac38b8d2 100644
--- a/engines/scumm/charset.cpp
+++ b/engines/scumm/charset.cpp
@@ -446,8 +446,10 @@ int CharsetRendererCommon::getFontHeight() const {
 						 _vm->_game.platform == Common::kPlatformDOS &&
 						 _vm->_language == Common::JA_JPN);
 
-	if (isIndyDOSJap || (isSegaCD && _vm->_segaForce2ByteCharHeight)) {
+	if (isSegaCD && _vm->_segaForce2ByteCharHeight) {
 		return MAX(_vm->_2byteHeight, _fontHeight);
+	} else if (isIndyDOSJap) {
+		return _curId == 5 ? 14 : _fontHeight;
 	} else if (_vm->_useCJKMode && !isSegaCD) {
 		return MAX(_vm->_2byteHeight + 1, _fontHeight);
 	} else {