diff options
| author | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-03 00:43:12 +0200 |
|---|---|---|
| committer | Nikolay Korolev <nickvnuk@gmail.com> | 2020-05-03 00:43:12 +0200 |
| commit | 926e216dd46bebc104756274a351db215f7d32b2 (patch) | |
| tree | 464d541362c3483072c481233ef4b2cc331cf133 /src/control | |
| parent | script compatibility (diff) | |
| parent | Fix pad Y axis (diff) | |
| download | re3-926e216dd46bebc104756274a351db215f7d32b2.tar re3-926e216dd46bebc104756274a351db215f7d32b2.tar.gz re3-926e216dd46bebc104756274a351db215f7d32b2.tar.bz2 re3-926e216dd46bebc104756274a351db215f7d32b2.tar.lz re3-926e216dd46bebc104756274a351db215f7d32b2.tar.xz re3-926e216dd46bebc104756274a351db215f7d32b2.tar.zst re3-926e216dd46bebc104756274a351db215f7d32b2.zip | |
Diffstat (limited to 'src/control')
| -rw-r--r-- | src/control/Garages.cpp | 9 | ||||
| -rw-r--r-- | src/control/Script.cpp | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/src/control/Garages.cpp b/src/control/Garages.cpp index 75d5d3ba..b6786598 100644 --- a/src/control/Garages.cpp +++ b/src/control/Garages.cpp @@ -528,9 +528,14 @@ void CGarage::Update() CGarages::GivePlayerDetonator(); CStats::KgsOfExplosivesUsed += KGS_OF_EXPLOSIVES_IN_BOMB; } +#ifdef DETECT_PAD_INPUT_SWITCH + int16 Mode = CPad::IsAffectedByController ? CPad::GetPad(0)->Mode : 0; +#else + int16 Mode = CPad::GetPad(0)->Mode; +#endif switch (m_eGarageType) { case GARAGE_BOMBSHOP1: - switch (CPad::GetPad(0)->Mode) { + switch (Mode) { case 0: case 1: case 2: @@ -542,7 +547,7 @@ void CGarage::Update() } break; case GARAGE_BOMBSHOP2: - switch (CPad::GetPad(0)->Mode) { + switch (Mode) { case 0: case 1: case 2: 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: |