a3x/re3
1
0
Fork 0
mirror of https://git.rip/DMCA_FUCKER/re3.git synced 2024-12-23 00:30:06 +00:00
Code Issues Projects Releases Wiki Activity

Fixes

Browse source
This commit is contained in:
Sergeanur 2020-04-26 23:49:24 +03:00
parent f0890b1112
commit fe353a7cc9
10 changed files with 2353 additions and 2682 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/control/Garages.cpp
View file

@ -1390,7 +1390,7 @@ void CGarages::PrintMessages()
CFont::SetBackgroundOff(); CFont::SetBackgroundOff();
CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(50.0f)); CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(50.0f));
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
#if defined(PS2) || defined (FIX_BUGS) #if defined(PS2) || defined (FIX_BUGS)

88
src/core/Frontend.cpp
View file

@ -110,7 +110,7 @@ int8 CMenuManager::m_bFrontEnd_ReloadObrTxtGxt;
int32 CMenuManager::m_PrefsMusicVolume = 102; int32 CMenuManager::m_PrefsMusicVolume = 102;
int32 CMenuManager::m_PrefsSfxVolume = 102; int32 CMenuManager::m_PrefsSfxVolume = 102;
char CMenuManager::m_PrefsSkinFile[256] = "$$\"\""; char CMenuManager::m_PrefsSkinFile[256] = DEFAULT_SKIN_NAME;
int32 CMenuManager::m_KeyPressedCode = -1; int32 CMenuManager::m_KeyPressedCode = -1;
@ -286,7 +286,7 @@ ScaleAndCenterX(float x)
CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255))); \ CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255))); \
CFont::SetRightJustifyOn(); \ CFont::SetRightJustifyOn(); \
CFont::SetScale(MENU_X(MENUHEADER_WIDTH), MENU_Y(MENUHEADER_HEIGHT)); \ CFont::SetScale(MENU_X(MENUHEADER_WIDTH), MENU_Y(MENUHEADER_HEIGHT)); \
CFont::SetFontStyle(FONT_HEADING); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
#define ProcessSlider(value, increaseAction, decreaseAction, hoverStartX, hoverEndX) \ #define ProcessSlider(value, increaseAction, decreaseAction, hoverStartX, hoverEndX) \
do { \ do { \
@ -596,7 +596,7 @@ CMenuManager::DisplayHelperText()
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetScale(SCREEN_SCALE_X(SMALLESTTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(SCREEN_SCALE_X(SMALLESTTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
// TODO: name this cases? // TODO: name this cases?
switch (m_nHelperTextMsgId) { switch (m_nHelperTextMsgId) {
@ -732,7 +732,7 @@ CMenuManager::Draw()
nextYToUse += 24.0f + 10.0f; nextYToUse += 24.0f + 10.0f;
} }
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_X), MENU_Y(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_Y)); CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_X), MENU_Y(MENUACTION_SCALE_MULT * MENU_TEXT_SIZE_Y));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255))); CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
@ -788,7 +788,7 @@ CMenuManager::Draw()
columnWidth = 320; columnWidth = 320;
headerHeight = 240; headerHeight = 240;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
CFont::SetCentreOn(); CFont::SetCentreOn();
break; break;
@ -805,7 +805,7 @@ CMenuManager::Draw()
columnWidth = 50; columnWidth = 50;
headerHeight = 0; headerHeight = 0;
lineHeight = 20; lineHeight = 20;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = MEDIUMTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = MEDIUMTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = MEDIUMTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = MEDIUMTEXT_Y_SCALE));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
break; break;
@ -815,7 +815,7 @@ CMenuManager::Draw()
columnWidth = 120; columnWidth = 120;
headerHeight = 38; headerHeight = 38;
lineHeight = 20; lineHeight = 20;
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = SMALLTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = SMALLTEXT_Y_SCALE));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
break; break;
@ -827,7 +827,7 @@ CMenuManager::Draw()
columnWidth = 320; columnWidth = 320;
headerHeight = 60; headerHeight = 60;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
CFont::SetCentreOn(); CFont::SetCentreOn();
break; break;
@ -835,7 +835,7 @@ CMenuManager::Draw()
columnWidth = 320; columnWidth = 320;
headerHeight = 140; headerHeight = 140;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
CFont::SetCentreOn(); CFont::SetCentreOn();
break; break;
@ -843,7 +843,7 @@ CMenuManager::Draw()
columnWidth = 320; columnWidth = 320;
headerHeight = 117; headerHeight = 117;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
CFont::SetCentreOn(); CFont::SetCentreOn();
break; break;
@ -852,7 +852,7 @@ CMenuManager::Draw()
columnWidth = 180; columnWidth = 180;
headerHeight = 60; headerHeight = 60;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
break; break;
#endif #endif
@ -860,14 +860,14 @@ CMenuManager::Draw()
columnWidth = 320; columnWidth = 320;
headerHeight = 40; headerHeight = 40;
lineHeight = 24; lineHeight = 24;
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X = BIGTEXT_X_SCALE), MENU_Y(MENU_TEXT_SIZE_Y = BIGTEXT_Y_SCALE));
CFont::SetCentreOn(); CFont::SetCentreOn();
break; break;
} }
#ifdef PS2_LIKE_MENU #ifdef PS2_LIKE_MENU
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
#endif #endif
switch (m_nCurrScreen) { switch (m_nCurrScreen) {
@ -1580,6 +1580,11 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
nextX += CFont::GetStringWidth(seperator, true) + bindingMargin; nextX += CFont::GetStringWidth(seperator, true) + bindingMargin;
} }
CFont::PrintString(nextX, nextY, settingText); CFont::PrintString(nextX, nextY, settingText);
#ifdef MORE_LANGUAGES
if (CFont::IsJapanese())
nextX += CFont::GetStringWidth_Jap(settingText) + bindingMargin;
else
#endif
nextX += CFont::GetStringWidth(settingText, true) + bindingMargin; nextX += CFont::GetStringWidth(settingText, true) + bindingMargin;
} }
} }
@ -1629,7 +1634,7 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
} }
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255))); CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
if (m_bKeyChangeNotProcessed) { if (m_bKeyChangeNotProcessed) {
CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_CIG")); // BACKSPACE TO CLEAR - LMB,RETURN TO CHANGE CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_CIG")); // BACKSPACE TO CLEAR - LMB,RETURN TO CHANGE
@ -1639,7 +1644,7 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
if (!m_bKeyIsOK) if (!m_bKeyIsOK)
DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0); DMAudio.PlayFrontEndSound(SOUND_FRONTEND_MENU_SUCCESS, 0);
@ -1647,24 +1652,24 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
} else { } else {
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255))); CFont::SetColor(CRGBA(255, 255, 255, FadeIn(255)));
CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_CIG")); // BACKSPACE TO CLEAR - LMB,RETURN TO CHANGE CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_CIG")); // BACKSPACE TO CLEAR - LMB,RETURN TO CHANGE
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
m_bKeyIsOK = false; m_bKeyIsOK = false;
m_bKeyChangeNotProcessed = false; m_bKeyChangeNotProcessed = false;
} }
} else if (optionIdx == m_nSelectedListRow) { } else if (optionIdx == m_nSelectedListRow) {
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetColor(CRGBA(55, 55, 55, FadeIn(255))); CFont::SetColor(CRGBA(55, 55, 55, FadeIn(255)));
CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_EIG")); // CANNOT SET A CONTROL FOR THIS ACTION CFont::PrintString(MENU_X_LEFT_ALIGNED(275.0f), SCREEN_SCALE_FROM_BOTTOM(114.0f), TheText.Get("FET_EIG")); // CANNOT SET A CONTROL FOR THIS ACTION
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
} }
} }
} }
@ -1819,7 +1824,7 @@ CMenuManager::DrawControllerSetupScreen()
CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255))); CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
// List header // List header
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT)); CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_1_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CAC")); CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_1_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CAC"));
@ -1827,7 +1832,7 @@ CMenuManager::DrawControllerSetupScreen()
CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CCR")); CFont::PrintString(MENU_X_LEFT_ALIGNED(CONTSETUP_COLUMN_3_X), MENU_Y(CONTSETUP_LIST_TOP), TheText.Get("FET_CCR"));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X_LEFT_ALIGNED(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); CFont::SetScale(MENU_X_LEFT_ALIGNED(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
int yStart; int yStart;
if (m_ControlMethod == CONTROL_CLASSIC) if (m_ControlMethod == CONTROL_CLASSIC)
yStart = CONTSETUP_LIST_HEADER_HEIGHT + 29; yStart = CONTSETUP_LIST_HEADER_HEIGHT + 29;
@ -1916,7 +1921,7 @@ CMenuManager::DrawControllerSetupScreen()
} }
// Back button and it's shadow // Back button and it's shadow
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X), MENU_Y(MENU_TEXT_SIZE_Y)); CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X), MENU_Y(MENU_TEXT_SIZE_Y));
CFont::SetRightJustifyOn(); CFont::SetRightJustifyOn();
CFont::SetColor(CRGBA(0, 0, 0, FadeIn(90))); CFont::SetColor(CRGBA(0, 0, 0, FadeIn(90)));
@ -2174,7 +2179,7 @@ CMenuManager::DrawFrontEndNormal()
if (CheckHover(xStart, xStart + optionWidth, optionTop, optionBottom)) if (CheckHover(xStart, xStart + optionWidth, optionTop, optionBottom))
hoveredBottomBarOption = i; hoveredBottomBarOption = i;
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetScale(MENU_X(0.35f), MENU_Y(0.7f)); CFont::SetScale(MENU_X(0.35f), MENU_Y(0.7f));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
if (hoveredBottomBarOption == i && hoveredBottomBarOption != curBottomBarOption) if (hoveredBottomBarOption == i && hoveredBottomBarOption != curBottomBarOption)
@ -2442,7 +2447,7 @@ CMenuManager::DrawPlayerSetupScreen()
m_pSelectedSkin->nextSkin = new tSkinInfo; m_pSelectedSkin->nextSkin = new tSkinInfo;
m_pSelectedSkin = m_pSelectedSkin->nextSkin; m_pSelectedSkin = m_pSelectedSkin->nextSkin;
m_pSelectedSkin->skinId = 0; m_pSelectedSkin->skinId = 0;
strcpy(m_pSelectedSkin->skinNameOriginal, "$$\"\""); strcpy(m_pSelectedSkin->skinNameOriginal, DEFAULT_SKIN_NAME);
strcpy(m_pSelectedSkin->skinNameDisplayed, UnicodeToAscii(TheText.Get("FET_DSN"))); strcpy(m_pSelectedSkin->skinNameDisplayed, UnicodeToAscii(TheText.Get("FET_DSN")));
int nextSkinId = 1; int nextSkinId = 1;
m_pSelectedSkin->nextSkin = nil; m_pSelectedSkin->nextSkin = nil;
@ -2451,7 +2456,7 @@ CMenuManager::DrawPlayerSetupScreen()
SYSTEMTIME SystemTime; SYSTEMTIME SystemTime;
HANDLE handle = FindFirstFile("skins\\*.bmp", &FindFileData); HANDLE handle = FindFirstFile("skins\\*.bmp", &FindFileData);
for (int i = 1; handle != INVALID_HANDLE_VALUE && i; i = FindNextFile(handle, &FindFileData)) { for (int i = 1; handle != INVALID_HANDLE_VALUE && i; i = FindNextFile(handle, &FindFileData)) {
if (strncmp(FindFileData.cFileName, "$$\"\"", 5) != 0) { if (strncmp(FindFileData.cFileName, DEFAULT_SKIN_NAME, 5) != 0) {
m_pSelectedSkin->nextSkin = new tSkinInfo; m_pSelectedSkin->nextSkin = new tSkinInfo;
m_pSelectedSkin = m_pSelectedSkin->nextSkin; m_pSelectedSkin = m_pSelectedSkin->nextSkin;
m_pSelectedSkin->skinId = nextSkinId; m_pSelectedSkin->skinId = nextSkinId;
@ -2525,7 +2530,7 @@ CMenuManager::DrawPlayerSetupScreen()
} else { } else {
CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255))); CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
} }
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT)); CFont::SetScale(MENU_X(MENUACTION_SCALE_MULT), MENU_Y(MENUACTION_SCALE_MULT));
CFont::SetRightJustifyOn(); CFont::SetRightJustifyOn();
CFont::PrintString(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_DATE_COLUMN_RIGHT), MENU_Y(PLAYERSETUP_LIST_TOP), TheText.Get("FES_DAT")); CFont::PrintString(MENU_X_RIGHT_ALIGNED(PLAYERSETUP_DATE_COLUMN_RIGHT), MENU_Y(PLAYERSETUP_LIST_TOP), TheText.Get("FES_DAT"));
@ -2544,7 +2549,7 @@ CMenuManager::DrawPlayerSetupScreen()
// Skin list // Skin list
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X(PLAYERSETUP_ROW_TEXT_X_SCALE), MENU_Y(PLAYERSETUP_ROW_TEXT_Y_SCALE)); CFont::SetScale(MENU_X(PLAYERSETUP_ROW_TEXT_X_SCALE), MENU_Y(PLAYERSETUP_ROW_TEXT_Y_SCALE));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
if (m_nSkinsTotal > 0) { if (m_nSkinsTotal > 0) {
for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin->skinId != m_nFirstVisibleRowOnList; for (m_pSelectedSkin = m_pSkinListHead.nextSkin; m_pSelectedSkin->skinId != m_nFirstVisibleRowOnList;
m_pSelectedSkin = m_pSelectedSkin->nextSkin); m_pSelectedSkin = m_pSelectedSkin->nextSkin);
@ -2698,7 +2703,7 @@ CMenuManager::DrawPlayerSetupScreen()
// Big apply button // Big apply button
if (strcmp(m_aSkinName, m_PrefsSkinFile) != 0) { if (strcmp(m_aSkinName, m_PrefsSkinFile) != 0) {
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
switch (m_PrefsLanguage) { switch (m_PrefsLanguage) {
case LANGUAGE_FRENCH: case LANGUAGE_FRENCH:
CFont::SetScale(MENU_X(1.1f), MENU_Y(1.9f)); CFont::SetScale(MENU_X(1.1f), MENU_Y(1.9f));
@ -2718,7 +2723,7 @@ CMenuManager::DrawPlayerSetupScreen()
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::PrintString(MENU_X_LEFT_ALIGNED(20.0f), MENU_Y(220.0f), TheText.Get("FET_APL")); CFont::PrintString(MENU_X_LEFT_ALIGNED(20.0f), MENU_Y(220.0f), TheText.Get("FET_APL"));
} }
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(SMALLTEXT_X_SCALE), MENU_Y(SMALLTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLTEXT_X_SCALE), MENU_Y(SMALLTEXT_Y_SCALE));
@ -2796,7 +2801,7 @@ CMenuManager::DrawPlayerSetupScreen()
m_nHoverOption = HOVEROPTION_NOT_HOVERING; m_nHoverOption = HOVEROPTION_NOT_HOVERING;
} }
} }
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetScale(MENU_X(SMALLTEXT_X_SCALE), MENU_Y(SMALLTEXT_Y_SCALE)); CFont::SetScale(MENU_X(SMALLTEXT_X_SCALE), MENU_Y(SMALLTEXT_Y_SCALE));
CFont::SetRightJustifyOn(); CFont::SetRightJustifyOn();
CFont::SetColor(CRGBA(0, 0, 0, FadeIn(90))); CFont::SetColor(CRGBA(0, 0, 0, FadeIn(90)));
@ -2898,6 +2903,8 @@ CMenuManager::InitialiseChangedLanguageSettings()
CGame::frenchGame = false; CGame::frenchGame = false;
CGame::germanGame = false; CGame::germanGame = false;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
CGame::russianGame = false;
CGame::japaneseGame = false;
switch (m_PrefsLanguage) { switch (m_PrefsLanguage) {
case LANGUAGE_POLISH: case LANGUAGE_POLISH:
CFont::ReloadFonts(FONT_LANGSET_POLISH); CFont::ReloadFonts(FONT_LANGSET_POLISH);
@ -2922,16 +2929,17 @@ CMenuManager::InitialiseChangedLanguageSettings()
CGame::germanGame = true; CGame::germanGame = true;
break; break;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
case LANGUAGE_POLISH:
CGame::polishGame = true;
break;
case LANGUAGE_RUSSIAN: case LANGUAGE_RUSSIAN:
CGame::russianGame = true; CGame::russianGame = true;
break; break;
case LANGUAGE_JAPANESE:
CGame::japaneseGame = true;
break;
#endif #endif
default: default:
break; break;
} }
PcSaveHelper.PopulateSlotInfo();
} }
} }
@ -3087,8 +3095,8 @@ CMenuManager::LoadSettings()
if (!SkinFound) { if (!SkinFound) {
OutputDebugString("Default skin set as no other skins are available OR saved skin not found!"); OutputDebugString("Default skin set as no other skins are available OR saved skin not found!");
strcpy(m_PrefsSkinFile, "$$\"\""); strcpy(m_PrefsSkinFile, DEFAULT_SKIN_NAME);
strcpy(m_aSkinName, "$$\"\""); strcpy(m_aSkinName, DEFAULT_SKIN_NAME);
} }
} }
@ -3162,7 +3170,7 @@ CMenuManager::MessageScreen(const char *text)
CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(170.0f)); CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(170.0f));
CFont::SetRightJustifyWrap(SCREEN_SCALE_FROM_RIGHT(170.0f)); CFont::SetRightJustifyWrap(SCREEN_SCALE_FROM_RIGHT(170.0f));
CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(120.0f), SCREEN_SCALE_Y(150.0f), SCREEN_SCALE_FROM_RIGHT(120.0f), SCREEN_SCALE_FROM_BOTTOM(220.0f)), CRGBA(50, 50, 50, 210)); CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(120.0f), SCREEN_SCALE_Y(150.0f), SCREEN_SCALE_FROM_RIGHT(120.0f), SCREEN_SCALE_FROM_BOTTOM(220.0f)), CRGBA(50, 50, 50, 210));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetCentreSize(SCREEN_SCALE_X(380.0f)); CFont::SetCentreSize(SCREEN_SCALE_X(380.0f));
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetColor(CRGBA(255, 217, 106, 255)); CFont::SetColor(CRGBA(255, 217, 106, 255));
@ -3192,7 +3200,7 @@ void
CMenuManager::PrintBriefs() CMenuManager::PrintBriefs()
{ {
CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255))); CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255)));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetRightJustifyOff(); CFont::SetRightJustifyOff();
CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X * 0.7), MENU_Y(MENU_TEXT_SIZE_Y * 0.9)); // second mulipliers are double, idk why CFont::SetScale(MENU_X(MENU_TEXT_SIZE_X * 0.7), MENU_Y(MENU_TEXT_SIZE_Y * 0.9)); // second mulipliers are double, idk why
@ -3247,7 +3255,7 @@ CMenuManager::PrintErrorMessage()
return; return;
CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(140.0f), SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f)), CRGBA(64, 16, 16, 224)); CSprite2d::DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(140.0f), SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_FROM_BOTTOM(120.0f)), CRGBA(64, 16, 16, 224));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetBackgroundOff(); CFont::SetBackgroundOff();
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetCentreOff(); CFont::SetCentreOff();
@ -5063,7 +5071,7 @@ CMenuManager::PrintController(void)
m_aFrontEndSprites[FE_ARROWS4].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255)); m_aFrontEndSprites[FE_ARROWS4].Draw(MENU_X_LEFT_ALIGNED(160.0f), MENU_Y(160.0f), MENU_X(235.2f), MENU_Y(175.2f), CRGBA(255, 255, 255, 255));
} }
CFont::SetFontStyle(FONTJAP(FONT_BANK)); // X CFont::SetFontStyle(FONT_LOCALE(FONT_BANK)); // X
// CFont::SetScale(0.4f, 0.4f); // CFont::SetScale(0.4f, 0.4f);
CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); // X CFont::SetScale(MENU_X(SMALLESTTEXT_X_SCALE), MENU_Y(SMALLESTTEXT_Y_SCALE)); // X
@ -5440,7 +5448,7 @@ CMenuManager::PrintMap(void)
CRGBA(235, 170, 50, 255)); CRGBA(235, 170, 50, 255));
CFont::SetScale(MENU_X(0.4f), MENU_Y(0.7f)); CFont::SetScale(MENU_X(0.4f), MENU_Y(0.7f));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255))); CFont::SetColor(CRGBA(0, 0, 0, FadeIn(255)));
float nextX = MENU_X(30.0f), nextY = 95.0f; float nextX = MENU_X(30.0f), nextY = 95.0f;

