From 5ae9caaf39465026ed0591c1458e7823474b653d Mon Sep 17 00:00:00 2001 From: ZakatTeamI2P Date: Mon, 30 Mar 2026 22:13:59 +0400 Subject: [PATCH] efjgfrdn8her50ny0hteri0jhermippg --- CMakeLists.txt | 8 ++++---- src/bitmap.cpp | 2 +- src/eventthread.cpp | 4 ++-- src/filesystem.cpp | 8 ++++---- src/keybindings.cpp | 26 +++++++++++++------------- src/screen.cpp | 2 +- src/settingsmenu.cpp | 10 +++++----- 7 files changed, 30 insertions(+), 30 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index b1f6c4a..1139c29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.5) +cmake_minimum_required(VERSION 3.14) Project(oneshot) ## Setup options ## @@ -293,7 +293,7 @@ find_package(Boost REQUIRED) find_package(PhysFS) find_path(PIXMAN_INCLUDE_DIR NAMES pixman.h PATH_SUFFIXES pixman-1) find_library(PIXMAN_LIBRARY NAMES pixman-1 pixman-1_static pixman-1_staticd) -find_package(Ruby 3.3) +find_package(Ruby COMPONENTS Interpreter Development REQUIRED) pkg_check_modules(SIGC2 REQUIRED sigc++-2.0) find_package_handle_standard_args(pixman-1 DEFAULT_MSG PIXMAN_LIBRARY PIXMAN_INCLUDE_DIR) if(PIXMAN-1_FOUND) @@ -304,8 +304,8 @@ endif() mark_as_advanced(PIXMAN_INCLUDE_DIR PIXMAN_LIBRARY) target_compile_definitions(${PROJECT_NAME} PRIVATE ${DEFINES}) -target_include_directories(${PROJECT_NAME} PRIVATE src ${PIXMAN_INCLUDE_DIRS} ${SIGC2_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}) +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}) IF(APPLE) add_custom_command(TARGET ${PROJECT_NAME} POST_BUILD COMMAND cmake -P "${CMAKE_SOURCE_DIR}/patches/mac/CompleteBundle.cmake" VERBATIM) diff --git a/src/bitmap.cpp b/src/bitmap.cpp index 1079a84..5e2f7ad 100644 --- a/src/bitmap.cpp +++ b/src/bitmap.cpp @@ -444,7 +444,7 @@ void Bitmap::stretchBlt(const IntRect &destRect, SDL_Surface *blitTemp = SDL_CreateRGBSurface(0, destRect.w, destRect.h, bpp, rMask, gMask, bMask, aMask); - SDL_BlitScaled(srcSurf, &srcRect, blitTemp, 0); + SDL_BlitSurfaceScaled(srcSurf, &srcRect, blitTemp, 0); TEX::bind(p->gl.tex); diff --git a/src/eventthread.cpp b/src/eventthread.cpp index c9e5bcd..09b3010 100644 --- a/src/eventthread.cpp +++ b/src/eventthread.cpp @@ -619,7 +619,7 @@ void EventThread::resetInputStates(){ } void EventThread::setFullscreen(SDL_Window *win, bool mode){ - SDL_SetWindowFullscreen(win, mode ? SDL_WINDOW_FULLSCREEN_DESKTOP : 0); + SDL_SetWindowFullscreen(win, mode); fullscreen = mode; } @@ -825,7 +825,7 @@ void SyncPoint::Util::waitForUnlock() SDL_LockMutex(mut); while (locked) - SDL_CondWait(cond, mut); + SDL_WaitCondition(cond, mut); SDL_UnlockMutex(mut); } diff --git a/src/filesystem.cpp b/src/filesystem.cpp index 0dd021f..6038ed7 100644 --- a/src/filesystem.cpp +++ b/src/filesystem.cpp @@ -78,12 +78,12 @@ static PHYSFS_sint64 SDLRWIoRead(struct PHYSFS_Io *io, void *buf, PHYSFS_uint64 static int SDLRWIoSeek(struct PHYSFS_Io *io, PHYSFS_uint64 offset) { - return (SDL_SeekIO(getSDLRWops(io), offset, RW_SEEK_SET) != -1); + return (SDL_SeekIO(getSDLRWops(io), offset, SDL_IO_SEEK_SET) != -1); } static PHYSFS_sint64 SDLRWIoTell(struct PHYSFS_Io *io) { - return SDL_SeekIO(getSDLRWops(io), 0, RW_SEEK_CUR); + return SDL_SeekIO(getSDLRWops(io), 0, SDL_IO_SEEK_CUR); } static PHYSFS_sint64 SDLRWIoLength(struct PHYSFS_Io *io) @@ -143,12 +143,12 @@ static PHYSFS_Io *createSDLRWIo(const char *filename) return io; } -static inline PHYSFS_File *sdlPHYS(SDL_RWops *ops) +static inline PHYSFS_File *sdlPHYS(SDL_IOStream *ops) { return static_cast(ops->hidden.unknown.data1); } -static Sint64 SDL_RWopsSize(SDL_RWops *ops) +static Sint64 SDL_RWopsSize(SDL_IOStream *ops) { PHYSFS_File *f = sdlPHYS(ops); diff --git a/src/keybindings.cpp b/src/keybindings.cpp index b1bb4cf..cdd9640 100644 --- a/src/keybindings.cpp +++ b/src/keybindings.cpp @@ -111,14 +111,14 @@ static const GcBindingData defaultGcBindings[] = { SDL_GAMEPAD_BUTTON_DPAD_RIGHT, Input::Right }, { SDL_GAMEPAD_BUTTON_DPAD_UP, Input::Up }, { SDL_GAMEPAD_BUTTON_DPAD_DOWN, Input::Down }, - { SDL_GAMEPAD_BUTTON_A, Input::Action }, - { SDL_GAMEPAD_BUTTON_B, Input::Cancel }, - { SDL_GAMEPAD_BUTTON_X, Input::Run }, - { SDL_GAMEPAD_BUTTON_Y, Input::Items }, + { SDL_GAMEPAD_BUTTON_SOUTH, Input::Action }, + { SDL_GAMEPAD_BUTTON_EAST, Input::Cancel }, + { SDL_GAMEPAD_BUTTON_WEST, Input::Run }, + { SDL_GAMEPAD_BUTTON_NORTH, Input::Items }, { SDL_GAMEPAD_BUTTON_START, Input::Menu }, { SDL_GAMEPAD_BUTTON_BACK, Input::Deactivate }, - { SDL_GAMEPAD_BUTTON_LEFTSHOULDER, Input::L }, - { SDL_GAMEPAD_BUTTON_RIGHTSHOULDER, Input::R }, + { SDL_GAMEPAD_BUTTON_LEFT_SHOULDER, Input::L }, + { SDL_GAMEPAD_BUTTON_RIGHT_SHOULDER, Input::R }, }; static elementsN(defaultGcBindings); @@ -147,12 +147,12 @@ BDescVec genDefaultBindings() for (size_t i = 0; i < defaultGcBindingsN; ++i) defaultGcBindings[i].add(d); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTX, Negative, Input::Left ); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTX, Positive, Input::Right ); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTY, Negative, Input::Up ); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_LEFTY, Positive, Input::Down ); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_TRIGGERLEFT, Positive, Input::Deactivate); - addGcAxisBinding(d, SDL_CONTROLLER_AXIS_TRIGGERRIGHT, Positive, Input::Run ); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTX, Negative, Input::Left ); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTX, Positive, Input::Right ); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTY, Negative, Input::Up ); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFTY, Positive, Input::Down ); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_LEFT_TRIGGER, Positive, Input::Deactivate); + addGcAxisBinding(d, SDL_GAMEPAD_AXIS_RIGHT_TRIGGER, Positive, Input::Run ); return d; } @@ -246,7 +246,7 @@ static bool verifyDesc(const BindingDesc &desc) case Invalid: return true; case Key: - return src.d.scan < SDL_NUM_SCANCODES; + return src.d.scan < SDL_SCANCODE_COUNT; case CButton: case JButton: return true; diff --git a/src/screen.cpp b/src/screen.cpp index b4179d5..004dde7 100644 --- a/src/screen.cpp +++ b/src/screen.cpp @@ -1,5 +1,5 @@ #include -#include +#include #include #define FPS 60 diff --git a/src/settingsmenu.cpp b/src/settingsmenu.cpp index fb5595d..259dd94 100644 --- a/src/settingsmenu.cpp +++ b/src/settingsmenu.cpp @@ -184,9 +184,9 @@ std::string sourceDescString(const SourceDesc &src) return findtext(TRSTR_KEYBIND_RSTICKU, "Right Stick (Up)"); else return findtext(TRSTR_KEYBIND_RSTICKD, "Right Stick (Down)"); - case SDL_GAMEPAD_AXIS_TRIGGERLEFT: + case SDL_GAMEPAD_AXIS_LEFT_TRIGGER: return findtext(TRSTR_KEYBIND_LTRIGGER, "Left Trigger"); - case SDL_GAMEPAD_AXIS_TRIGGERRIGHT: + case SDL_GAMEPAD_AXIS_RIGHT_TRIGGER: return findtext(TRSTR_KEYBIND_RTRIGGER, "Right Trigger"); } return ""; @@ -410,7 +410,7 @@ struct SettingsMenuPrivate uint8_t r, uint8_t g, uint8_t b) { SDL_Rect rect = { drawOff.x+x, drawOff.y+y, w, h }; - SDL_FillRect(surf, &rect, SDL_MapRGB(rgb, r, g, b)); + SDL_FillSurfaceRect(surf, &rect, SDL_MapRGB(rgb, r, g, b)); } void fillRect(SDL_Surface *surf, uint8_t grey, @@ -1189,8 +1189,8 @@ bool SettingsMenu::onEvent(const SDL_Event &event, switch (event.type) { /* Ignore these event */ - case SDL_MOUSEBUTTONUP : - case SDL_KEYUP : + case SDL_EVENT_MOUSE_BUTTON_UP : + case SDL_EVENT_KEY_UP : return true; case SDL_WINDOWEVENT :