diff options
| author | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-20 03:49:55 +0100 |
|---|---|---|
| committer | erorcun <erorcunerorcun@hotmail.com.tr> | 2020-12-20 03:49:55 +0100 |
| commit | ae7cb924379b628ee6da1b6bceee8f1a85376d24 (patch) | |
| tree | 1f616c4bbaf302834e19b439152d3e3a9969f853 /src/core | |
| parent | Merge branch 'master' of https://github.com/GTAmodding/re3 (diff) | |
| download | re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar.gz re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar.bz2 re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar.lz re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar.xz re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.tar.zst re3-ae7cb924379b628ee6da1b6bceee8f1a85376d24.zip | |
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/Frontend.cpp | 1 | ||||
| -rw-r--r-- | src/core/Game.cpp | 8 | ||||
| -rw-r--r-- | src/core/main.cpp | 3 |
3 files changed, 8 insertions, 4 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp index 0f725f7d..01820730 100644 --- a/src/core/Frontend.cpp +++ b/src/core/Frontend.cpp @@ -1129,6 +1129,7 @@ CMenuManager::Draw() #endif } + // Not a bug, we just want HFoV+ on menu #ifdef ASPECT_RATIO_SCALE CFont::SetCentreSize(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)); #else diff --git a/src/core/Game.cpp b/src/core/Game.cpp index 0a6c3eec..8c14434a 100644 --- a/src/core/Game.cpp +++ b/src/core/Game.cpp @@ -134,7 +134,7 @@ void MessageScreen(char *msg) #endif CFont::SetFontStyle(FONT_BANK); CFont::SetBackgroundOff(); - CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH-190)); + CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(190)); #ifdef FIX_BUGS CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.0f)); #else @@ -901,13 +901,17 @@ void CGame::InitialiseWhenRestarting(void) CSprite2d *splash = LoadSplash(NULL); splash->Draw(rect, color, color, color, color); #ifdef FIX_BUGS - splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_WIDTH-SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192)); + splash->DrawRect(CRect(SCREEN_SCALE_X(20.0f), SCREEN_SCALE_Y(110.0f), SCREEN_SCALE_FROM_RIGHT(20.0f), SCREEN_SCALE_Y(300.0f)), CRGBA(50, 50, 50, 192)); #else splash->DrawRect(CRect(20.0f, 110.0f, SCREEN_WIDTH-20.0f, 300.0f), CRGBA(50, 50, 50, 192)); #endif CFont::SetBackgroundOff(); +#ifdef ASPECT_RATIO_SCALE + CFont::SetWrapx(SCREEN_SCALE_FROM_RIGHT(160.0f)); // because SCREEN_SCALE_FROM_RIGHT(x) != SCREEN_SCALE_X(640-x) +#else CFont::SetWrapx(SCREEN_SCALE_X(480.0f)); +#endif CFont::SetScale(SCREEN_SCALE_X(1.0f), SCREEN_SCALE_Y(1.0f)); CFont::SetCentreOn(); CFont::SetCentreSize(SCREEN_SCALE_X(480.0f)); diff --git a/src/core/main.cpp b/src/core/main.cpp index 4b5d7004..14f1a055 100644 --- a/src/core/main.cpp +++ b/src/core/main.cpp @@ -1146,7 +1146,6 @@ DisplayGameDebugText() AsciiToUnicode(str, ustr); - // Let's not scale those numbers, they look better that way :eyes: CFont::SetPropOff(); CFont::SetBackgroundOff(); #ifdef FIX_BUGS @@ -1159,7 +1158,7 @@ DisplayGameDebugText() CFont::SetJustifyOff(); CFont::SetBackGroundOnlyTextOff(); #ifdef FIX_BUGS - CFont::SetWrapx(SCREEN_SCALE_X(DEFAULT_SCREEN_WIDTH)); + CFont::SetWrapx(SCREEN_STRETCH_X(DEFAULT_SCREEN_WIDTH)); #else CFont::SetWrapx(DEFAULT_SCREEN_WIDTH); #endif |