2
src/core/Game.cpp
View file

@ -97,8 +97,8 @@ bool CGame::noProstitutes;
bool CGame::playingIntro; bool CGame::playingIntro;
char CGame::aDatFile[32]; char CGame::aDatFile[32];
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
bool CGame::polishGame = false;
bool CGame::russianGame = false; bool CGame::russianGame = false;
bool CGame::japaneseGame = false;
#endif #endif
int gameTxdSlot; int gameTxdSlot;

2
src/core/Game.h
View file

@ -17,8 +17,8 @@ public:
static bool frenchGame; static bool frenchGame;
static bool germanGame; static bool germanGame;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
static bool polishGame;
static bool russianGame; static bool russianGame;
static bool japaneseGame;
#endif #endif
static bool noProstitutes; static bool noProstitutes;
static bool playingIntro; static bool playingIntro;

623
src/render/Font.cpp
View file

@ -167,6 +167,7 @@ int16 CFont::Size[MAX_FONTS][193] = {
#endif #endif
}; };
#ifdef MORE_LANGUAGES
int16 Size_jp[] = { int16 Size_jp[] = {
15, 14, 16, 20, 19, 26, 22, 11, 18, 18, 27, 26, 13, //; 0 15, 14, 16, 20, 19, 26, 22, 11, 18, 18, 27, 26, 13, //; 0
19, 20, 27, 19, 15, 19, 19, 21, 19, 20, 18, 19, 15, //; 13 19, 20, 27, 19, 15, 19, 19, 21, 19, 20, 18, 19, 15, //; 13
@ -184,6 +185,7 @@ int16 Size_jp[] = {
19, 19, 19, 11, 19, 19, 19, 19, 19, 19, 19, 19, 19, //; 170 19, 19, 19, 11, 19, 19, 19, 19, 19, 19, 19, 19, 19, //; 170
19, 19, 19, 19, 19, 19, 19, 19, 19, 21 19, 19, 19, 19, 19, 19, 19, 19, 19, 21
}; };
#endif
wchar foreign_table[128] = { wchar foreign_table[128] = {
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
@ -227,11 +229,13 @@ CFont::Initialise(void)
CTxdStore::PushCurrentTxd(); CTxdStore::PushCurrentTxd();
CTxdStore::SetCurrentTxd(slot); CTxdStore::SetCurrentTxd(slot);
Sprite[0].SetTexture("font2", "font2_mask"); Sprite[0].SetTexture("font2", "font2_mask");
if (LanguageSet == FONT_LANGSET_JAPANESE) { #ifdef MORE_LANGUAGES
if (IsJapanese()) {
Sprite[1].SetTexture("FONTJAP", "FONTJAP_mask"); Sprite[1].SetTexture("FONTJAP", "FONTJAP_mask");
Sprite[3].SetTexture("FONTJAP", "FONTJAP_mask"); Sprite[3].SetTexture("FONTJAP", "FONTJAP_mask");
} }
else else
#endif // MORE_LANGUAGES
Sprite[1].SetTexture("pager", "pager_mask"); Sprite[1].SetTexture("pager", "pager_mask");
Sprite[2].SetTexture("font1", "font1_mask"); Sprite[2].SetTexture("font1", "font1_mask");
SetScale(1.0f, 1.0f); SetScale(1.0f, 1.0f);
@ -261,7 +265,7 @@ CFont::ReloadFonts(uint8 set)
Sprite[0].Delete(); Sprite[0].Delete();
Sprite[1].Delete(); Sprite[1].Delete();
Sprite[2].Delete(); Sprite[2].Delete();
if (LanguageSet == FONT_LANGSET_JAPANESE) if (IsJapanese())
Sprite[3].Delete(); Sprite[3].Delete();
CTxdStore::PushCurrentTxd(); CTxdStore::PushCurrentTxd();
CTxdStore::RemoveTxd(Slot); CTxdStore::RemoveTxd(Slot);
@ -302,9 +306,9 @@ CFont::Shutdown(void)
Sprite[0].Delete(); Sprite[0].Delete();
Sprite[1].Delete(); Sprite[1].Delete();
Sprite[2].Delete(); Sprite[2].Delete();
if (LanguageSet == FONT_LANGSET_JAPANESE)
Sprite[3].Delete();
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapanese())
Sprite[3].Delete();
CTxdStore::RemoveTxdSlot(Slot); CTxdStore::RemoveTxdSlot(Slot);
Slot = -1; Slot = -1;
#else #else
@ -318,8 +322,10 @@ CFont::InitPerFrame(void)
Details.bank = CSprite2d::GetBank(30, Sprite[0].m_pTexture); Details.bank = CSprite2d::GetBank(30, Sprite[0].m_pTexture);
CSprite2d::GetBank(15, Sprite[1].m_pTexture); CSprite2d::GetBank(15, Sprite[1].m_pTexture);
CSprite2d::GetBank(15, Sprite[2].m_pTexture); CSprite2d::GetBank(15, Sprite[2].m_pTexture);
if (LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
if (IsJapanese())
CSprite2d::GetBank(15, Sprite[3].m_pTexture); CSprite2d::GetBank(15, Sprite[3].m_pTexture);
#endif
SetDropShadowPosition(0); SetDropShadowPosition(0);
NewLine = 0; NewLine = 0;
} }
@ -334,11 +340,13 @@ CFont::PrintChar(float x, float y, wchar c)
float w = GetCharacterWidth(c) / 32.0f; float w = GetCharacterWidth(c) / 32.0f;
float xoff = c % 16; float xoff = c % 16;
float yoff = c / 16; float yoff = c / 16;
if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_PAGER || Details.style == FONT_JAPANESE)) { #ifdef MORE_LANGUAGES
if (IsJapaneseFont()) {
w = 21.0f; w = 21.0f;
xoff = (float)(c % 48);// *w / 1024.0f; xoff = (float)(c % 48);
yoff = c / 48; yoff = c / 48;
} }
#endif
if(Details.style == FONT_BANK || Details.style == FONT_HEADING){ if(Details.style == FONT_BANK || Details.style == FONT_HEADING){
if(Details.dropShadowPosition != 0){ if(Details.dropShadowPosition != 0){
@ -362,7 +370,8 @@ CFont::PrintChar(float x, float y, wchar c)
(xoff+1.0f)/16.0f - 0.001f, yoff/12.8f, (xoff+1.0f)/16.0f - 0.001f, yoff/12.8f,
xoff/16.0f, (yoff+1.0f)/12.8f - 0.002f, xoff/16.0f, (yoff+1.0f)/12.8f - 0.002f,
(xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.002f); (xoff+1.0f)/16.0f - 0.001f, (yoff+1.0f)/12.8f - 0.002f);
}else if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_PAGER || Details.style == FONT_JAPANESE)) { #ifdef MORE_LANGUAGES
}else if (IsJapaneseFont()) {
if (Details.dropShadowPosition != 0) { if (Details.dropShadowPosition != 0) {
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition), CRect(x + SCREEN_SCALE_X(Details.dropShadowPosition),
@ -384,8 +393,8 @@ CFont::PrintChar(float x, float y, wchar c)
xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, yoff / 25.6f, xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, yoff / 25.6f,
xoff * w / 1024.0f, (yoff + 1.0f) / 25.6f - 0.002f, xoff * w / 1024.0f, (yoff + 1.0f) / 25.6f - 0.002f,
xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, (yoff + 1.0f) / 25.6f - 0.0001f); xoff * w / 1024.0f + (1.0f / 48.0f) - 0.001f, (yoff + 1.0f) / 25.6f - 0.0001f);
} #endif
else }else
CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank CSprite2d::AddSpriteToBank(Details.bank + Details.style, // BUG: game doesn't add bank
CRect(x, y, CRect(x, y,
x + 32.0f * Details.scaleX * w, x + 32.0f * Details.scaleX * w,
@ -397,26 +406,10 @@ CFont::PrintChar(float x, float y, wchar c)
(xoff+w)/16.0f - 0.0001f, (yoff+1.0f)/16.0f - 0.0001f); (xoff+w)/16.0f - 0.0001f, (yoff+1.0f)/16.0f - 0.0001f);
} }
bool CFont::IsJapanesePunctuation(wchar *a1) #ifdef MORE_LANGUAGES
bool CFont::IsJapanesePunctuation(wchar *str)
{ {
wchar v2; return (*str == 0xE7 || *str == 0x124 || *str == 0x126 || *str == 0x128 || *str == 0x104 || *str == ',' || *str == '>' || *str == '!' || *str == 0x99 || *str == '?' || *str == ':');
v2 = *a1;
if (v2 != 0xE7
&& v2 != 0x124
&& v2 != 0x126
&& v2 != 0x128
&& v2 != 0x104
&& v2 != ','
&& v2 != '>'
&& v2 != '!'
&& v2 != 0x99
&& v2 != '?'
&& v2 != ':')
{
return false;
}
return true;
} }
bool CFont::IsAnsiCharacter(wchar *s) bool CFont::IsAnsiCharacter(wchar *s)
@ -433,200 +426,11 @@ bool CFont::IsAnsiCharacter(wchar *s)
return true; return true;
return false; return false;
} }
#endif
void void
CFont::PrintString(float xstart, float ystart, wchar *s) CFont::PrintString(float xstart, float ystart, wchar *s)
{ {
/*
if (1)
{
wchar* result; // eax
__int16 numSpaces; // bx
wchar* start; // ebp
double v6; // st7
float v7; // ST2C_4
float v8; // ST2C_4
double v9; // st5
double v10; // st7
double v11; // st5
float v12; // ST10_4
float v13; // ST00_4
float v14; // ST34_4
unsigned __int16* v15; // eax
wchar* t; // esi
unsigned __int16 v17; // ax
double v18; // st7
double v19; // st7
float v20; // ST34_4
double v21; // st7
double v22; // st7
double v23; // st7
double xleft_d; // st6
float xleft; // ST00_4
float v26; // ST34_4
float v27; // [esp+24h] [ebp-44h]
float lineLength; // [esp+28h] [ebp-40h]
float v29; // [esp+30h] [ebp-38h]
float x; // [esp+40h] [ebp-28h]
float y; // [esp+44h] [ebp-24h]
char first; // [esp+4Bh] [ebp-1Dh]
CRect v33; // [esp+4Ch] [ebp-1Ch]
result = s;
if (*s != '*')
{
if (CFont::Details.background == 1)
{
CFont::GetTextRect(&v33, xstart, ystart, s);
CSprite2d::DrawRect(v33, CFont::Details.backgroundColor);
}
numSpaces = 0;
lineLength = 0.0;
start = s;
first = 1;
if (CFont::Details.centre != 1 && CFont::Details.rightJustify != 1)
x = xstart;
else
x = 0.0;
y = ystart;
while (1)
{
while (1)
{
while (1)
{
result = s;
if (!*s)
return;// result;
v27 = CFont::GetStringWidth(s, false);
if (CFont::Details.centre == 1)
v6 = CFont::Details.centreSize;
else
v6 = CFont::Details.rightJustify == 1 ? xstart - CFont::Details.rightJustifyWrap : CFont::Details.wrapX;
v7 = v6;
v8 = v7 - SCREEN_WIDTH * 0.0015625f * 21.0 * 2.0;
if (x + v27 <= v8 || first)
break;
if (someJapCheck(s))
--s;
if (CFont::Details.justify != 1 || CFont::Details.centre)
v9 = 0.0;
else
v9 = (CFont::Details.wrapX - lineLength) / (double)numSpaces;
v10 = v9;
if (CFont::Details.centre)
{
v11 = xstart - x * 0.5;
}
else if (CFont::Details.rightJustify)
{
v11 = xstart - x;
}
else
{
v11 = xstart;
}
v12 = v10;
v13 = v11;
CFont::PrintString(v13, y, start, s, v12, xstart);
start = s;
if (CFont::Details.centre != 1 && CFont::Details.rightJustify != 1)
x = xstart;
else
x = 0.0;
v14 = 32.0 * CFont::Details.scaleY * 0.3636363636363636 + 2.0 * CFont::Details.scaleY;
numSpaces = 0;
first = 1;
y = v14 + y;
lineLength = 0.0;
}
v15 = CFont::GetNextSpace(s);
t = v15;
v17 = *v15;
if (!v17 || !t[1] && v17 == ' ')
break;
if (!first)
++numSpaces;
first = 0;
v21 = CFont::GetStringWidth(s, 0);
x = v21 + x;
if (sub_511630(s))
x = x + 21.0;
s = t;
v22 = CFont::GetCharacterSize(*t - 32);
++s;
x = v22 + x;
lineLength = x;
if (!*s)
{
v23 = CFont::GetStringWidth(s, 0);
x = v23 + x;
if (sub_511630(s))
x = x + 21.0;
if (CFont::Details.centre)
{
xleft_d = xstart - x * 0.5;
}
else if (CFont::Details.rightJustify)
{
xleft_d = xstart - x;
}
else
{
xleft_d = xstart;
}
xleft = xleft_d;
if (CFont::PrintString(xleft, y, start, s, 0.0, xstart))
{
start = s;
if (CFont::Details.centre != 1 && CFont::Details.rightJustify != 1)
x = xstart;
else
x = 0.0;
v26 = 32.0 * CFont::Details.scaleY * 0.3636363636363636 + 2.0 * CFont::Details.scaleY;
numSpaces = 0;
first = 1;
y = v26 + y;
lineLength = 0.0;
}
}
}
if (!t[1] && v17 == ' ')
*t = 0;
v18 = CFont::GetStringWidth(s, 0);
s = t;
x = v18 + x;
if (CFont::Details.centre)
break;
if (CFont::Details.rightJustify)
{
v19 = xstart - x;
LABEL_43:
v29 = v19;
goto LABEL_44;
}
v29 = xstart;
LABEL_44:
if (CFont::PrintString(v29, y, start, s, 0.0, xstart))
{
start = s;
if (CFont::Details.centre != 1 && CFont::Details.rightJustify != 1)
x = xstart;
else
x = 0.0;
v20 = 32.0 * CFont::Details.scaleY * 0.3636363636363636 + 2.0 * CFont::Details.scaleY;
numSpaces = 0;
first = 1;
y = v20 + y;
lineLength = 0.0;
}
}
v19 = xstart - x * 0.5;
goto LABEL_43;
}
return;
}*/
CRect rect; CRect rect;
int numSpaces; int numSpaces;
float lineLength; float lineLength;
@ -662,18 +466,24 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
float xend = Details.centre ? Details.centreSize : float xend = Details.centre ? Details.centreSize :
Details.rightJustify ? xstart - Details.rightJustifyWrap : Details.rightJustify ? xstart - Details.rightJustifyWrap :
Details.wrapX; Details.wrapX;
if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER)) #ifdef MORE_LANGUAGES
if (IsJapaneseFont())
xend -= SCREEN_SCALE_X(21.0f * 2.0f); xend -= SCREEN_SCALE_X(21.0f * 2.0f);
#endif
if(x + GetStringWidth(s) > xend && !first){ if(x + GetStringWidth(s) > xend && !first){
if (LanguageSet == FONT_LANGSET_JAPANESE && IsJapanesePunctuation(s)) #ifdef MORE_LANGUAGES
if (IsJapanese() && IsJapanesePunctuation(s))
s--; s--;
#endif
// flush line // flush line
float spaceWidth = !Details.justify || Details.centre ? 0.0f : float spaceWidth = !Details.justify || Details.centre ? 0.0f :
(Details.wrapX - lineLength) / numSpaces; (Details.wrapX - lineLength) / numSpaces;
float xleft = Details.centre ? xstart - x/2 : float xleft = Details.centre ? xstart - x/2 :
Details.rightJustify ? xstart - x : Details.rightJustify ? xstart - x :
xstart; xstart;
#ifdef MORE_LANGUAGES
PrintString(xleft, y, start, s, spaceWidth, xstart); PrintString(xleft, y, start, s, spaceWidth, xstart);
#endif
// reset things // reset things
lineLength = 0.0f; lineLength = 0.0f;
numSpaces = 0; numSpaces = 0;
@ -682,9 +492,11 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
x = 0.0f; x = 0.0f;
else else
x = xstart; x = xstart;
if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER)) #ifdef MORE_LANGUAGES
if (IsJapaneseFont())
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY;
else else
#endif
y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY; y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;
start = s; start = s;
}else }else
@ -699,11 +511,14 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
numSpaces++; numSpaces++;
first = false; first = false;
x += GetStringWidth(s) + GetCharacterSize(*t - ' '); x += GetStringWidth(s) + GetCharacterSize(*t - ' ');
if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER) && IsAnsiCharacter(s)) #ifdef MORE_LANGUAGES
if (IsJapaneseFont() && IsAnsiCharacter(s))
x += 21.0f; x += 21.0f;
#endif
lineLength = x; lineLength = x;
s = t+1; s = t+1;
if (LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER) && !*s) { #ifdef MORE_LANGUAGES
if (IsJapaneseFont() && !*s) {
x += GetStringWidth(s); x += GetStringWidth(s);
if (IsAnsiCharacter(s)) if (IsAnsiCharacter(s))
x += 21.0f; x += 21.0f;
@ -724,7 +539,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
lineLength = 0.0f; lineLength = 0.0f;
} }
} }
#endif
} }
// print rest // print rest
if(t[0] == ' ' && t[1] == '\0') if(t[0] == ' ' && t[1] == '\0')
@ -735,7 +550,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
Details.rightJustify ? xstart - x : Details.rightJustify ? xstart - x :
xstart; xstart;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (PrintString(xleft, y, start, s, 0.0f, xstart) && LanguageSet == FONT_LANGSET_JAPANESE && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER)) { if (PrintString(xleft, y, start, s, 0.0f, xstart) && IsJapaneseFont()) {
start = s; start = s;
if (!Details.centre && !Details.rightJustify) if (!Details.centre && !Details.rightJustify)
x = xstart; x = xstart;
@ -747,7 +562,7 @@ CFont::PrintString(float xstart, float ystart, wchar *s)
lineLength = 0.0f; lineLength = 0.0f;
} }
#else #else
PrintString(xleft, y, start, s, 0.0f) PrintString(xleft, y, start, s, 0.0f);
#endif #endif
} }
} }
@ -759,9 +574,10 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
float x, y; float x, y;
wchar *t; wchar *t;
n = 0; n = 0;
bool v14 = false;
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
bool bSomeJapBool = false;
if (IsJapanese()) { if (IsJapanese()) {
t = s; t = s;
wchar unused; wchar unused;
@ -771,14 +587,14 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
if (NewLine) { if (NewLine) {
n++; n++;
NewLine = false; NewLine = false;
v14 = true; bSomeJapBool = true;
} }
t++; t++;
} }
} }
#endif
if (v14) n--; if (bSomeJapBool) n--;
#endif
if(Details.centre || Details.rightJustify) if(Details.centre || Details.rightJustify)
x = 0.0f; x = 0.0f;
@ -788,15 +604,19 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
while(*s){ while(*s){
float f = (Details.centre ? Details.centreSize : Details.wrapX); float f = (Details.centre ? Details.centreSize : Details.wrapX);
#ifdef MORE_LANGUAGES
if (IsJapaneseFont()) if (IsJapaneseFont())
f -= SCREEN_SCALE_X(21.0f * 2.0f); f -= SCREEN_SCALE_X(21.0f * 2.0f);
#endif
if(x + GetStringWidth(s) > f){ if(x + GetStringWidth(s) > f){
if (LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
if (IsJapanese())
{ {
if (IsJapanesePunctuation(s)) if (IsJapanesePunctuation(s))
s--; s--;
} }
#endif
// reached end of line // reached end of line
if(Details.centre || Details.rightJustify) if(Details.centre || Details.rightJustify)
x = 0.0f; x = 0.0f;
@ -804,9 +624,11 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
x = xstart; x = xstart;
n++; n++;
// Why even? // Why even?
if (LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
if (IsJapanese())
y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY; y += 32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY;
else else
#endif
y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY; y += 32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY;
}else{ }else{
// still space in current line // still space in current line
@ -814,18 +636,24 @@ CFont::GetNumberLines(float xstart, float ystart, wchar *s)
if(*t == '\0'){ if(*t == '\0'){
// end of string // end of string
x += GetStringWidth(s); x += GetStringWidth(s);
if ((LanguageSet == FONT_LANGSET_JAPANESE) && IsAnsiCharacter(s)) #ifdef MORE_LANGUAGES
if (IsJapanese() && IsAnsiCharacter(s))
x += 21.0f; x += 21.0f;
#endif
n++; n++;
s = t; s = t;
}else{ }else{
x += GetStringWidth(s); x += GetStringWidth(s);
if ((LanguageSet == FONT_LANGSET_JAPANESE) && IsAnsiCharacter(s)) #ifdef MORE_LANGUAGES
if (IsJapanese() && IsAnsiCharacter(s))
x += 21.0f; x += 21.0f;
#endif
s = t+1; s = t+1;
x += GetCharacterSize(*t - ' '); x += GetCharacterSize(*t - ' ');
if (LanguageSet == FONT_LANGSET_JAPANESE && !*s) #ifdef MORE_LANGUAGES
if (IsJapanese() && !*s)
n++; n++;
#endif
} }
} }
} }
@ -844,10 +672,11 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
maxlength = 0; maxlength = 0;
numLines = 0; numLines = 0;
#ifdef MORE_LANGUAGES
if (IsJapanese()) { if (IsJapanese()) {
numLines = GetNumberLines(xstart, ystart, s); numLines = GetNumberLines(xstart, ystart, s);
//maxlength = Details.centreSize;
}else{ }else{
#endif
if(Details.centre || Details.rightJustify) if(Details.centre || Details.rightJustify)
x = 0.0f; x = 0.0f;
else else
@ -882,38 +711,50 @@ CFont::GetTextRect(CRect *rect, float xstart, float ystart, wchar *s)
} }
} }
} }
#ifdef MORE_LANGUAGES
} }
#endif
if(Details.centre){ if(Details.centre){
if(Details.backgroundOnlyText){ if(Details.backgroundOnlyText){
rect->left = xstart - maxlength/2 - 4.0f; rect->left = xstart - maxlength/2 - 4.0f;
rect->right = xstart + maxlength/2 + 4.0f; rect->right = xstart + maxlength/2 + 4.0f;
#ifdef MORE_LANGUAGES
if (IsJapaneseFont()) { if (IsJapaneseFont()) {
rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f); rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f);
rect->top = ystart - (4.0f / 2.75f); rect->top = ystart - (4.0f / 2.75f);
} else { } else {
#endif
rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f; rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f;
rect->top = ystart - 2.0f; rect->top = ystart - 2.0f;
#ifdef MORE_LANGUAGES
} }
#endif
}else{ }else{
rect->left = xstart - Details.centreSize*0.5f - 4.0f; rect->left = xstart - Details.centreSize*0.5f - 4.0f;
rect->right = xstart + Details.centreSize*0.5f + 4.0f; rect->right = xstart + Details.centreSize*0.5f + 4.0f;
#ifdef MORE_LANGUAGES
if (IsJapaneseFont()) { if (IsJapaneseFont()) {
rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f); rect->bottom = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + (4.0f / 2.75f);
rect->top = ystart - (4.0f / 2.75f); rect->top = ystart - (4.0f / 2.75f);
} else { } else {
#endif
rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f; rect->bottom = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f;
rect->top = ystart - 2.0f; rect->top = ystart - 2.0f;
#ifdef MORE_LANGUAGES
} }
#endif
} }
}else{ }else{
rect->left = xstart - 4.0f; rect->left = xstart - 4.0f;
rect->right = Details.wrapX; rect->right = Details.wrapX;
// WTF? // WTF?
rect->bottom = ystart - 4.0f + 4.0f; rect->bottom = ystart - 4.0f + 4.0f;
#ifdef MORE_LANGUAGES
if (IsJapaneseFont()) if (IsJapaneseFont())
rect->top = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + (4.0f / 2.75f); rect->top = (32.0f * CFont::Details.scaleY / 2.75f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + (4.0f / 2.75f);
else else
#endif
rect->top = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + 2.0f; rect->top = (32.0f * CFont::Details.scaleY * 0.5f + 2.0f * CFont::Details.scaleY) * numLines + ystart + 2.0f + 2.0f;
} }
} }
@ -924,8 +765,8 @@ CFont::PrintString(float x, float y, wchar *start, wchar *&end, float spwidth, f
{ {
wchar *s, c, unused; wchar *s, c, unused;
if (LanguageSet == FONT_LANGSET_JAPANESE) { if (IsJapanese()) {
float v14 = 0.0f; float jx = 0.0f;
for (s = start; s < end; s++) { for (s = start; s < end; s++) {
if (*s == JAP_TERMINATION || *s == '~') if (*s == JAP_TERMINATION || *s == '~')
s = ParseToken(s, &unused, true); s = ParseToken(s, &unused, true);
@ -933,17 +774,13 @@ CFont::PrintString(float x, float y, wchar *start, wchar *&end, float spwidth, f
NewLine = false; NewLine = false;
break; break;
} }
v14 += GetCharacterSize(*s - ' '); jx += GetCharacterSize(*s - ' ');
} }
s = start; s = start;
if (Details.centre) if (Details.centre)
{ x = japX - jx / 2.0f;
x = japX - v14 * 0.5;
}
else if (Details.rightJustify) else if (Details.rightJustify)
{ x = japX - jx;
x = japX - v14;
}
} }
for (s = start; s < end; s++) { for (s = start; s < end; s++) {
@ -988,8 +825,7 @@ float
CFont::GetCharacterWidth(wchar c) CFont::GetCharacterWidth(wchar c)
{ {
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
if (IsJapanese()) if (IsJapanese()) {
{
if (!Details.proportional) if (!Details.proportional)
return Size[0][Details.style][192]; return Size[0][Details.style][192];
if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) { if (c <= 94 || Details.style == FONT_HEADING || Details.style == FONT_BANK) {
@ -1012,7 +848,7 @@ CFont::GetCharacterWidth(wchar c)
return 10.0f; return 10.0f;
case FONT_PAGER: case FONT_PAGER:
return 31.5f; return 31.5f;
case FONT_HEADING: default:
return Size[0][Details.style][c]; return Size[0][Details.style][c];
} }
} }
@ -1058,7 +894,7 @@ CFont::GetCharacterSize(wchar c)
return 10.0f * Details.scaleX; return 10.0f * Details.scaleX;
case FONT_PAGER: case FONT_PAGER:
return 31.5f * Details.scaleX; return 31.5f * Details.scaleX;
case FONT_HEADING: default:
return Size[0][Details.style][c] * Details.scaleX; return Size[0][Details.style][c] * Details.scaleX;
} }
} }
@ -1080,106 +916,9 @@ CFont::GetStringWidth(wchar *s, bool spaces)
float w; float w;
w = 0.0f; w = 0.0f;
#ifdef MORE_LANGUAGES
if (LanguageSet == FONT_LANGSET_JAPANESE) if (IsJapanese())
{ {
/* unsigned __int16* v2; // ebx
double v3; // st4
int v4; // edx
double v5; // st7
unsigned __int16 v6; // ax
unsigned __int16 v7; // ax
double v8; // st3
float v10; // [esp+0h] [ebp-20h]
float v11; // [esp+4h] [ebp-1Ch]
v2 = (unsigned __int16*)s;
v10 = 0.0;
do
{
if ((*v2 != ' ' || spaces) && *v2)
{
v3 = CFont::Details.scaleX;
v4 = 193 * (signed __int16)CFont::Details.style;
v5 = 29.4 * CFont::Details.scaleX;
do
{
v6 = *v2;
if (*v2 == 0x807Eu || v6 == '~')
{
do
++v2;
while (*v2 != 0x807Eu && *v2 != '~');
++v2;
goto LABEL_27;
}
v7 = v6 - ' ';
if (CFont::Details.proportional == 1)
{
if (v7 > 94u && CFont::Details.style != FONT_HEADING && CFont::Details.style != FONT_BANK)
{
if (v7 >= 254u || CFont::Details.style != FONT_PAGER)
{
switch (CFont::Details.style)
{
case FONT_JAPANESE:
v8 = v5;
goto LABEL_25;
case FONT_BANK:
v8 = 10.0 * CFont::Details.scaleX;
goto LABEL_25;
case FONT_PAGER:
v8 = 31.5 * CFont::Details.scaleX;
goto LABEL_25;
case FONT_HEADING:
v11 = Size[0][Details.style][v7] * CFont::Details.scaleX;
break;
}
}
else
{
v11 = v5;
}
goto def_510DAD;
}
if (Details.style == FONT_JAPANESE)
v8 = Size_jp[v7] * Details.scaleX;
else
v8 = CFont::Size[0][Details.style][v7] * v3;
}
else
{
v8 = CFont::Size[0][CFont::Details.style][192] * v3;
}
LABEL_25:
v11 = v8;
def_510DAD:
v10 = v10 + v11;
LABEL_27:
if (*v2 != 0x807Eu && *v2 != '~')
++v2;
} while (*v2 == 0x807Eu || *v2 == '~');
}
} while (IsAnsiCharacter(v2));
return v10;*/
/*for (;; s++)
{
if (*s == '\0' && (!spaces || (*s == ' ' || !sub_511630(s) && *s != '~' && *s != JAP_TERMINATION)))
return w;
while (*s == '~' || *s == JAP_TERMINATION) {
s++;
while (*s != '~' && *s != JAP_TERMINATION) s++;
s++;
if (*s == ' ' && spaces)
return w;
}
w += GetCharacterSize(*s - ' ');
s++;
if ((*s != '~' && *s != JAP_TERMINATION) && ((*s == ' ' || !sub_511630(s)) && !spaces))
return w;
}*/
do do
{ {
if ((*s != ' ' || spaces) && *s != '\0') { if ((*s != ' ' || spaces) && *s != '\0') {
@ -1188,18 +927,14 @@ CFont::GetStringWidth(wchar *s, bool spaces)
s++; s++;
while (!(*s == '~' || *s == JAP_TERMINATION)) s++; while (!(*s == '~' || *s == JAP_TERMINATION)) s++;
s++; s++;
//if (*s != JAP_TERMINATION && *s != '~')
// ++s;
//continue;
} }
w += GetCharacterSize(*s - ' '); w += GetCharacterSize(*s - ' ');
//if (*s != JAP_TERMINATION && *s != '~')
++s; ++s;
} while (*s == '~' || *s == JAP_TERMINATION); } while (*s == '~' || *s == JAP_TERMINATION);
} }
} while (IsAnsiCharacter(s));//*/ } while (IsAnsiCharacter(s));
} } else
else #endif
{ {
for (; (*s != ' ' || spaces) && *s != '\0'; s++) { for (; (*s != ' ' || spaces) && *s != '\0'; s++) {
if (*s == '~') { if (*s == '~') {
@ -1215,151 +950,49 @@ CFont::GetStringWidth(wchar *s, bool spaces)
return w; return w;
} }
#ifdef MORE_LANGUAGES
float
CFont::GetStringWidth_Jap(wchar* s)
{
float w;
w = 0.0f;
for (; *s != '\0';) {
do {
while (*s == '~' || *s == JAP_TERMINATION) {
s++;
while (!(*s == '~' || *s == JAP_TERMINATION)) s++;
s++;
}
w += GetCharacterSize(*s - ' ');
++s;
} while (*s == '~' || *s == JAP_TERMINATION);
}
return w;
}
#endif
wchar* wchar*
CFont::GetNextSpace(wchar *s) CFont::GetNextSpace(wchar *s)
{ {
#ifdef MORE_LANGUAGES
if (IsJapanese()) { if (IsJapanese()) {
unsigned __int16* v1; // ebx
v1 = s;
while (*v1 == ' ' || !*v1)
{
LABEL_11:
if (!IsAnsiCharacter(v1))
return v1;
}
while (1)
{
if (*v1 == 0x807Eu || *v1 == '~')
{
do
++v1;
while (*v1 != 0x807Eu && *v1 != '~');
++v1;
if (*v1 == ' ')
return v1;
}
++v1;
if (*v1 != 0x807Eu && *v1 != '~')
goto LABEL_11;
}
if (*v1 == ' ' || !*v1)
{
if (IsAnsiCharacter(v1))
{
do do
{ {
if (*v1 == 0x807Eu || *v1 == '~') if (*s != ' ' && *s != '\0') {
{ do {
do
++v1;
while (*v1 != 0x807Eu && *v1 != '~');
++v1;
if (*v1 == ' ')
return v1;
}
++v1;
if (*v1 != 0x807Eu && *v1 != '~')
if (!IsAnsiCharacter(v1))
return v1;
} while (*v1 == ' ' || !*v1);
}
}
/*for (;; s++)
{
if (*s == '\0' || *s == ' ' || (!sub_511630(s) && *s != '~' && *s != JAP_TERMINATION))
return s;
if (*s == '~' || *s == JAP_TERMINATION) {
s++;
while (*s != '~' && *s != JAP_TERMINATION) s++;
s++;
if (*s == ' ' )
return s;
}
//s++;
//if (*s == ' ' || (!sub_511630(s) && *s != '~' && *s != JAP_TERMINATION))
// return s;
}*/
/*for (;*s != ' ' && *s != '\0' && sub_511630(s); s++) {
while (*s == '~' || *s == JAP_TERMINATION) { while (*s == '~' || *s == JAP_TERMINATION) {
s++; s++;
while (*s != '~' && *s != JAP_TERMINATION) s++; while (!(*s == '~' || *s == JAP_TERMINATION)) s++;
s++; s++;
if (*s == ' ' || ((*s != '~' && *s != JAP_TERMINATION) && !sub_511630(s)))
return s;
}
}
return s;*/
/*while (*s == ' ' || !*s) {
LABEL_11:
if (!sub_511630(s))
return s;
}*/
/*while (*s != ' ' && *s != '\0')
{
while (*s == JAP_TERMINATION || *s == '~')
{
do
++s;
while (*s != JAP_TERMINATION && *s != '~');
++s;
if (*s == ' ')
return s;
} }
++s; ++s;
if (!sub_511630(s)) } while (*s == '~' || *s == JAP_TERMINATION);
return s;
//if (*s != JAP_TERMINATION && *s != '~')
// goto LABEL_11;
} }
return s;*/ } while (IsAnsiCharacter(s));
} else
#endif
//for (; *s != ' ' && *s != '\0';) {
// if (!sub_511630(s))
// break;
// //for (; *s == '~' || *s == JAP_TERMINATION;s++) {
// // s++;
// // while (!(*s == '~' || *s == JAP_TERMINATION)) s++;
// // s++;
// // if (*s == ' ')
// // return s;
// // if (!sub_511630(s))
// // return s;
// //}
// while (true)
// {
// if (*s == '~' || *s == JAP_TERMINATION) {
// s++;
// while (*s != '~' || *s == JAP_TERMINATION) s++;
// s++;
// if (*s == ' ')
// return s;
// }
// s++;
// if (!(*s == '~' || *s == JAP_TERMINATION))
// break;
// }
//}
//return s;
for (;*s != ' ' && *s != '\0' && IsAnsiCharacter(s); s++ ) {
if (*s == '~' || *s == JAP_TERMINATION)
{
s++;
while (*s != '~' && *s != JAP_TERMINATION) s++;
s++;
if (*s == ' ' || ((*s != '~' && *s != JAP_TERMINATION) && !IsAnsiCharacter(s)))
break;
}
}
}
else
{ {
for(; *s != ' ' && *s != '\0'; s++) for(; *s != ' ' && *s != '\0'; s++)
if(*s == '~'){ if(*s == '~'){
@ -1434,8 +1067,10 @@ CFont::DrawFonts(void)
CSprite2d::DrawBank(Details.bank); CSprite2d::DrawBank(Details.bank);
CSprite2d::DrawBank(Details.bank+1); CSprite2d::DrawBank(Details.bank+1);
CSprite2d::DrawBank(Details.bank+2); CSprite2d::DrawBank(Details.bank+2);
#ifdef MORE_LANGUAGES
if (IsJapanese()) if (IsJapanese())
CSprite2d::DrawBank(Details.bank+3); CSprite2d::DrawBank(Details.bank+3);
#endif
} }
wchar wchar
@ -1450,22 +1085,24 @@ CFont::character_code(uint8 c)
void void
CFont::SetScale(float x, float y) CFont::SetScale(float x, float y)
{ {
/*if (LanguageSet == FONT_LANGSET_JAPANESE) { #ifdef MORE_LANGUAGES
/*if (IsJapanese()) {
x *= 1.35f; x *= 1.35f;
y *= 1.25f; y *= 1.25f;
}*/ }*/
#endif
Details.scaleX = x; Details.scaleX = x;
Details.scaleY = y; Details.scaleY = y;
} }
void void
CFont::SetBackgroundColor(const CRGBA &col) CFont::SetBackgroundColor(CRGBA col)
{ {
Details.backgroundColor = col; Details.backgroundColor = col;
} }
void void
CFont::SetColor(const CRGBA &col) CFont::SetColor(CRGBA col)
{ {
Details.color = col; Details.color = col;
if (Details.alphaFade < 255.0f) if (Details.alphaFade < 255.0f)
@ -1473,7 +1110,7 @@ CFont::SetColor(const CRGBA &col)
} }
void void
CFont::SetDropColor(const CRGBA &col) CFont::SetDropColor(CRGBA col)
{ {
Details.dropColor = col; Details.dropColor = col;
if (Details.alphaFade < 255.0f) if (Details.alphaFade < 255.0f)

23
src/render/Font.h
View file

@ -49,25 +49,23 @@ enum
FONT_LANGSET_EFIGS, FONT_LANGSET_EFIGS,
FONT_LANGSET_RUSSIAN, FONT_LANGSET_RUSSIAN,
FONT_LANGSET_POLISH, FONT_LANGSET_POLISH,
FONT_LANGSET_JAPANESE FONT_LANGSET_JAPANESE,
LANGSET_MAX LANGSET_MAX
}; };
#endif
#define FONTJAP(style) (CFont::LanguageSet == FONT_LANGSET_JAPANESE ? FONT_JAPANESE : style) #define FONT_LOCALE(style) (CFont::IsJapanese() ? FONT_JAPANESE : style)
#else
#define FONT_LOCALE(style) (style)
#endif
class CFont class CFont
{ {
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
static int16 Size[LANGSET_MAX][MAX_FONTS][193]; static int16 Size[LANGSET_MAX][MAX_FONTS][193];
public:
static uint8 LanguageSet; static uint8 LanguageSet;
private:
static int32 Slot; static int32 Slot;
static CSprite2d Sprite[4];
#else #else
static int16 Size[MAX_FONTS][193]; static int16 Size[MAX_FONTS][193];
static CSprite2d* Sprite; //[3]
#endif #endif
static int16 NewLine; static int16 NewLine;
static CSprite2d Sprite[MAX_FONTS]; static CSprite2d Sprite[MAX_FONTS];
@ -89,6 +87,9 @@ public:
static float GetCharacterWidth(wchar c); static float GetCharacterWidth(wchar c);
static float GetCharacterSize(wchar c); static float GetCharacterSize(wchar c);
static float GetStringWidth(wchar *s, bool spaces = false); static float GetStringWidth(wchar *s, bool spaces = false);
#ifdef MORE_LANGUAGES
static float GetStringWidth_Jap(wchar* s);
#endif
static uint16 *GetNextSpace(wchar *s); static uint16 *GetNextSpace(wchar *s);
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
static uint16 *ParseToken(wchar *s, wchar*, bool japShit = false); static uint16 *ParseToken(wchar *s, wchar*, bool japShit = false);
@ -158,16 +159,16 @@ public:
static void SetRightJustifyWrap(float wrap) { Details.rightJustifyWrap = wrap; } static void SetRightJustifyWrap(float wrap) { Details.rightJustifyWrap = wrap; }
static void SetAlphaFade(float fade) { Details.alphaFade = fade; } static void SetAlphaFade(float fade) { Details.alphaFade = fade; }
static void SetDropShadowPosition(int16 pos) { Details.dropShadowPosition = pos; } static void SetDropShadowPosition(int16 pos) { Details.dropShadowPosition = pos; }
static void SetBackgroundColor(const CRGBA &col); static void SetBackgroundColor(CRGBA col);
static void SetColor(const CRGBA &col); static void SetColor(CRGBA col);
static void SetDropColor(const CRGBA &col); static void SetDropColor(CRGBA col);
#ifdef MORE_LANGUAGES #ifdef MORE_LANGUAGES
static void ReloadFonts(uint8 set); static void ReloadFonts(uint8 set);
// japanese stuff // japanese stuff
static bool IsAnsiCharacter(wchar* s); static bool IsAnsiCharacter(wchar* s);
static bool IsJapanesePunctuation(wchar* a1); static bool IsJapanesePunctuation(wchar* str);
static bool IsJapanese() { return LanguageSet == FONT_LANGSET_JAPANESE; } static bool IsJapanese() { return LanguageSet == FONT_LANGSET_JAPANESE; }
static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER); } static bool IsJapaneseFont() { return IsJapanese() && (Details.style == FONT_JAPANESE || Details.style == FONT_PAGER); }
#endif #endif

24
src/render/Hud.cpp
View file

@ -660,7 +660,7 @@ void CHud::Draw()
CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f)); CFont::SetScale(SCREEN_SCALE_X(0.8f), SCREEN_SCALE_Y(1.35f));
CFont::SetRightJustifyOn(); CFont::SetRightJustifyOn();
CFont::SetRightJustifyWrap(0.0f); CFont::SetRightJustifyWrap(0.0f);
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetPropOff(); CFont::SetPropOff();
CFont::SetBackGroundOnlyTextOn(); CFont::SetBackGroundOnlyTextOn();
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
@ -701,7 +701,7 @@ void CHud::Draw()
CFont::SetCentreOff(); CFont::SetCentreOff();
CFont::SetRightJustifyOn(); CFont::SetRightJustifyOn();
CFont::SetRightJustifyWrap(0.0f); CFont::SetRightJustifyWrap(0.0f);
CFont::SetFontStyle(FONTJAP(FONT_HEADING)); CFont::SetFontStyle(FONT_LOCALE(FONT_HEADING));
CFont::SetColor(CRGBA(244, 20, 20, 255)); CFont::SetColor(CRGBA(244, 20, 20, 255));
CFont::SetWrapx(SCREEN_SCALE_X(640.0f)); CFont::SetWrapx(SCREEN_SCALE_X(640.0f));
CFont::SetPropOff(); CFont::SetPropOff();
@ -852,7 +852,7 @@ void CHud::Draw()
else else
CFont::SetPropOff(); CFont::SetPropOff();
CFont::SetFontStyle(FONTJAP(CTheScripts::IntroTextLines[i].m_nFont)); CFont::SetFontStyle(FONT_LOCALE(CTheScripts::IntroTextLines[i].m_nFont));
CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - CTheScripts::IntroTextLines[i].m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - CTheScripts::IntroTextLines[i].m_fAtY), CTheScripts::IntroTextLines[i].m_Text); CFont::PrintString(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH - CTheScripts::IntroTextLines[i].m_fAtX), SCREEN_SCALE_Y(DEFAULT_SCREEN_HEIGHT - CTheScripts::IntroTextLines[i].m_fAtY), CTheScripts::IntroTextLines[i].m_Text);
} }
} }
@ -892,7 +892,7 @@ void CHud::Draw()
CFont::SetScale(SCREEN_SCALE_X(0.48f), SCREEN_SCALE_Y(1.120f)); CFont::SetScale(SCREEN_SCALE_X(0.48f), SCREEN_SCALE_Y(1.120f));
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
float offsetX = SCREEN_SCALE_X(40.0f) + SCREEN_SCALE_X(8.0f); float offsetX = SCREEN_SCALE_X(40.0f) + SCREEN_SCALE_X(8.0f);
float center = SCREEN_SCALE_FROM_RIGHT(50.0f) - SCREEN_SCALE_X(8.0f) - offsetX; float center = SCREEN_SCALE_FROM_RIGHT(50.0f) - SCREEN_SCALE_X(8.0f) - offsetX;
@ -1080,18 +1080,22 @@ void CHud::DrawAfterFade()
if (CGame::germanGame) if (CGame::germanGame)
CFont::SetScale(SCREEN_SCALE_X(0.52f * 0.85f), SCREEN_SCALE_Y(1.1f * 0.85f)); CFont::SetScale(SCREEN_SCALE_X(0.52f * 0.85f), SCREEN_SCALE_Y(1.1f * 0.85f));
else if (CFont::LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
else if (CFont::IsJapanese())
CFont::SetScale(SCREEN_SCALE_X(0.52f) * 1.35f, SCREEN_SCALE_Y(1.1f) * 1.25f); CFont::SetScale(SCREEN_SCALE_X(0.52f) * 1.35f, SCREEN_SCALE_Y(1.1f) * 1.25f);
#endif
else else
CFont::SetScale(SCREEN_SCALE_X(0.52f), SCREEN_SCALE_Y(1.1f)); CFont::SetScale(SCREEN_SCALE_X(0.52f), SCREEN_SCALE_Y(1.1f));
CFont::SetColor(CRGBA(175, 175, 175, 255)); CFont::SetColor(CRGBA(175, 175, 175, 255));
CFont::SetJustifyOff(); CFont::SetJustifyOff();
if (CFont::LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
if (CFont::IsJapanese())
CFont::SetWrapx(SCREEN_SCALE_X(229.0f + 26.0f - 4.0f)); CFont::SetWrapx(SCREEN_SCALE_X(229.0f + 26.0f - 4.0f));
else else
#endif
CFont::SetWrapx(SCREEN_SCALE_X(200.0f + 26.0f - 4.0f)); CFont::SetWrapx(SCREEN_SCALE_X(200.0f + 26.0f - 4.0f));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetBackgroundOn(); CFont::SetBackgroundOn();
CFont::SetBackGroundOnlyTextOff(); CFont::SetBackGroundOnlyTextOff();
CFont::SetBackgroundColor(CRGBA(0, 0, 0, fAlpha * 0.9f)); CFont::SetBackgroundColor(CRGBA(0, 0, 0, fAlpha * 0.9f));
@ -1169,7 +1173,7 @@ void CHud::DrawAfterFade()
CFont::SetCentreOn(); CFont::SetCentreOn();
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetCentreSize(SCREEN_SCALE_X(600.0f)); CFont::SetCentreSize(SCREEN_SCALE_X(600.0f));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::PrintString((SCREEN_WIDTH / 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[3]); CFont::PrintString((SCREEN_WIDTH / 2) + SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[3]);
@ -1186,7 +1190,7 @@ void CHud::DrawAfterFade()
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetCentreSize(SCREEN_SCALE_X(620.0f)); CFont::SetCentreSize(SCREEN_SCALE_X(620.0f));
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
CFont::PrintString((SCREEN_WIDTH / 2) - SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) - SCREEN_SCALE_Y(2.0f), m_BigMessage[4]); CFont::PrintString((SCREEN_WIDTH / 2) - SCREEN_SCALE_X(2.0f), (SCREEN_HEIGHT / 2) - SCREEN_SCALE_Y(84.0f) - SCREEN_SCALE_Y(2.0f), m_BigMessage[4]);
@ -1243,7 +1247,7 @@ void CHud::DrawAfterFade()
CFont::SetPropOn(); CFont::SetPropOn();
CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(20.0f)); CFont::SetCentreSize(SCREEN_SCALE_FROM_RIGHT(20.0f));
CFont::SetColor(CRGBA(0, 0, 0, 255)); CFont::SetColor(CRGBA(0, 0, 0, 255));
CFont::SetFontStyle(FONTJAP(FONT_BANK)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK));
#ifdef BETA_SLIDING_TEXT #ifdef BETA_SLIDING_TEXT
CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f) - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]); CFont::PrintString(SCREEN_WIDTH / 2 + SCREEN_SCALE_X(2.0f) - SCREEN_SCALE_X(OddJob2XOffset), SCREEN_HEIGHT / 2 - SCREEN_SCALE_Y(20.0f) + SCREEN_SCALE_Y(2.0f), m_BigMessage[5]);

