summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.cpp
diff options
context:
space:
mode:
authorwithmorten <morten.with@gmail.com>2021-02-18 02:32:49 +0100
committerwithmorten <morten.with@gmail.com>2021-02-18 02:38:12 +0100
commit037c33215801fdf10019d8e61c7de9a532256f92 (patch)
tree20e5e2c2e00012366b29e5bbd2dcd406e0769698 /src/core/Frontend.cpp
parentupdate librw; gl cleanup (diff)
parentupdate librw; gl cleanup (diff)
downloadre3-037c33215801fdf10019d8e61c7de9a532256f92.tar
re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.gz
re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.bz2
re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.lz
re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.xz
re3-037c33215801fdf10019d8e61c7de9a532256f92.tar.zst
re3-037c33215801fdf10019d8e61c7de9a532256f92.zip
Diffstat (limited to 'src/core/Frontend.cpp')
-rw-r--r--src/core/Frontend.cpp8
1 files changed, 8 insertions, 0 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index b4551ffc..e6419069 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -1881,8 +1881,13 @@ CMenuManager::DrawControllerBound(int32 yStart, int32 xStart, int32 unused, int8
}
// Print bindings, including seperator (-) between them
+
CFont::SetScale(MENU_X(0.25f), MENU_Y(LISTITEM_Y_SCALE));
+#ifdef FIX_BUGS
+ for (; contSetOrder < MAX_SETORDERS && controllerAction >= 0; contSetOrder++) {
+#else
for (; contSetOrder < MAX_SETORDERS && controllerAction != -1; contSetOrder++) {
+#endif
wchar *settingText = ControlsManager.GetControllerSettingTextWithOrderNumber((e_ControllerAction)controllerAction, (eContSetOrder)contSetOrder);
if (settingText) {
++bindingsForThisOpt;
@@ -5503,6 +5508,9 @@ CMenuManager::SwitchMenuOnAndOff()
}
Initialise();
LoadAllTextures();
+#ifdef FIX_BUGS
+ CPad::StopPadsShaking();
+#endif
} else {
#ifdef EXTENDED_COLOURFILTER
// we always expect CPostFX to be open