[Scummvm-git-logs] scummvm master -> 475f231ac4acc19562c5731522b872409a39795e

[sev-]

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:
475f231ac4 PINK: Fix localized text encoding


Commit: 475f231ac4acc19562c5731522b872409a39795e
    https://github.com/scummvm/scummvm/commit/475f231ac4acc19562c5731522b872409a39795e
Author: antoniou79 (a.antoniou79 at gmail.com)
Date: 2023-04-29T12:12:11+02:00

Commit Message:
PINK: Fix localized text encoding

Should address bugs #13865 and #13866 PINK: German Umlauts not displayed

Also added text encoding support for the other language codes that are in the detection_tables.h for the PINK engine. Namely, IT_ITA, NL_NLD, and EN_GRB. The NL_NLD one I am uncertain about, but according to wikipedia, kWindows1252 should do for Dutch as well. I cannot test for it though.

Changed paths:
    engines/pink/objects/actions/action_text.cpp


diff --git a/engines/pink/objects/actions/action_text.cpp b/engines/pink/objects/actions/action_text.cpp
index 3a42ffacd26..0d5551d57e5 100644
--- a/engines/pink/objects/actions/action_text.cpp
+++ b/engines/pink/objects/actions/action_text.cpp
@@ -100,13 +100,23 @@ void ActionText::start() {
 	screen->getWndManager()._language = language;
 	switch(language) {
 	case Common::DA_DNK:
+		// fall through
 	case Common::ES_ESP:
+		// fall through
 	case Common::FR_FRA:
+		// fall through
 	case Common::PT_BRA:
+		// fall through
+	case Common::DE_DEU:
+		// fall through
+	case Common::IT_ITA:
+		// fall through
+	case Common::NL_NLD:
 		_text = Common::String(str).decode(Common::kWindows1252);
 		break;
 
 	case Common::FI_FIN:
+		// fall through
 	case Common::SE_SWE:
 		_text = Common::String(str).decode(Common::kWindows1257);
 		break;
@@ -126,7 +136,10 @@ void ActionText::start() {
 		_text = Common::String(str).decode(Common::kWindows1251);
 		break;
 
+	case Common::EN_GRB:
+		// fall through
 	case Common::EN_ANY:
+		// fall through
 	default:
 		_text = Common::String(str);
 		break;