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 c7ac9059..3fac9fb8 100644 Binary files a/Utils/_ChineseText.cpp and b/Utils/_ChineseText.cpp differ diff --git a/Utils/_Ja25ChineseText.cpp b/Utils/_Ja25ChineseText.cpp index dc167708..a6b92b14 100644 Binary files a/Utils/_Ja25ChineseText.cpp and b/Utils/_Ja25ChineseText.cpp differ