[Scummvm-git-logs] scummvm master -> 69c7559bf0f85e69c8603ca9db7012f24dd7cdff

athrxx noreply at scummvm.org
Sat Dec 10 17:08:12 UTC 2022


This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
69c7559bf0 SCUMM: fix bug no. 13965


Commit: 69c7559bf0f85e69c8603ca9db7012f24dd7cdff
    https://github.com/scummvm/scummvm/commit/69c7559bf0f85e69c8603ca9db7012f24dd7cdff
Author: athrxx (athrxx at scummvm.org)
Date: 2022-12-10T18:07:55+01:00

Commit Message:
SCUMM: fix bug no. 13965

("Crash with Japanese version of The Dig")

Changed paths:
    engines/scumm/string_v7.cpp
    engines/scumm/string_v7.h


diff --git a/engines/scumm/string_v7.cpp b/engines/scumm/string_v7.cpp
index 2a0c073dab8..9a551b93fcf 100644
--- a/engines/scumm/string_v7.cpp
+++ b/engines/scumm/string_v7.cpp
@@ -40,7 +40,7 @@ TextRenderer_v7::TextRenderer_v7(ScummEngine *vm, GlyphRenderer_v7 *gr)	:
 	_direction(vm->_language == Common::HE_ISR ? -1 : 1),
 	_rtlCenteredOffset(vm->_language == Common::HE_ISR ? 1 : 0),
 	_spacing(vm->_language != Common::JA_JPN ? 1 : 0),
-	_lineBreakMarker(vm->_newLineCharacter),
+	_lineBreakMarker((char)vm->_newLineCharacter),
 	_newStyle (gr->newStyleWrapping()),
 	_gr(gr) {
 }
diff --git a/engines/scumm/string_v7.h b/engines/scumm/string_v7.h
index 9ff57c1b078..ddbaf9889fe 100644
--- a/engines/scumm/string_v7.h
+++ b/engines/scumm/string_v7.h
@@ -66,7 +66,7 @@ private:
 	const int _rtlCenteredOffset;
 	const int _spacing;
 	const byte _2byteCharWidth;
-	const byte _lineBreakMarker;
+	const char _lineBreakMarker;
 	const bool _newStyle;
 	const uint16 _screenWidth;
 	GlyphRenderer_v7 *_gr;




More information about the Scummvm-git-logs mailing list