Fix issues with gamepad timestamps (WINDOWS ONLY)

FunkinCrew · Jan 10, 2024 · 17086ec · 17086ec
1 parent 737b86f
commit 17086ec
Show file tree

Hide file tree

Showing 7 changed files with 8 additions and 8 deletions.
diff --git a/ndll/Windows/lime-debug.ndll b/ndll/Windows/lime-debug.ndll
diff --git a/ndll/Windows/lime.ndll b/ndll/Windows/lime.ndll
diff --git a/ndll/Windows/lime.ndll.hash b/ndll/Windows/lime.ndll.hash
@@ -1 +1 @@
-dceb90ca49181d24f28d7e90cdd45b53
+8b6727c0ea9f63970c34a22225811451
diff --git a/ndll/Windows64/lime-debug.ndll b/ndll/Windows64/lime-debug.ndll
diff --git a/ndll/Windows64/lime.ndll b/ndll/Windows64/lime.ndll
diff --git a/ndll/Windows64/lime.ndll.hash b/ndll/Windows64/lime.ndll.hash
@@ -1 +1 @@
-c6f83aa48f7c1e0f3a9e7b140c9a0baf
+57d22dc0628463cad9056145c99249ec
diff --git a/project/src/backend/sdl/SDLApplication.cpp b/project/src/backend/sdl/SDLApplication.cpp
@@ -401,7 +401,7 @@ namespace lime {
 
 					gamepadsAxisMap[event->caxis.which][event->caxis.axis] = event->caxis.value;
 					gamepadEvent.axisValue = event->caxis.value / (event->caxis.value > 0 ? 32767.0 : 32768.0);
-					gamepadEvent.timestamp = event->caxis.timestamp;
+					gamepadEvent.timestamp = event->common.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					break;
@@ -411,7 +411,7 @@ namespace lime {
 					gamepadEvent.type = GAMEPAD_BUTTON_DOWN;
 					gamepadEvent.button = event->cbutton.button;
 					gamepadEvent.id = event->cbutton.which;
-					gamepadEvent.timestamp = event->cbutton.timestamp;
+					gamepadEvent.timestamp = event->common.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					break;
@@ -421,7 +421,7 @@ namespace lime {
 					gamepadEvent.type = GAMEPAD_BUTTON_UP;
 					gamepadEvent.button = event->cbutton.button;
 					gamepadEvent.id = event->cbutton.which;
-					gamepadEvent.timestamp = event->cbutton.timestamp;
+					gamepadEvent.timestamp = event->common.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					break;
@@ -432,7 +432,7 @@ namespace lime {
 
 						gamepadEvent.type = GAMEPAD_CONNECT;
 						gamepadEvent.id = SDLGamepad::GetInstanceID (event->cdevice.which);
-						gamepadEvent.timestamp = event->cdevice.timestamp;
+						gamepadEvent.timestamp = event->common.timestamp;
 
 						GamepadEvent::Dispatch (&gamepadEvent);
 
@@ -444,7 +444,7 @@ namespace lime {
 
 					gamepadEvent.type = GAMEPAD_DISCONNECT;
 					gamepadEvent.id = event->cdevice.which;
-					gamepadEvent.timestamp = event->cdevice.timestamp;
+					gamepadEvent.timestamp = event->common.timestamp;
 
 					GamepadEvent::Dispatch (&gamepadEvent);
 					SDLGamepad::Disconnect (event->cdevice.which);
@@ -580,7 +580,7 @@ namespace lime {
 			keyEvent.keyCode = event->key.keysym.sym;
 			keyEvent.modifier = event->key.keysym.mod;
 			keyEvent.windowID = event->key.windowID;
-			keyEvent.timestamp = event->key.timestamp;
+			keyEvent.timestamp = event->common.timestamp;
 
 			if (keyEvent.type == KEY_DOWN) {
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		dceb90ca49181d24f28d7e90cdd45b53
		8b6727c0ea9f63970c34a22225811451
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		c6f83aa48f7c1e0f3a9e7b140c9a0baf
		57d22dc0628463cad9056145c99249ec