diff options
author | Fire_Head <Fire-Head@users.noreply.github.com> | 2020-06-29 10:23:02 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-06-29 10:23:02 +0200 |
commit | a01fe76db72a8890f56da21c9e04503f487e7654 (patch) | |
tree | bdab5315528220a05436eeb81756784ac74930b9 /src/core/Pad.h | |
parent | Merge remote-tracking branch 'upstream/master' (diff) | |
parent | Update MBlur.cpp (diff) | |
download | re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.gz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.bz2 re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.lz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.xz re3-a01fe76db72a8890f56da21c9e04503f487e7654.tar.zst re3-a01fe76db72a8890f56da21c9e04503f487e7654.zip |
Diffstat (limited to 'src/core/Pad.h')
-rw-r--r-- | src/core/Pad.h | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h index 06bce073..6f20571f 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -29,9 +29,7 @@ public: float GetRightStickX(void) { return RightStickX/32767.0f; }; float GetRightStickY(void) { return RightStickY/32767.0f; }; -#ifdef DETECT_PAD_INPUT_SWITCH bool IsAnyButtonPressed(); -#endif void Clear(void); }; VALIDATE_SIZE(CControllerState, 0x2A); @@ -199,13 +197,13 @@ public: static void UpdatePads(void); void ProcessPCSpecificStuff(void); - void Update(int16 unk); + void Update(int16 pad); static void DoCheats(void); void DoCheats(int16 unk); static void StopPadsShaking(void); - void StopShaking(int16 unk); + void StopShaking(int16 pad); static CPad *GetPad(int32 pad); @@ -454,6 +452,11 @@ public: void SetDisablePlayerControls(uint8 who) { DisablePlayerControls |= who; } void SetEnablePlayerControls(uint8 who) { DisablePlayerControls &= ~who; } bool IsPlayerControlsDisabledBy(uint8 who) { return DisablePlayerControls & who; } + + int16 GetMode() { return Mode; } + void SetMode(int16 mode) { Mode = mode; } + + static bool IsNoOrObsolete() { return bDisplayNoControllerMessage || bObsoleteControllerMessage; } }; VALIDATE_SIZE(CPad, 0xFC); |