From 0ae307a316280c5c7113d883cdeae96304d7e571 Mon Sep 17 00:00:00 2001
From: Wanne <Wanne@3b4a5df2-a311-0410-b5c6-a8a6f20db521>
Date: Sun, 28 Jan 2007 20:02:05 +0000
Subject: [PATCH] - bugfix: German "Umlaute" were not displayed correctly for
 short item names

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@685 3b4a5df2-a311-0410-b5c6-a8a6f20db521
---
 JA2.suo              | Bin 197632 -> 197632 bytes
 JA2.vcproj           |   2 +-
 Language Defines.h   |   4 +-
 Utils/Text Utils.cpp | 115 +++++++++++++++++++++++++++----------------
 4 files changed, 76 insertions(+), 45 deletions(-)

diff --git a/JA2.suo b/JA2.suo
index c28b44248f482010c7dff974cfc2113cbf34113e..32abfde3c419e3c1b4b954233812924a271ff093 100644
GIT binary patch
delta 5046
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

delta 3898
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
K-W@Wpyz_q^z`*DL

diff --git a/JA2.vcproj b/JA2.vcproj
index 95061895..280bf0a7 100644
--- a/JA2.vcproj
+++ b/JA2.vcproj
@@ -43,7 +43,7 @@
 			<Tool
 				Name="VCLinkerTool"
 				AdditionalDependencies="libexpatMT.lib mss32.lib winmm.lib smackw32.lib fmodvc.lib"
-				OutputFile="C:\Games\Jagged Alliance 2 v1.13\ja2_debug_665.exe"
+				OutputFile="C:\Games\Jagged Alliance 2 DE\ja2_debug_669.exe"
 				LinkIncremental="2"
 				SuppressStartupBanner="TRUE"
 				AdditionalLibraryDirectories=".\..\..\Standard Gaming Platform\"
diff --git a/Language Defines.h b/Language Defines.h
index 8f2ce366..a2bce73b 100644
--- a/Language Defines.h	
+++ b/Language Defines.h	
@@ -20,8 +20,8 @@
 
 #if !defined(ENGLISH) && !defined(GERMAN) && !defined(RUSSIAN) && !defined(DUTCH) && !defined(POLISH)
 /* please set one manually here (by uncommenting) if not willingly to set Workspace wide */
-#define ENGLISH
-//#define GERMAN
+//#define ENGLISH
+#define GERMAN
 //#define RUSSIAN
 //#define DUTCH
 //#define POLISH
diff --git a/Utils/Text Utils.cpp b/Utils/Text Utils.cpp
index 0b037ef6..840d4de6 100644
--- a/Utils/Text Utils.cpp	
+++ b/Utils/Text Utils.cpp	
@@ -389,60 +389,91 @@ BOOLEAN LoadShortNameItemInfo(UINT16 ubIndex, STR16 pNameString )
 {
 	if(pNameString != NULL)
 	{
+		int j = -1;
+
 		// WANNE:
-	for (int i=0;i<80;i++)
-	{
-		if ( i<(int)strlen(Item[ubIndex].szItemName))
+		for (int i=0;i<80;i++)
+		{
+			j++;
+			
+			if ( i<(int)strlen(Item[ubIndex].szItemName))
 			{
-			pNameString[i] =  Item[ubIndex].szItemName [i];
+				pNameString[i] = Item[ubIndex].szItemName [j];
 
 				// WANNE: German specific characters
 				#ifdef GERMAN
-				switch( pNameString[ i ] )
+				// We have a german special character
+				if (Item[ubIndex].szItemName [j] == -61)
 				{
-					// ü
-					case 65532:	pNameString[i] = 252; break;
-					// Ü
-					case 65500:	pNameString[i] = 220; break;
-					// ä
-					case 65508:	pNameString[i] = 228; break;
-					// Ä
-					case 65476:	pNameString[i] = 196; break;
-					// ö
-					case 65526:	pNameString[i] = 246; break;
-					// Ö
-					case 65494:	pNameString[i] = 214; break;
-					// ß
-					case 65503:	pNameString[i] = 223; break;
+					// This character determines the special character
+					switch (Item[ubIndex].szItemName [j + 1])
+					{
+						// ü
+						case -68:	
+							pNameString[i] = 252;
+							// Skip next character, because "umlaute" have 2 chars
+							j++;
+							break;
+						// Ü
+						case -100:	
+							pNameString[i] = 220;
+							j++;
+							break;
+						// ä
+						case -92:	
+							pNameString[i] = 228; 
+							j++;
+							break;
+						// Ä
+						case -124:	
+							pNameString[i] = 196; 
+							j++;
+							break;
+						// ö
+						case -74:	
+							pNameString[i] = 246; 
+							j++;
+							break;
+						// Ö
+						case -106:	
+							pNameString[i] = 214; 
+							j++;
+							break;
+						// ß
+						case -97:	
+							pNameString[i] = 223; 
+							j++;
+							break;
+					}
 				}
 				#endif
 
-		#ifdef POLISH
-			switch( pNameString[ i ] )
-			{
-				case 260:		pNameString[ i ] = 165;		break;
-				case 262:		pNameString[ i ] = 198;		break;
-				case 280:		pNameString[ i ] = 202;		break;
-				case 321:		pNameString[ i ] = 163;		break;
-				case 323:		pNameString[ i ] = 209;		break;
-				case 211:		pNameString[ i ] = 211;		break;
+				#ifdef POLISH
+				switch( pNameString[ i ] )
+				{
+					case 260:		pNameString[ i ] = 165;		break;
+					case 262:		pNameString[ i ] = 198;		break;
+					case 280:		pNameString[ i ] = 202;		break;
+					case 321:		pNameString[ i ] = 163;		break;
+					case 323:		pNameString[ i ] = 209;		break;
+					case 211:		pNameString[ i ] = 211;		break;
 
-				case 346:		pNameString[ i ] = 338;		break;
-				case 379:		pNameString[ i ] = 175;		break;
-				case 377:		pNameString[ i ] = 143;		break;
-				case 261:		pNameString[ i ] = 185;		break;
-				case 263:		pNameString[ i ] = 230;		break;
-				case 281:		pNameString[ i ] = 234;		break;
+					case 346:		pNameString[ i ] = 338;		break;
+					case 379:		pNameString[ i ] = 175;		break;
+					case 377:		pNameString[ i ] = 143;		break;
+					case 261:		pNameString[ i ] = 185;		break;
+					case 263:		pNameString[ i ] = 230;		break;
+					case 281:		pNameString[ i ] = 234;		break;
 
-				case 322:		pNameString[ i ] = 179;		break;
-				case 324:		pNameString[ i ] = 241;		break;
-				case 243:		pNameString[ i ] = 243;		break;
-				case 347:		pNameString[ i ] = 339;		break;
-				case 380:		pNameString[ i ] = 191;		break;
-				case 378:		pNameString[ i ] = 376;		break;
+					case 322:		pNameString[ i ] = 179;		break;
+					case 324:		pNameString[ i ] = 241;		break;
+					case 243:		pNameString[ i ] = 243;		break;
+					case 347:		pNameString[ i ] = 339;		break;
+					case 380:		pNameString[ i ] = 191;		break;
+					case 378:		pNameString[ i ] = 376;		break;
+				}
+				#endif
 			}
-		#endif
-	}
 			else
 			{
 				pNameString[i] ='\0';