diff options
author | Roman Masanin <36927roma@gmail.com> | 2020-11-01 21:39:21 +0100 |
---|---|---|
committer | Roman Masanin <36927roma@gmail.com> | 2020-11-01 21:39:21 +0100 |
commit | 076fc24e862873ab76269ebb3b00c3ef23e77ae3 (patch) | |
tree | 7b717c37a5929163717551d4d5bb6a67b6a16221 /src/core/Frontend.cpp | |
parent | mark original bugs (diff) | |
parent | Fix the goddamn spaces for tabs master race (diff) | |
download | re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar.gz re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar.bz2 re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar.lz re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar.xz re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.tar.zst re3-076fc24e862873ab76269ebb3b00c3ef23e77ae3.zip |
Diffstat (limited to '')
-rw-r--r-- | src/core/Frontend.cpp | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index db3774a7..dca9685e 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -783,16 +783,18 @@ CMenuManager::Draw() CFont::SetJustifyOn(); CFont::SetBackGroundOnlyTextOn(); #ifdef GTA3_1_1_PATCH +#ifdef DRAW_MENU_VERSION_TEXT CFont::SetColor(CRGBA(235, 170, 50, FadeIn(255))); CFont::SetRightJustifyOn(); CFont::SetFontStyle(FONT_HEADING); CFont::SetScale(MENU_X(0.7f), MENU_Y(0.5f)); - CFont::SetWrapx(SCREEN_WIDTH); + CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)); CFont::SetRightJustifyWrap(0.0f); strcpy(gString, "V1.1"); AsciiToUnicode(gString, gUString); CFont::PrintString(SCREEN_WIDTH / 10, SCREEN_HEIGHT / 45, gUString); #endif +#endif CFont::SetWrapx(MENU_X_RIGHT_ALIGNED(MENU_X_MARGIN)); CFont::SetRightJustifyWrap(SCREEN_SCALE_X(MENUACTION_WIDTH)); @@ -873,7 +875,7 @@ CMenuManager::Draw() #endif } - CFont::SetCentreSize(SCREEN_WIDTH); + CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)); #ifdef PS2_LIKE_MENU bool itemsAreSelectable = !bottomBarActive; @@ -3575,11 +3577,11 @@ CMenuManager::MessageScreen(const char *text) CFont::SetPropOn(); CFont::SetJustifyOn(); CFont::SetBackGroundOnlyTextOn(); - CFont::SetWrapx(SCREEN_WIDTH - StretchX(170.0f)); - CFont::SetRightJustifyWrap(SCREEN_WIDTH - StretchX(170.0f)); + CFont::SetWrapx(SCREEN_WIDTH - StretchX(170.0f)); // not used + CFont::SetRightJustifyWrap(SCREEN_WIDTH - StretchX(170.0f)); // not used CSprite2d::DrawRect(CRect(StretchX(120.0f), StretchY(150.0f), SCREEN_WIDTH - StretchX(120.0f), SCREEN_HEIGHT - StretchY(220.0f)), CRGBA(50, 50, 50, 210)); CFont::SetFontStyle(FONT_LOCALE(FONT_BANK)); - CFont::SetCentreSize(SCREEN_STRETCH_X(380.0f)); + CFont::SetCentreSize(SCREEN_SCALE_X(380.0f)); CFont::SetCentreOn(); CFont::SetColor(CRGBA(255, 217, 106, 255)); CFont::SetScale(SCREEN_SCALE_X(SMALLTEXT_X_SCALE), SCREEN_SCALE_Y(SMALLTEXT_Y_SCALE)); |