diff options
| author | erorcun <erayorcunus@gmail.com> | 2020-05-11 23:33:13 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-05-11 23:33:13 +0200 |
| commit | 5f40f06bf024e3806e0fe5a92ca14ee6b22a9933 (patch) | |
| tree | 3008c5a5977736453221f00daa1f34f9d292906b /src/core/ControllerConfig.cpp | |
| parent | RenderPedCB from VC (diff) | |
| parent | Fix appveyor (hopefully) (diff) | |
| download | re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.gz re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.bz2 re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.lz re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.xz re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.tar.zst re3-5f40f06bf024e3806e0fe5a92ca14ee6b22a9933.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/core/ControllerConfig.cpp | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/src/core/ControllerConfig.cpp b/src/core/ControllerConfig.cpp index cba8186f..dcd9f125 100644 --- a/src/core/ControllerConfig.cpp +++ b/src/core/ControllerConfig.cpp @@ -4,7 +4,8 @@ #endif #include "common.h" -#include "crossplatform.h" +#include "platform.h" +#include "crossplatform.h" // for Windows version #include "ControllerConfig.h" #include "Pad.h" #include "FileMgr.h" @@ -163,14 +164,14 @@ void CControllerConfigManager::InitDefaultControlConfiguration() SetControllerKeyAssociatedWithAction (VEHICLE_LOOKRIGHT, rsPADDOWN, KEYBOARD); SetControllerKeyAssociatedWithAction (VEHICLE_LOOKRIGHT, 'E', OPTIONAL_EXTRA); - - if ( _dwOperatingSystemVersion != OS_WIN98 ) - { + + if ( _dwOperatingSystemVersion == OS_WIN98 ) + SetControllerKeyAssociatedWithAction(VEHICLE_HORN, rsSHIFT, OPTIONAL_EXTRA); // BUG: must be KEYBOARD ? + else + { SetControllerKeyAssociatedWithAction(VEHICLE_HORN, rsLSHIFT, OPTIONAL_EXTRA); SetControllerKeyAssociatedWithAction(VEHICLE_HORN, rsRSHIFT, KEYBOARD); - } - else - SetControllerKeyAssociatedWithAction(VEHICLE_HORN, rsSHIFT, OPTIONAL_EXTRA); // BUG: must be KEYBOARD ? + } SetControllerKeyAssociatedWithAction (VEHICLE_HANDBRAKE, rsRCTRL, KEYBOARD); SetControllerKeyAssociatedWithAction (VEHICLE_HANDBRAKE, ' ', OPTIONAL_EXTRA); @@ -216,19 +217,19 @@ void CControllerConfigManager::InitDefaultControlConfiguration() SetControllerKeyAssociatedWithAction (PED_JUMPING, rsRCTRL, KEYBOARD); SetControllerKeyAssociatedWithAction (PED_JUMPING, ' ', OPTIONAL_EXTRA); - - if ( _dwOperatingSystemVersion != OS_WIN98 ) - { + + if ( _dwOperatingSystemVersion == OS_WIN98 ) + SetControllerKeyAssociatedWithAction(PED_SPRINT, rsSHIFT, OPTIONAL_EXTRA); // BUG: must be KEYBOARD ? + else + { SetControllerKeyAssociatedWithAction(PED_SPRINT, rsLSHIFT, OPTIONAL_EXTRA); #ifndef FIX_BUGS SetControllerKeyAssociatedWithAction(PED_SPRINT, rsRSHIFT, OPTIONAL_EXTRA); // BUG: must be KEYBOARD #else SetControllerKeyAssociatedWithAction(PED_SPRINT, rsRSHIFT, KEYBOARD); #endif - } - else - SetControllerKeyAssociatedWithAction(PED_SPRINT, rsSHIFT, OPTIONAL_EXTRA); // BUG: must be KEYBOARD ? - + } + SetControllerKeyAssociatedWithAction (PED_CYCLE_TARGET_LEFT, '[', KEYBOARD); SetControllerKeyAssociatedWithAction (PED_CYCLE_TARGET_RIGHT, ']', OPTIONAL_EXTRA); // BUG: must be KEYBOARD ? |