8
src/save/PCSave.cpp
View file

@ -3,6 +3,9 @@
#include "crossplatform.h" #include "crossplatform.h"
#include "FileMgr.h" #include "FileMgr.h"
#ifdef MORE_LANGUAGES
#include "Game.h"
#endif
#include "GenericGameStorage.h" #include "GenericGameStorage.h"
#include "Messages.h" #include "Messages.h"
#include "PCSave.h" #include "PCSave.h"
@ -131,6 +134,11 @@ C_PcSave::PopulateSlotInfo()
default: assert(0); default: assert(0);
} }
char date[70]; char date[70];
#ifdef MORE_LANGUAGES
if (CGame::japaneseGame)
sprintf(date, "%02d %02d %04d %02d:%02d:%02d", st.wDay, st.wMonth, st.wYear, st.wHour, st.wMinute, st.wSecond);
else
#endif // MORE_LANGUAGES
sprintf(date, "%02d %s %04d %02d:%02d:%02d", st.wDay, UnicodeToAsciiForSaveLoad(TheText.Get(month)), st.wYear, st.wHour, st.wMinute, st.wSecond); sprintf(date, "%02d %s %04d %02d:%02d:%02d", st.wDay, UnicodeToAsciiForSaveLoad(TheText.Get(month)), st.wYear, st.wHour, st.wMinute, st.wSecond);
AsciiToUnicode(date, SlotSaveDate[i]); AsciiToUnicode(date, SlotSaveDate[i]);

