diff options
author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-03 01:43:12 +0300 |
---|---|---|
committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-03 01:43:12 +0300 |
commit | 926e216dd46bebc104756274a351db215f7d32b2 (patch) | |
tree | 464d541362c3483072c481233ef4b2cc331cf133 /src/control/Script.cpp | |
parent | fa29804c49faf9135b8c1929cc49e201024521c6 (diff) | |
parent | ff4af35292e82e03c7160a3c85e2296655057deb (diff) |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/control/Script.cpp')
-rw-r--r-- | src/control/Script.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/control/Script.cpp b/src/control/Script.cpp index 433e0449..02447764 100644 --- a/src/control/Script.cpp +++ b/src/control/Script.cpp @@ -5258,7 +5258,11 @@ int8 CRunningScript::ProcessCommands600To699(int32 command) return 0; } case COMMAND_GET_CONTROLLER_MODE: +#if defined(GTA_PC) && !defined(DETECT_PAD_INPUT_SWITCH) ScriptParams[0] = 0; +#else + ScriptParams[0] = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0; +#endif StoreParameters(&m_nIp, 1); return 0; case COMMAND_SET_CAN_RESPRAY_CAR: |