From fa016d495be64fdbdc5c75941ccc19e99e6b3d73 Mon Sep 17 00:00:00 2001 From: ZakatTeamI2P Date: Mon, 30 Mar 2026 22:45:44 +0400 Subject: [PATCH] ia pidoras --- CMakeLists.txt | 2 +- src/eventthread.cpp | 4 ++-- src/oneshot.cpp | 3 +-- src/settingsmenu.cpp | 4 ++-- src/vorbissource.cpp | 10 +++++----- 5 files changed, 11 insertions(+), 12 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 1139c29..f7c886b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -130,7 +130,7 @@ elseif(APPLE) list(APPEND MAIN_SOURCE src/mac-desktop.mm) else() find_package(PkgConfig REQUIRED) - pkg_check_modules(LINUXPKGS REQUIRED gtk4 libxfconf-0) + pkg_check_modules(LINUXPKGS REQUIRED gtk+-3.0 libxfconf-0) include_directories(${LINUXPKGS_INCLUDE_DIRS}) add_compile_options(${LINUXPKGS_CFLAGS_OTHER}) list(APPEND PLATFORM_LIBRARIES ${LINUXPKGS_LDFLAGS}) diff --git a/src/eventthread.cpp b/src/eventthread.cpp index d440ecc..914ce61 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -382,11 +382,11 @@ void EventThread::process(RGSSThreadData &rtData) break; case SDL_EVENT_GAMEPAD_BUTTON_DOWN: - gcState.buttons[event.cbutton.button] = true; + gcState.buttons[event.gbutton.button] = true; break; case SDL_EVENT_GAMEPAD_BUTTON_UP: - gcState.buttons[event.cbutton.button] = false; + gcState.buttons[event.gbutton.button] = false; break; case SDL_EVENT_GAMEPAD_AXIS_MOTION: diff --git a/src/oneshot.cpp b/src/oneshot.cpp index f34be76..23461b4 100644 --- a/src/oneshot.cpp +++ b/src/oneshot.cpp @@ -98,8 +98,7 @@ struct linux_DialogData bool result; }; -static int linux_dialog(void *rawData) -{ +static int linux_dialog(void *rawData){ linux_DialogData *data = reinterpret_cast(rawData); // Determine correct flags diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp index 259dd94..e0a6da9 100644 --- a/src/settingsmenu.cpp +++ b/src/settingsmenu.cpp @@ -739,7 +739,7 @@ struct SettingsMenuPrivate case SDL_EVENT_GAMEPAD_BUTTON_DOWN: desc.type = CButton; - desc.d.jb = event.cbutton.button; + desc.d.jb = event.gbutton.button; break; case SDL_EVENT_GAMEPAD_AXIS_MOTION: @@ -758,7 +758,7 @@ struct SettingsMenuPrivate case SDL_EVENT_JOYSTICK_BUTTON_DOWN: desc.type = JButton; - desc.d.jb = event.cbutton.button; + desc.d.jb = event.gbutton.button; break; case SDL_EVENT_JOYSTICK_HAT_MOTION: diff --git a/src/vorbissource.cpp b/src/vorbissource.cpp index d72aa85..ba044d9 100644 --- a/src/vorbissource.cpp +++ b/src/vorbissource.cpp @@ -27,19 +27,19 @@ #include #include -static size_t vfRead(void *ptr, size_t size, size_t nmemb, void *ops) -{ - return SDL_RWread(static_cast(ops), ptr, size, nmemb); +static size_t vfRead(void *ptr, size_t size, void *ops){ + //size_t SDL_ReadIO(SDL_IOStream *context, void *ptr, size_t size); + return SDL_ReadIO(static_cast(ops), ptr, size); } static int vfSeek(void *ops, ogg_int64_t offset, int whence) { - return SDL_RWseek(static_cast(ops), offset, whence); + return SDL_SeekIO(static_cast(ops), offset, whence); } static long vfTell(void *ops) { - return SDL_RWtell(static_cast(ops)); + return SDL_TellIO(static_cast(ops)); } static ov_callbacks OvCallbacks =