[Scummvm-git-logs] scummvm master -> 301bf5fd250ff08178a3fb4428fb198baa852dd9

[phcoder]

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:
0eefb22032 SHERLOCK: Fix Fonts::unescape function
301bf5fd25 SKY: Add missing _big5Font initialization


Commit: 0eefb22032f20165769a40696e9fd95873753883
    https://github.com/scummvm/scummvm/commit/0eefb22032f20165769a40696e9fd95873753883
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-03-01T00:13:01+01:00

Commit Message:
SHERLOCK: Fix Fonts::unescape function

It ended up "unescaping" not escaped characters

Changed paths:
    engines/sherlock/fonts.cpp


diff --git a/engines/sherlock/fonts.cpp b/engines/sherlock/fonts.cpp
index 60f575b48af..54f6b04e1b9 100644
--- a/engines/sherlock/fonts.cpp
+++ b/engines/sherlock/fonts.cpp
@@ -235,21 +235,21 @@ Common::String Fonts::unescape(const Common::String& in) {
 		byte curChar = *curCharPtr;
 		byte nextChar = curCharPtr[1];
 
-		if (_isModifiedEucCn && !isInEucEscape && curChar == '@' && nextChar == '$') {
+		if (!isInEucEscape && curChar == '@' && nextChar == '$') {
 			curCharPtr++;
 			isInEucEscape = true;
 			out += ' ';
 			continue;
 		}
 
-		if (_isModifiedEucCn && isInEucEscape && curChar == '$' && nextChar == '@') {
+		if (isInEucEscape && curChar == '$' && nextChar == '@') {
 			curCharPtr++;
 			isInEucEscape = false;
 			out += ' ';
 			continue;
 		}
 
-		if (_isModifiedEucCn && curChar >= 0x41 && curChar < 0xa0) {
+		if (isInEucEscape && curChar >= 0x41 && curChar < 0xa0) {
 			out += curChar + 0x60;
 			continue;
 		}


Commit: 301bf5fd250ff08178a3fb4428fb198baa852dd9
    https://github.com/scummvm/scummvm/commit/301bf5fd250ff08178a3fb4428fb198baa852dd9
Author: Vladimir Serbinenko (phcoder at gmail.com)
Date: 2023-03-01T00:13:06+01:00

Commit Message:
SKY: Add missing _big5Font initialization

Changed paths:
    engines/sky/sky.cpp


diff --git a/engines/sky/sky.cpp b/engines/sky/sky.cpp
index d78953d6be5..d978de26a7e 100644
--- a/engines/sky/sky.cpp
+++ b/engines/sky/sky.cpp
@@ -74,7 +74,7 @@ SystemVars *SkyEngine::_systemVars = nullptr;
 const char *SkyEngine::shortcutsKeymapId = "sky-shortcuts";
 
 SkyEngine::SkyEngine(OSystem *syst)
-	: Engine(syst), _fastMode(0), _debugger(0) {
+	: Engine(syst), _fastMode(0), _debugger(0), _big5Font(nullptr) {
 	_systemVars = new SystemVars();
 	_systemVars->systemFlags    = 0;
 	_systemVars->gameVersion    = 0;