PRINCE: German font loading, letters fix in options menu

2 files changed, 33 insertions, 25 deletions

diff --git a/engines/prince/option_text.h b/engines/prince/option_text.h
index 7bd0f3bc99..ac5d7588b3 100644
--- a/engines/prince/option_text.h
+++ b/engines/prince/option_text.h
@@ -23,8 +23,6 @@
 namespace Prince {
 
 // PL - Mazovia coding (with U2 negation for special letters)
-// DE - Still problem with special letters
-
 const char invOptionsTextPL[5][18] = {
 	"Obejrzyj",
 	{ 'U', -89, 'y', 'j', '\0' },
@@ -33,23 +31,6 @@ const char invOptionsTextPL[5][18] = {
 	"Daj"
 };
 
-// TODO
-const char invOptionsTextDE[5][17] = {
-	"Anschauen",
-	"Benutzen",
-	{ 'Ö', 'f', 'f', 'n', 'e', 'n', '/', 'S', 't', 'o', 'ß', 'e', 'n', '\0' },
-	{ 'S', 'c', 'h', 'l', 'i', 'e', 'ß', 'e', 'n', '/', 'Z', 'i', 'e', 'h', 'e', 'n', '\0' },
-	"Geben"
-};
-
-const char *invOptionsTextEN[] = {
-	"Examine",
-	"Use",
-	"Open/Push",
-	"Close/Pull",
-	"Give"
-};
-
 const char optionsTextPL[7][18] = {
 	{ 'P', 'o', 'd', 'e', 'j', 'd', -90, '\0' },
 	"Obejrzyj",
@@ -60,17 +41,39 @@ const char optionsTextPL[7][18] = {
 	"Porozmawiaj"
 };
 
-// TODO
+// DE - Other font then for PL + ISO 8859-2 or Windows-1250
+// + special letter values changing (with U2 negation)
+// Normal value:  196,  214,  220,  223,  228,  246,  252
+// Prince change: 131,  132,  133,  127,  128,  129,  130
+// U2 neg:       -125, -124, -123,  127,  128, -127, -126
+
+char invOptionsTextDE[5][17] = {
+	"Anschauen",
+	"Benutzen",
+	{ -124, 'f', 'f', 'n', 'e', 'n', '/', 'S', 't', 'o', 127, 'e', 'n', '\0' },
+	{ 'S', 'c', 'h', 'l', 'i', 'e', 127, 'e', 'n', '/', 'Z', 'i', 'e', 'h', 'e', 'n', '\0' },
+	"Geben"
+};
+
 const char optionsTextDE[7][17] = {
 	"Hingehen",
 	"Anschauen",
 	"Wegnehmen",
 	"Benutzen",
-	{ 'Ö', 'f', 'f', 'n', 'e', 'n', '/', 'S', 't', 'o', 'ß', 'e', 'n', '\0' },
-	{ 'S', 'c', 'h', 'l', 'i', 'e', 'ß', 'e', 'n', '/', 'Z', 'i', 'e', 'h', 'e', 'n', '\0' },
+	{ -124, 'f', 'f', 'n', 'e', 'n', '/', 'S', 't', 'o', 127, 'e', 'n', '\0' },
+	{ 'S', 'c', 'h', 'l', 'i', 'e', 127, 'e', 'n', '/', 'Z', 'i', 'e', 'h', 'e', 'n', '\0' },
 	"Ansprechen"
 };
 
+// EN
+const char *invOptionsTextEN[] = {
+	"Examine",
+	"Use",
+	"Open/Push",
+	"Close/Pull",
+	"Give"
+};
+
 const char *optionsTextEN[] = {
 	"Walk to",
 	"Examine",
diff --git a/engines/prince/prince.cpp b/engines/prince/prince.cpp
index 908d9dbe50..0f52e97e80 100644
--- a/engines/prince/prince.cpp
+++ b/engines/prince/prince.cpp
@@ -194,9 +194,14 @@ void PrinceEngine::init() {
 	_debugger = new Debugger(this);
 
 	_midiPlayer = new MusicPlayer(this);
-	 
-	_font = new Font();
-	Resource::loadResource(_font, "font1.raw", true);
+
+	if (getLanguage() == Common::DE_DEU) {
+		_font = new Font();
+		Resource::loadResource(_font, "font3.raw", true);
+	} else {
+		_font = new Font();
+		Resource::loadResource(_font, "font1.raw", true);
+	}
 
 	_suitcaseBmp = new MhwanhDecoder();
 	Resource::loadResource(_suitcaseBmp, "walizka", true);