summaryrefslogtreecommitdiffstats
path: root/src/core/Pad.h
diff options
context:
space:
mode:
authoraap <aap@papnet.eu>2019-07-24 23:06:58 +0200
committeraap <aap@papnet.eu>2019-07-24 23:06:58 +0200
commitecf03d0f54850005efdcea682a9728c0613325de (patch)
tree1018843e4d41101e759e5c91112d991fd8270049 /src/core/Pad.h
parentfixed buoyancy; implemented CAutomobile::ProcessBuoyancy (diff)
parentMerge branch 'master' into master (diff)
downloadre3-ecf03d0f54850005efdcea682a9728c0613325de.tar
re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.gz
re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.bz2
re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.lz
re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.xz
re3-ecf03d0f54850005efdcea682a9728c0613325de.tar.zst
re3-ecf03d0f54850005efdcea682a9728c0613325de.zip
Diffstat (limited to '')
-rw-r--r--src/core/Pad.h17
1 files changed, 16 insertions, 1 deletions
diff --git a/src/core/Pad.h b/src/core/Pad.h
index e15399dd..4f129e85 100644
--- a/src/core/Pad.h
+++ b/src/core/Pad.h
@@ -369,12 +369,27 @@ public:
bool GetRightShoulder1JustDown() { return !!(NewState.RightShoulder1 && !OldState.RightShoulder1); }
bool GetRightShoulder2JustDown() { return !!(NewState.RightShoulder2 && !OldState.RightShoulder2); }
+/*
int32 GetLeftShoulder1(void) { return NewState.LeftShoulder1; }
int32 GetLeftShoulder2(void) { return NewState.LeftShoulder2; }
int32 GetRightShoulder1(void) { return NewState.RightShoulder1; }
int32 GetRightShoulder2(void) { return NewState.RightShoulder2; }
+*/
+
+ bool GetTriangle() { return !!NewState.Triangle; }
+ bool GetCircle() { return !!NewState.Circle; }
+ bool GetCross() { return !!NewState.Cross; }
+ bool GetSquare() { return !!NewState.Square; }
+ bool GetDPadUp() { return !!NewState.DPadUp; }
+ bool GetDPadDown() { return !!NewState.DPadDown; }
+ bool GetDPadLeft() { return !!NewState.DPadLeft; }
+ bool GetDPadRight() { return !!NewState.DPadRight; }
+ bool GetLeftShoulder1(void) { return !!NewState.LeftShoulder1; }
+ bool GetLeftShoulder2(void) { return !!NewState.LeftShoulder2; }
+ bool GetRightShoulder1(void) { return !!NewState.RightShoulder1; }
+ bool GetRightShoulder2(void) { return !!NewState.RightShoulder2; }
- bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
+ bool ArePlayerControlsDisabled(void) { return DisablePlayerControls != PLAYERCONTROL_ENABLED; }
};
VALIDATE_SIZE(CPad, 0xFC);
extern CPad *Pads; //[2]