reapplied lost Russian letters fix from revision 4877

-Fixed some problems with russian letters in IMP page (by ViSoR)
-Added 2 letters for French (Ligatures Æ, æ, Œ, œ). Now we have support for all French alphabet
-Converted French text to UTF-8 for simple use in ather OS Language

git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@5489 3b4a5df2-a311-0410-b5c6-a8a6f20db521
This commit is contained in:
lalien
2012-08-21 10:31:12 +00:00
parent 82bfc8d9f4
commit 3136327c5a
2 changed files with 101 additions and 31 deletions
+24 -22
View File
@@ -724,7 +724,8 @@ INT16 GetIndex(CHAR16 siChar)
UINT16 ssCount=0;
UINT16 usNumberOfSymbols = pFManager->pTranslationTable->usNumberOfSymbols;
siChar = GetUnicodeChar(siChar);
//inshy: We don't need anymore ANSI convertation to UNICODE.
//siChar = GetUnicodeChar(siChar);
// search the Translation Table and return the index for the font
pTrav = pFManager->pTranslationTable->DynamicArrayOf16BitValues;
@@ -745,7 +746,8 @@ INT16 GetIndex(CHAR16 siChar)
return 0;
}
//inshy: We don't need anymore ANSI convertation to UNICODE.
/*
CHAR16 GetUnicodeChar(CHAR16 siChar)
{
#ifdef GERMAN
@@ -918,7 +920,7 @@ CHAR16 GetUnicodeChar(CHAR16 siChar)
//case 236: siChar = 236; break; //i'
//case 210: siChar = 210; break; //O'
//case 242: siChar = 242; break; //o'
//inshy: I've added the character codes for French ligatures to the sources, but I haven't added them in the fonts!
//inshy: French ligatures
//Ligature
//case 198: siChar = 198; break; //Æ
//case 140: siChar = 338; break; //Œ
@@ -930,6 +932,7 @@ CHAR16 GetUnicodeChar(CHAR16 siChar)
return siChar;
}
*/
//*****************************************************************************
// SetFont
@@ -1969,23 +1972,23 @@ FontTranslationTable *CreateEnglishTransTable( )
temp++;
// POLISH letters in UNICODE
*temp = 260; // ¥ (îí)
*temp = 260; // ¥ (on)
temp++;
*temp = 262; // Æ (öå)
*temp = 262; // Æ (tse)
temp++;
*temp = 280; // Ê (ýí)
*temp = 280; // Ê (en')
temp++;
*temp = 321; // £ (ýëü)
*temp = 321; // £ (el')
temp++;
*temp = 323; // Ñ (ýíü)
*temp = 323; // Ñ (en)
temp++;
*temp = 211; // Ó (î êðàòêîå)
*temp = 211; // Ó (o kratkoe)
temp++;
*temp = 346; // Œ (ýñü)
*temp = 346; // Œ (es')
temp++;
*temp = 379; // ¯ (æåò)
*temp = 379; // ¯ (zhet)
temp++;
*temp = 377; // (çåò)
*temp = 377; // (zet)
temp++;
*temp = 261; // ¹ (îí)
temp++;
@@ -2070,16 +2073,15 @@ FontTranslationTable *CreateEnglishTransTable( )
*temp = 242; //o'
temp++;
//inshy: I've added the character codes for French ligatures to the sources, but I haven't added them in the fonts!
//Ligature
// *temp = 198; //Æ
// temp++;
// *temp = 338; //Œ
// temp++;
// *temp = 230; //æ
// temp++;
// *temp = 339; //œ
// temp++;
//French ligatures
*temp = 198; //Æ
temp++;
*temp = 338; //Œ
temp++;
*temp = 230; //æ
temp++;
*temp = 339; //œ
temp++;
// Font glyphs for spell targeting icons