From 2364f70c5deb7e8731b02983ac405b0d1eaa4639 Mon Sep 17 00:00:00 2001 From: Wanne Date: Tue, 20 Jan 2009 14:47:34 +0000 Subject: [PATCH] Chinese Fixes: Changed code to use "Chinese.Items.xml", some smaller fixes for chinese version (by Inshy) git-svn-id: https://ja2svn.mooo.com/source/ja2/trunk/GameSource/ja2_v1.13/Build@2528 3b4a5df2-a311-0410-b5c6-a8a6f20db521 --- Init.cpp | 2 +- Standard Gaming Platform/Ja2 Libs.cpp | 3 +++ Utils/Multi Language Graphic Utils.cpp | 6 +++--- Utils/WordWrap.cpp | 8 +++++--- Utils/_ChineseText.cpp | Bin 322884 -> 325550 bytes Utils/_Ja25ChineseText.cpp | Bin 8770 -> 8794 bytes 6 files changed, 12 insertions(+), 7 deletions(-) diff --git a/Init.cpp b/Init.cpp index ef0c74b1..c7907a99 100644 --- a/Init.cpp +++ b/Init.cpp @@ -514,7 +514,7 @@ BOOLEAN LoadExternalGameplayData(STR directoryName) AddLanguagePrefix( fileName, TAIWANESE_PREFIX); #endif #ifdef CHINESE - AddLanguagePrefix( fileName, TAIWANESE_PREFIX); + AddLanguagePrefix( fileName, CHINESE_PREFIX); #endif #ifndef ENGLISH if ( FileExists(fileName) ) diff --git a/Standard Gaming Platform/Ja2 Libs.cpp b/Standard Gaming Platform/Ja2 Libs.cpp index e6f259f4..cf911864 100644 --- a/Standard Gaming Platform/Ja2 Libs.cpp +++ b/Standard Gaming Platform/Ja2 Libs.cpp @@ -52,6 +52,9 @@ LibraryInitHeader gGameLibaries[ ] = { "French.slf", FALSE, TRUE }, #endif +#ifdef CHINESE + { "Chinese.slf", FALSE, TRUE }, +#endif }; diff --git a/Utils/Multi Language Graphic Utils.cpp b/Utils/Multi Language Graphic Utils.cpp index 9a72aaa8..87323781 100644 --- a/Utils/Multi Language Graphic Utils.cpp +++ b/Utils/Multi Language Graphic Utils.cpp @@ -14,7 +14,7 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID ) { - #if defined( ENGLISH ) || defined( TAIWANESE ) || defined (CHINESE) + #if defined( ENGLISH ) || defined( TAIWANESE ) switch( usMLGGraphicID ) { case MLG_AIMSYMBOL: @@ -280,8 +280,8 @@ BOOLEAN GetMLGFilename( SGPFILENAME filename, UINT16 usMLGGraphicID ) sprintf( (char *)zLanguage, "SPANISH" ); #elif defined( TAIWANESE ) sprintf( (char *)zLanguage, "TAIWANESE" ); - #elif defined( CHINESE) - sprintf( (char *)zLangauge, "CHINESE"); + #elif defined( CHINESE ) + sprintf( (char *)zLanguage, "CHINESE" ); #else # error "At least You have to specify a Language somewhere. See comments above." #endif diff --git a/Utils/WordWrap.cpp b/Utils/WordWrap.cpp index 52c8e8c7..08f5e91d 100644 --- a/Utils/WordWrap.cpp +++ b/Utils/WordWrap.cpp @@ -570,10 +570,12 @@ UINT16 IanDisplayWrappedString(UINT16 usPosX, UINT16 usPosY, UINT16 usWidth, UIN do { // each character goes towards building a new word + if (pString[usSourceCounter] != TEXT_SPACE && pString[usSourceCounter] != 0 -#ifdef CHINESE - && pString[usSourceCounter] < 255 -#endif +// WANNE: Chinese version. Don't know why there is an ifdef +//#ifdef CHINESE +// && pString[usSourceCounter] < 255 +//#endif ) { zWordString[usDestCounter++] = pString[usSourceCounter]; diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index c7ac9059e9ef9ce41092f7754b0e17ab7fa8b1f9..3fac9fb844deb41958dc69bddb62435f6ea322c9 100644 GIT binary patch delta 12332 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 BL!1Br delta 8719 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 diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index dc16770810e504a3de2d96556ee1578b388f1a16..a6b92b1407b8d2d87ad766f72cb99c4ebe9af236 100644 GIT binary patch delta 64 zcmX@)a?53d6&sgLh7N-Q!#clZag#qV$!zvuYhq$iQ&3Zwe2zm-%qD~9zXC&Th^}9I Tu@z96Dnkkb>;KJ6oDPxzjg%5~ delta 49 zcmccRa>!+a72D<@wh2rudJK9Dlb>