summaryrefslogtreecommitdiffstats
path: root/src/control
diff options
context:
space:
mode:
authorSergeanur <s.anureev@yandex.ua>2020-05-02 18:00:47 +0200
committerSergeanur <s.anureev@yandex.ua>2020-05-02 18:39:36 +0200
commitba8aa3865488afceee36acaeceb54541feb0bd97 (patch)
tree160eda54707d23c3a2ed677313cf306b5991d3dc /src/control
parentDisable PED_SKIN for now (diff)
downloadre3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar.gz
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar.bz2
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar.lz
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar.xz
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.tar.zst
re3-ba8aa3865488afceee36acaeceb54541feb0bd97.zip
Diffstat (limited to 'src/control')
-rw-r--r--src/control/Garages.cpp9
1 files changed, 7 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: