Skip to content

OpenJO: fix Traditional Chinese rendering and runtime language switching #1346

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
hsz0566 wants to merge 1 commit into
base: master
Choose a base branch
from
Open

OpenJO: fix Traditional Chinese rendering and runtime language switching #1346

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 20 additions & 10 deletions code/rd-common/tr_font.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,13 +65,23 @@ static Language_e GetLanguageEnum()
static Language_e eLanguage = eWestern;
#ifdef JK2_MODE
if ( !sp_language )
return eLanguage;
else if ( sp_language->integer == SP_LANGUAGE_KOREAN )
eLanguage = eKorean;
else if ( sp_language->integer == SP_LANGUAGE_JAPANESE )
eLanguage = eJapanese;
else if ( sp_language->integer == SP_LANGUAGE_TAIWANESE )
eLanguage = eTaiwanese;
return eWestern;

switch ( sp_language->integer )
{
case SP_LANGUAGE_KOREAN:
eLanguage = eKorean;
break;
case SP_LANGUAGE_JAPANESE:
eLanguage = eJapanese;
break;
case SP_LANGUAGE_TAIWANESE:
eLanguage = eTaiwanese;
break;
default:
eLanguage = eWestern;
break;
}

return eLanguage;
#else
Expand Down Expand Up @@ -735,7 +745,7 @@ unsigned int AnyLanguage_ReadCharFromString( char *psText, int *piAdvanceCount,
const byte *psString = (const byte *) psText; // avoid sign-promote bug
unsigned int uiLetter;

if ( Language_IsKorean() )
if ( GetLanguageEnum() == eKorean )
{
if ( Korean_ValidKSC5601Hangul( psString[0], psString[1] ))
{
Expand All @@ -755,7 +765,7 @@ unsigned int AnyLanguage_ReadCharFromString( char *psText, int *piAdvanceCount,
}
}
else
if ( Language_IsTaiwanese() )
if ( GetLanguageEnum() == eTaiwanese )
{
if ( Taiwanese_ValidBig5Code( (psString[0] * 256) + psString[1] ))
{
Expand All @@ -774,7 +784,7 @@ unsigned int AnyLanguage_ReadCharFromString( char *psText, int *piAdvanceCount,
}
}
else
if ( Language_IsJapanese() )
if ( GetLanguageEnum() == eJapanese )
{
if ( Japanese_ValidShiftJISCode( psString[0], psString[1] ))
{
Expand Down
8 changes: 7 additions & 1 deletion code/ui/ui_main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ USER INTERFACE MAIN
extern stringID_table_t animTable [MAX_ANIMATIONS+1];

#include "../qcommon/stringed_ingame.h"
#ifdef JK2_MODE
#include "../qcommon/strippublic.h"
#endif
#include "../qcommon/q_shared.h"
#include "../qcommon/game_version.h"

Expand Down Expand Up @@ -489,8 +492,11 @@ void _UI_Refresh( int realtime )
return;
}

extern void SE_CheckForLanguageUpdates(void);
#ifdef JK2_MODE
JK2SP_CheckForLanguageUpdates();
#else
SE_CheckForLanguageUpdates();
#endif

if ( Menus_AnyFullScreenVisible() )
{//if not in full screen, don't mess with ghoul2
Expand Down