summaryrefslogtreecommitdiffstats
path: root/src/core/Pad.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2020-03-29 19:12:53 +0200
committerGitHub <noreply@github.com>2020-03-29 19:12:53 +0200
commit8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd (patch)
treee086c6d1056146aa7b986e602a6dc00bd4db3632 /src/core/Pad.h
parentMerge pull request #370 from erorcun/erorcun (diff)
parentfixed PS2 build (diff)
downloadre3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.gz
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.bz2
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.lz
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.xz
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.tar.zst
re3-8e3ee096e2ec54ea852c29f8eb44ec0eaa4588cd.zip
Diffstat (limited to 'src/core/Pad.h')
-rw-r--r--src/core/Pad.h7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h
index 6cabdf54..84919f32 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -4,7 +4,7 @@ enum {
PLAYERCONTROL_ENABLED = 0,
PLAYERCONTROL_DISABLED_1 = 1,
PLAYERCONTROL_DISABLED_2 = 2,
- PLAYERCONTROL_DISABLED_4 = 4,
+ PLAYERCONTROL_GARAGE = 4,
PLAYERCONTROL_DISABLED_8 = 8,
PLAYERCONTROL_DISABLED_10 = 16,
PLAYERCONTROL_DISABLED_20 = 32, // used on CPlayerInfo::MakePlayerSafe
@@ -433,7 +433,10 @@ public:
int16 GetRightStickX(void) { return NewState.RightStickX; }
int16 GetRightStickY(void) { return NewState.RightStickY; }
- bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+ bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+ void SetDisablePlayerControls(uint8 who) { DisablePlayerControls |= who; }
+ void SetEnablePlayerControls(uint8 who) { DisablePlayerControls &= ~who; }
+ bool IsPlayerControlsDisabledBy(uint8 who) { return DisablePlayerControls & who; }
};
VALIDATE_SIZE(CPad, 0xFC);