summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFire-Head <Fire-Head@users.noreply.github.com>2020-12-29 20:16:52 +0100
committerFire-Head <Fire-Head@users.noreply.github.com>2020-12-29 20:16:52 +0100
commit8fadca196bf0e3aefe2c6ebd1130d954ab08270b (patch)
treed01055d3117f518d697ed1d91efbded073531444
parentfix ini key (diff)
downloadre3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar.gz
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar.bz2
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar.lz
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar.xz
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.tar.zst
re3-8fadca196bf0e3aefe2c6ebd1130d954ab08270b.zip
-rw-r--r--src/core/Frontend.cpp17
-rw-r--r--src/render/Draw.h3
2 files changed, 13 insertions, 7 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index a6edd444..93322fd9 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -142,7 +142,7 @@ int8 CMenuManager::m_nDisplayMSAALevel = 0;
#endif
#ifdef ASPECT_RATIO_SCALE
-int32 CMenuManager::m_PrefsSpriteScalingMode = 0;
+int32 CMenuManager::m_PrefsSpriteScalingMode = SCL_AUTO;
#endif
#ifdef NO_ISLAND_LOADING
@@ -1463,27 +1463,34 @@ CMenuManager::Draw()
#else
switch (m_PrefsUseWideScreen) {
case AR_AUTO:
- sprintf(asciiTemp, "AUTO");
+ rightText = TheText.Get("FEM_AUT");
break;
case AR_4_3:
sprintf(asciiTemp, "4:3");
+ AsciiToUnicode(asciiTemp, unicodeTemp);
+ rightText = unicodeTemp;
break;
case AR_5_4:
sprintf(asciiTemp, "5:4");
+ AsciiToUnicode(asciiTemp, unicodeTemp);
+ rightText = unicodeTemp;
break;
case AR_16_10:
sprintf(asciiTemp, "16:10");
+ AsciiToUnicode(asciiTemp, unicodeTemp);
+ rightText = unicodeTemp;
break;
case AR_16_9:
sprintf(asciiTemp, "16:9");
+ AsciiToUnicode(asciiTemp, unicodeTemp);
+ rightText = unicodeTemp;
break;
case AR_21_9:
sprintf(asciiTemp, "21:9");
+ AsciiToUnicode(asciiTemp, unicodeTemp);
+ rightText = unicodeTemp;
break;
}
-
- AsciiToUnicode(asciiTemp, unicodeTemp);
- rightText = unicodeTemp;
#endif
break;
case MENUACTION_RADIO:
diff --git a/src/render/Draw.h b/src/render/Draw.h
index 9b98ca17..bacbe18f 100644
--- a/src/render/Draw.h
+++ b/src/render/Draw.h
@@ -4,13 +4,12 @@ enum eAspectRatio
{
// Make sure these work the same as FrontEndMenuManager.m_PrefsUseWideScreen
// without widescreen support
+ AR_AUTO,
AR_4_3,
AR_5_4,
AR_16_10,
AR_16_9,
AR_21_9,
-
- AR_AUTO,
AR_MAX,
};