summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2021-01-04 23:29:23 +0100
committeraap <aap@papnet.eu>2021-01-04 23:29:23 +0100
commit33fd33b03a12242509b78ef176e239fe581eb6f5 (patch)
tree1d86c9acd260f1a375493a01fad479df264fe946
parentpop boot fix (diff)
downloadre3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar.gz
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar.bz2
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar.lz
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar.xz
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.tar.zst
re3-33fd33b03a12242509b78ef176e239fe581eb6f5.zip
Diffstat (limited to '')
-rw-r--r--src/core/Frontend.cpp4
-rw-r--r--src/core/MenuScreens.cpp4
-rw-r--r--src/core/MenuScreensCustom.cpp4
3 files changed, 10 insertions, 2 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 1b2dba5a..e5e42b8c 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -4789,7 +4789,11 @@ CMenuManager::ProcessUserInput(uint8 goDown, uint8 goUp, uint8 optionSelected, u
TheCamera.m_fMouseAccelHorzntl = 0.0025f;
CVehicle::m_bDisableMouseSteering = true;
m_ControlMethod = CONTROL_STANDARD;
+#ifdef PC_PLAYER_CONTROLS
TheCamera.m_bUseMouse3rdPerson = true;
+#else
+ TheCamera.m_bUseMouse3rdPerson = false;
+#endif
SaveSettings();
}
SetHelperText(2);
diff --git a/src/core/MenuScreens.cpp b/src/core/MenuScreens.cpp
index 173de805..72e19c49 100644
--- a/src/core/MenuScreens.cpp
+++ b/src/core/MenuScreens.cpp
@@ -217,8 +217,10 @@ CMenuScreen aScreens[] = {
{ "FET_CTL", MENUPAGE_OPTIONS, 0,
#ifdef PC_PLAYER_CONTROLS
MENUACTION_CTRLMETHOD, "FET_STI", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 320, 150, MENUALIGN_CENTER,
-#endif
MENUACTION_KEYBOARDCTRLS,"FEC_RED", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS, 0, 0, MENUALIGN_CENTER,
+#else
+ MENUACTION_KEYBOARDCTRLS,"FEC_RED", SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS, 320, 150, MENUALIGN_CENTER,
+#endif
MENUACTION_CHANGEMENU, "FEC_MOU", SAVESLOT_NONE, MENUPAGE_MOUSE_CONTROLS, 0, 0, MENUALIGN_CENTER,
MENUACTION_RESTOREDEF, "FET_DEF", SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC, 0, 0, MENUALIGN_CENTER,
MENUACTION_GOBACK, "FEDS_TB", SAVESLOT_NONE, 0, 0, 0, MENUALIGN_CENTER,
diff --git a/src/core/MenuScreensCustom.cpp b/src/core/MenuScreensCustom.cpp
index 4d3d0f93..70c92ce8 100644
--- a/src/core/MenuScreensCustom.cpp
+++ b/src/core/MenuScreensCustom.cpp
@@ -548,8 +548,10 @@ CMenuScreenCustom aScreens[] = {
{ "FET_CTL", MENUPAGE_OPTIONS, new CCustomScreenLayout({0, 0, MENU_DEFAULT_LINE_HEIGHT, false, false, 150}), nil,
#ifdef PC_PLAYER_CONTROLS
MENUACTION_CTRLMETHOD, "FET_STI", {nil, SAVESLOT_NONE, MENUPAGE_CONTROLLER_PC}, 320, 150, MENUALIGN_CENTER,
-#endif
MENUACTION_KEYBOARDCTRLS,"FEC_RED", {nil, SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS}, 0, 0, MENUALIGN_CENTER,
+#else
+ MENUACTION_KEYBOARDCTRLS,"FEC_RED", {nil, SAVESLOT_NONE, MENUPAGE_KEYBOARD_CONTROLS}, 320, 150, MENUALIGN_CENTER,
+#endif
#ifdef DONT_TRUST_RECOGNIZED_JOYSTICKS
MENUACTION_CHANGEMENU, "FEC_JOD", {nil, SAVESLOT_NONE, MENUPAGE_DETECT_JOYSTICK}, 0, 0, MENUALIGN_CENTER,
#endif