37
src/text/Messages.cpp
View file

@ -52,10 +52,12 @@ CMessages::WideStringCopy(wchar *dst, wchar *src, uint16 size)
dst[i] = '\0'; dst[i] = '\0';
} }
wchar jappy(wchar c) wchar FixupChar(wchar c)
{ {
if (CFont::LanguageSet == FONT_LANGSET_JAPANESE) #ifdef MORE_LANGUAGES
if (CFont::IsJapanese())
return c & 0x7fff; return c & 0x7fff;
#endif
return c; return c;
} }
@ -68,10 +70,10 @@ CMessages::WideStringCompare(wchar *str1, wchar *str2, uint16 size)
return false; return false;
for (int32 i = 0; i < size; i++) { for (int32 i = 0; i < size; i++) {
if (!jappy(str1[i])) if (FixupChar(str1[i]) == '\0')
break; break;
if (jappy(str1[i]) != jappy(str2[i])) if (FixupChar(str1[i]) != FixupChar(str2[i]))
return false; return false;
} }
return true; return true;
@ -377,10 +379,12 @@ CMessages::InsertNumberInString(wchar *str, int32 n1, int32 n2, int32 n3, int32
int32 i = 0; int32 i = 0;
for (int32 c = 0; c < size;) { for (int32 c = 0; c < size;) {
if ((CFont::LanguageSet == FONT_LANGSET_JAPANESE && str[c] == (0x8000 | '~') && str[c + 1] == (0x8000 | '1') && str[c + 2] == (0x8000 | '~')) || #ifdef MORE_LANGUAGES
(CFont::LanguageSet != FONT_LANGSET_JAPANESE && str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~')) if ((CFont::IsJapanese() && str[c] == (0x8000 | '~') && str[c + 1] == (0x8000 | '1') && str[c + 2] == (0x8000 | '~')) ||
{ (!CFont::IsJapanese() && str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~')) {
//if (str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~') { #else
if (str[c] == '~' && str[c + 1] == '1' && str[c + 2] == '~') {
#endif
switch (i) { switch (i) {
case 0: sprintf(numStr, "%d", n1); break; case 0: sprintf(numStr, "%d", n1); break;
case 1: sprintf(numStr, "%d", n2); break; case 1: sprintf(numStr, "%d", n2); break;
@ -418,10 +422,13 @@ CMessages::InsertStringInString(wchar *str1, wchar *str2)
wchar *_str1 = str1; wchar *_str1 = str1;
uint16 i; uint16 i;
for (i = 0; i < total_size; ) { for (i = 0; i < total_size; ) {
if ((CFont::LanguageSet == FONT_LANGSET_JAPANESE && *_str1 == (0x8000 | '~') && *(_str1 + 1) == (0x8000 | 'a') && *(_str1 + 2) == (0x8000 | '~')) #ifdef MORE_LANGUAGES
|| (CFont::LanguageSet != FONT_LANGSET_JAPANESE && *_str1 == '~' && *(_str1 + 1) == 'a' && *(_str1 + 2) == '~')) if ((CFont::IsJapanese() && *_str1 == (0x8000 | '~') && *(_str1 + 1) == (0x8000 | 'a') && *(_str1 + 2) == (0x8000 | '~'))
|| (CFont::IsJapanese() && *_str1 == '~' && *(_str1 + 1) == 'a' && *(_str1 + 2) == '~'))
{ {
//if (*_str1 == '~' && *(_str1 + 1) == 'a' && *(_str1 + 2) == '~') { #else
if (*_str1 == '~' && *(_str1 + 1) == 'a' && *(_str1 + 2) == '~') {
#endif
_str1 += 3; _str1 += 3;
for (int j = 0; j < str2_size; j++) { for (int j = 0; j < str2_size; j++) {
tempstr[i++] = str2[j]; tempstr[i++] = str2[j];
@ -452,8 +459,12 @@ CMessages::InsertPlayerControlKeysInString(wchar *str)
wchar *_outstr = outstr; wchar *_outstr = outstr;
for (i = 0; i < strSize;) { for (i = 0; i < strSize;) {
if ((CFont::LanguageSet == FONT_LANGSET_JAPANESE && str[i] == (0x8000 | '~') && str[i + 1] == (0x8000 | 'k') && str[i + 2] == (0x8000 | '~')) || #ifdef MORE_LANGUAGES
(CFont::LanguageSet != FONT_LANGSET_JAPANESE && str[i] == '~' && str[i + 1] == 'k' && str[i + 2] == '~')) { if ((CFont::IsJapanese() && str[i] == (0x8000 | '~') && str[i + 1] == (0x8000 | 'k') && str[i + 2] == (0x8000 | '~')) ||
(!CFont::IsJapanese() && str[i] == '~' && str[i + 1] == 'k' && str[i + 2] == '~')) {
#else
if (str[i] == '~' && str[i + 1] == 'k' && str[i + 2] == '~') {
#endif
i += 4; i += 4;
for (int32 cont = 0; cont < MAX_CONTROLLERACTIONS; cont++) { for (int32 cont = 0; cont < MAX_CONTROLLERACTIONS; cont++) {
uint16 contSize = GetWideStringLength(ControlsManager.m_aActionNames[cont]); uint16 contSize = GetWideStringLength(ControlsManager.m_aActionNames[cont]);

16
src/text/Text.cpp
View file

@ -1,6 +1,9 @@
#include "common.h" #include "common.h"
#include "FileMgr.h" #include "FileMgr.h"
#ifdef MORE_LANGUAGES
#include "Game.h"
#endif
#include "Frontend.h" #include "Frontend.h"
#include "Messages.h" #include "Messages.h"
#include "Text.h" #include "Text.h"
@ -260,18 +263,20 @@ CData::Unload(void)
void void
AsciiToUnicode(const char *src, wchar *dst) AsciiToUnicode(const char *src, wchar *dst)
{ {
while((*dst++ = *src++) != '\0'); while((*dst++ = (unsigned char)*src++) != '\0');
} }
#include "Game.h"
char* char*
UnicodeToAscii(wchar *src) UnicodeToAscii(wchar *src)
{ {
static char aStr[256]; static char aStr[256];
int len; int len;
for(len = 0; *src != '\0' && len < 256-1; len++, src++) for(len = 0; *src != '\0' && len < 256-1; len++, src++)
if(*src < 128 || (CGame::russianGame && *src < 256)) #ifdef MORE_LANGUAGES
if(*src < 128 || ((CGame::russianGame || CGame::japaneseGame) && *src < 256))
#else
if(*src < 128)
#endif
aStr[len] = *src; aStr[len] = *src;
else else
aStr[len] = '#'; aStr[len] = '#';
@ -312,6 +317,3 @@ TextCopy(wchar *dst, const wchar *src)
{ {
while((*dst++ = *src++) != '\0'); while((*dst++ = *src++) != '\0');
} }
InjectHook(0x52C2F0, &UnicodeToAscii, PATCH_JUMP);