From 42345d72db27b414f497370c33e74f0ed2a6f587 Mon Sep 17 00:00:00 2001
From: ZakatTeamI2P <zakatteam@proton.me>
Date: Tue, 31 Mar 2026 02:13:53 +0400
Subject: [PATCH] imastupiiid

---
 CMakeLists.txt       | 1 +
 src/eventthread.cpp  | 7 +++++--
 src/settingsmenu.cpp | 2 +-
 3 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0e08615..5b7914f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -320,6 +320,7 @@ target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES})
 target_include_directories(${PROJECT_NAME} PRIVATE src ${PIXMAN_INCLUDE_DIRS} ${SIGC2_INCLUDE_DIRS} ${RUBY_INCLUDE_DIRS})
 target_link_libraries(${PROJECT_NAME} PRIVATE SDL3::SDL3 SDL3_image::SDL3_image SDL3_sound::SDL3_sound SDL3_ttf::SDL3_ttf Boost::boost OpenAL::OpenAL physfs ${PIXMAN_LIBRARIES} ${SIGC2_INCLUDE_DIRS} ${PLATFORM_LIBRARIES} ${RUBY_LIBRARIES})
 
+#TODO: remove -w later
 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math")
 set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math")
 
diff --git a/src/eventthread.cpp b/src/eventthread.cpp
index 1c29452..f3e5f2e 100644
--- a/src/eventthread.cpp
+++ b/src/eventthread.cpp
@@ -147,7 +147,10 @@ void EventThread::process(RGSSThreadData &rtData)
 	std::map<int, SDL_Gamepad*> controllers;
 	std::map<int, SDL_Joystick*> joysticks;
 
-	for (int i = 0; i < SDL_GetJoysticks(NULL); ++i) {
+	int tmpstupidshit;
+	SDL_GetJoysticks(&tmpstupidshit);
+
+	for (int i = 0; i < tmpstupidshit; ++i) {
 		if (SDL_IsGamepad(i)) {
 			//Load as game controller
 			SDL_Gamepad *gc = SDL_OpenGamepad(i);
@@ -580,7 +583,7 @@ bool EventThread::eventFilter(void *data, SDL_Event *event)
 
 	/* Workaround for Windows pausing on drag */
 	default:
-		if (event->window.event->type == SDL_EVENT_WINDOW_MOVED)
+		if (event->window.type == SDL_EVENT_WINDOW_MOVED)
 		{
 			if (shState != NULL && shState->rgssVersion > 0)
 			{
diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp
index c7e6dae..48fc714 100644
--- a/src/settingsmenu.cpp
+++ b/src/settingsmenu.cpp
@@ -147,7 +147,7 @@ std::string sourceDescString(const SourceDesc &src)
 		if (src.d.scan == SDL_SCANCODE_LSHIFT)
 			return findtext(TRSTR_KEYBIND_SHIFT, "Shift");
 
-		SDL_Keycode key = SDL_GetKeyFromScancode(src.d.scan);
+		SDL_Keycode key = SDL_GetKeyFromScancode(src.d.scan, SDL_KMOD_NONE, false);
 		const char *str = SDL_GetKeyName(key);
 
 		if (*str == '\0') {