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

sev- sev at scummvm.org
Fri Mar 19 00:20:13 UTC 2021


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:
ad58230915 SCUMM: always enable line wrap on hebrew
b88403b18b SCUMM: INSANE: always enable line wrap on hebrew


Commit: ad58230915ce7fa0b933d31be663efa8c2f40df1
    https://github.com/scummvm/scummvm/commit/ad58230915ce7fa0b933d31be663efa8c2f40df1
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2021-03-19T01:20:10+01:00

Commit Message:
SCUMM: always enable line wrap on hebrew

Changed paths:
    engines/scumm/smush/smush_player.cpp


diff --git a/engines/scumm/smush/smush_player.cpp b/engines/scumm/smush/smush_player.cpp
index 23f2ad977e..5d9a1a892f 100644
--- a/engines/scumm/smush/smush_player.cpp
+++ b/engines/scumm/smush/smush_player.cpp
@@ -641,7 +641,7 @@ void SmushPlayer::handleTextResource(uint32 subType, int32 subSize, Common::Seek
 	// bit 7 - skip ^ codes (COMI)     0x80        (should be irrelevant for Smush, we strip these commands anyway)
 	// bit 8 - no vertical fix (COMI)  0x100       (COMI handles this in the printing method, but I haven't seen a case where it is used)
 
-	if (flags & 4) {
+	if ((flags & 4) || _vm->_language == Common::HE_ISR) {
 		// COMI has to do it all a bit different, of course. SCUMM7 games immediately render the text from here and actually use the clipping data
 		// provided by the text resource. COMI does not render directly, but enqueues a blast string (which is then drawn through the usual main
 		// loop routines). During that process the rect data will get dumped and replaced with the following default values. It's hard to tell


Commit: b88403b18bd020358f6bf7f4c5dca458f85e25d8
    https://github.com/scummvm/scummvm/commit/b88403b18bd020358f6bf7f4c5dca458f85e25d8
Author: BLooperZ (blooperz at users.noreply.github.com)
Date: 2021-03-19T01:20:10+01:00

Commit Message:
SCUMM: INSANE: always enable line wrap on hebrew

Changed paths:
    engines/scumm/insane/insane.cpp


diff --git a/engines/scumm/insane/insane.cpp b/engines/scumm/insane/insane.cpp
index bcbf1331da..d2914a2978 100644
--- a/engines/scumm/insane/insane.cpp
+++ b/engines/scumm/insane/insane.cpp
@@ -1302,7 +1302,7 @@ void Insane::smlayer_showStatusMsg(int32 arg_0, byte *renderBitmap, int32 codecp
 	// bit 2 - word wrap               0x04
 	// bit 3 - switchable              0x08
 	// bit 4 - fill background         0x10
-	if (flags & 4) {
+	if ((flags & 4) || _vm->_language == Common::HE_ISR) {
 		Common::Rect clipRect(0, 0, _player->_width, _player->_height);
 		sf->drawStringWrap(str, renderBitmap, clipRect, pos_x, pos_y, flags & 1);
 	} else {




More information about the Scummvm-git-logs mailing list