Merge branch 'master' into master

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]