diff --git a/Laptop/mercs Files.cpp b/Laptop/mercs Files.cpp index b308eb85..316b4ed2 100644 --- a/Laptop/mercs Files.cpp +++ b/Laptop/mercs Files.cpp @@ -986,13 +986,9 @@ void LoadAndDisplayMercBio( UINT8 ubMercID ) LoadEncryptedDataFromFile(MERCBIOFILE, sText, uiStartLoc, MERC_BIO_INFO_TEXT_SIZE); -#ifdef CHINESE - if( sText[0] != ChineseSpecString13 ) + if( sText[0] != 0 ) DisplayWrappedString(MERC_BIO_TEXT_X, MERC_BIO_TEXT_Y, MERC_BIO_WIDTH, 2, MERC_BIO_FONT, MERC_BIO_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED); -#else - DisplayWrappedString(MERC_BIO_TEXT_X, MERC_BIO_TEXT_Y, MERC_BIO_WIDTH, 2, MERC_BIO_FONT, MERC_BIO_COLOR, sText, FONT_MCOLOR_BLACK, FALSE, LEFT_JUSTIFIED); -#endif - + //load and display the merc's additioanl info (if any) //#ifdef JA2UB //Ja25 UB diff --git a/Utils/_ChineseText.cpp b/Utils/_ChineseText.cpp index a4d4ea27..904737a0 100644 --- a/Utils/_ChineseText.cpp +++ b/Utils/_ChineseText.cpp @@ -8143,6 +8143,5 @@ STR16 ChineseSpecString9 = L"%s [%d%%(%d%%)]\n%s %d\n%s %d\n%s %1.1f %s"; STR16 ChineseSpecString10 = L"%s [%d%%(%d%%)]\n%s %d%% (%d/%d)\n%s %d%%\n%s %1.1f %s"; // added by Flugente STR16 ChineseSpecString11 = L"%s (%s) [%d%%(%d%%)]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s"; // added by Flugente STR16 ChineseSpecString12 = L"%s (%s) [%d%%]\n%s %d\n%s %d\n%s %d (%d)\n%s (%d) %s\n%s %1.1f %s\n%s %.2f%%"; // added by Flugente -STR16 ChineseSpecString13 = L'쳌'; #endif //CHINESE \ No newline at end of file