summaryrefslogtreecommitdiffstats
path: root/src/core/Frontend.cpp
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-04-05 14:30:28 +0200
committerGitHub <noreply@github.com>2020-04-05 14:30:28 +0200
commit5e9ae94298c111c85a3ace292909c544b415f394 (patch)
treef3557226f72c8bcc0208b8e35232fff393aec5c1 /src/core/Frontend.cpp
parentMerge pull request #380 from Nick007J/master (diff)
parentCCamera fixes (diff)
downloadre3-5e9ae94298c111c85a3ace292909c544b415f394.tar
re3-5e9ae94298c111c85a3ace292909c544b415f394.tar.gz
re3-5e9ae94298c111c85a3ace292909c544b415f394.tar.bz2
re3-5e9ae94298c111c85a3ace292909c544b415f394.tar.lz
re3-5e9ae94298c111c85a3ace292909c544b415f394.tar.xz
re3-5e9ae94298c111c85a3ace292909c544b415f394.tar.zst
re3-5e9ae94298c111c85a3ace292909c544b415f394.zip
Diffstat (limited to '')
-rw-r--r--src/core/Frontend.cpp8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/core/Frontend.cpp b/src/core/Frontend.cpp
index 4fefe9a9..61fe96ea 100644
--- a/src/core/Frontend.cpp
+++ b/src/core/Frontend.cpp
@@ -529,7 +529,7 @@ WRAPPER void CMenuManager::DoSettingsBeforeStartingAGame() { EAXJMP(0x48AB40); }
#else
void CMenuManager::DoSettingsBeforeStartingAGame()
{
- CCamera::m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDART;
+ CCamera::m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
if (m_PrefsVsyncDisp != m_PrefsVsync)
m_PrefsVsync = m_PrefsVsyncDisp;
@@ -2069,7 +2069,7 @@ void CMenuManager::Process(void)
}
if (m_nCurrScreen == MENUPAGE_LOADING_IN_PROGRESS) {
if (CheckSlotDataValid(m_nCurrSaveSlot)) {
- TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDART;
+ TheCamera.m_bUseMouse3rdPerson = m_ControlMethod == CONTROL_STANDARD;
if (m_PrefsVsyncDisp != m_PrefsVsync)
m_PrefsVsync = m_PrefsVsyncDisp;
DMAudio.Service();
@@ -3166,7 +3166,7 @@ CMenuManager::ProcessButtonPresses(void)
PSGLOBAL(joy1)->GetCapabilities(&devCaps);
ControlsManager.InitDefaultControlConfigJoyPad(devCaps.dwButtons);
}
- CMenuManager::m_ControlMethod = CONTROL_STANDART;
+ CMenuManager::m_ControlMethod = CONTROL_STANDARD;
MousePointerStateHelper.bInvertVertically = false;
TheCamera.m_fMouseAccelHorzntl = 0.0025f;
CVehicle::m_bDisableMouseSteering = true;
@@ -3179,7 +3179,7 @@ CMenuManager::ProcessButtonPresses(void)
#ifndef TIDY_UP_PBP
if (CMenuManager::m_ControlMethod == CONTROL_CLASSIC) {
CCamera::m_bUseMouse3rdPerson = true;
- CMenuManager::m_ControlMethod = CONTROL_STANDART;
+ CMenuManager::m_ControlMethod = CONTROL_STANDARD;
} else {
CCamera::m_bUseMouse3rdPerson = false;
CMenuManager::m_ControlMethod = CONTROL_CLASSIC;