From 4703ec5164acd169f4ce315a0f035bc6ab554f0b Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Sun, 17 Jan 2021 16:03:37 +0300 Subject: sync --- src/core/Pad.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'src/core/Pad.h') diff --git a/src/core/Pad.h b/src/core/Pad.h index 3a4f54b3..a3634134 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -277,6 +277,16 @@ public: uint32 InputHowLongAgo(void); void SetDrunkInputDelay(int32 delay) { DrunkDrivingBufferUsed = delay; } + // TODO(LCS): properly, this is just to get some estimation for script + int16 GetOddJobTrigger() { return GetRightShockJustDown(); } + int16 GuiLeft() { return GetAnaloguePadLeft() || GetDPadLeftJustDown(); } + int16 GuiRight() { return GetAnaloguePadRight() || GetDPadRightJustDown(); } + int16 GuiUp() { return GetAnaloguePadUp() || GetDPadUpJustDown(); } + int16 GuiDown() { return GetAnaloguePadDown() || GetDPadDownJustDown(); } + int16 GuiSelect() { return GetSelect(); } + int16 GuiBack() { return GetStart(); } + int16 GetSkipCutscene() { return GetCrossJustDown(); } + #ifdef XINPUT void AffectFromXinput(uint32 pad); #endif -- cgit v1.2.3 From 4f36a1fb770653f26dd4fb3f89a6596015fbb4af Mon Sep 17 00:00:00 2001 From: Nikolay Korolev Date: Mon, 18 Jan 2021 22:20:44 +0300 Subject: sync --- src/core/Pad.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/Pad.h') diff --git a/src/core/Pad.h b/src/core/Pad.h index a3634134..d913c16f 100644 --- a/src/core/Pad.h +++ b/src/core/Pad.h @@ -283,8 +283,8 @@ public: int16 GuiRight() { return GetAnaloguePadRight() || GetDPadRightJustDown(); } int16 GuiUp() { return GetAnaloguePadUp() || GetDPadUpJustDown(); } int16 GuiDown() { return GetAnaloguePadDown() || GetDPadDownJustDown(); } - int16 GuiSelect() { return GetSelect(); } - int16 GuiBack() { return GetStart(); } + int16 GuiSelect() { return GetCrossJustDown(); } + int16 GuiBack() { return GetTriangleJustDown(); } int16 GetSkipCutscene() { return GetCrossJustDown(); } #ifdef XINPUT -- cgit v1.2.3