From 0b77babfaba57674b3ddfe44d86153246ecdab36 Mon Sep 17 00:00:00 2001
From: ThirteenAG <thirteenag@gmail.com>
Date: Mon, 5 Dec 2022 00:08:50 +0300
Subject: [PATCH] merged triggers api

---
 Core/HLE/sceIo.cpp | 17 +++++++----------
 UI/NativeApp.cpp   |  2 --
 2 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/Core/HLE/sceIo.cpp b/Core/HLE/sceIo.cpp
index 6a756155b6..0e9843bdf4 100644
--- a/Core/HLE/sceIo.cpp
+++ b/Core/HLE/sceIo.cpp
@@ -1995,8 +1995,7 @@ static u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 o
 			EMULATOR_DEVCTL__TOGGLE_FASTFORWARD = 0x30,
 			EMULATOR_DEVCTL__GET_ASPECT_RATIO,
 			EMULATOR_DEVCTL__GET_SCALE,
-			EMULATOR_DEVCTL__GET_LTRIGGER,
-			EMULATOR_DEVCTL__GET_RTRIGGER,
+			EMULATOR_DEVCTL__GET_LTRT,
 			EMULATOR_DEVCTL__GET_VKEY,
 			EMULATOR_DEVCTL__GET_MOUSE
 		};
@@ -2067,16 +2066,12 @@ static u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 o
 				Memory::Write_Float(scale, outPtr);
 			}
 			return 0;
-		case EMULATOR_DEVCTL__GET_LTRIGGER:
+		case EMULATOR_DEVCTL__GET_LTRT:
 			if (Memory::IsValidAddress(outPtr)) {
 				extern float PluginDataLT;
-				Memory::Write_Float(PluginDataLT, outPtr);
-			}
-			return 0;
-		case EMULATOR_DEVCTL__GET_RTRIGGER:
-			if (Memory::IsValidAddress(outPtr)) {
 				extern float PluginDataRT;
-				Memory::Write_Float(PluginDataRT, outPtr);
+				Memory::Write_Float(PluginDataLT, outPtr);
+				Memory::Write_Float(PluginDataRT, outPtr + sizeof(float));
 			}
 			return 0;
 		case EMULATOR_DEVCTL__GET_VKEY:
@@ -2086,12 +2081,14 @@ static u32 sceIoDevctl(const char *name, int cmd, u32 argAddr, int argLen, u32 o
 			}
 			return 0;
 		case EMULATOR_DEVCTL__GET_MOUSE:
+#if PPSSPP_PLATFORM(WINDOWS)
 			if (Memory::IsValidAddress(outPtr)) {
 				extern float g_mouseDeltaX;
 				extern float g_mouseDeltaY;
 				Memory::Write_Float(g_mouseDeltaX, outPtr);
-				Memory::Write_Float(g_mouseDeltaY, outPtr + 4);
+				Memory::Write_Float(g_mouseDeltaY, outPtr + sizeof(float));
 			}
+#endif
 			return 0;
 		}
 
diff --git a/UI/NativeApp.cpp b/UI/NativeApp.cpp
index fb03914a17..6ec12a14f6 100644
--- a/UI/NativeApp.cpp
+++ b/UI/NativeApp.cpp
@@ -143,8 +143,6 @@
 
 float PluginDataLT;
 float PluginDataRT;
-float PluginDataMouseX;
-float PluginDataMouseY;
 std::map<int, uint8_t> PluginDataKeys;
 
 ScreenManager *screenManager;