snxrzx/mkxp-sunshine
1
0
Fork 0
mirror of https://forgejo.xatacraft.ru/Sunshine/mkxp-sunshine.git synced 2026-08-19 21:39:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

imastupiiid

Browse source
This commit is contained in:
ZakatTeamI2P 2026-03-31 02:13:53 +04:00
parent 8b3272c1c0
commit 42345d72db
3 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -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_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}) 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_CXX_FLAGS "${CMAKE_CXX_FLAGS} -O3 -ffast-math")
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math") set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -O3 -ffast-math")

7
src/eventthread.cpp
View file

@ -147,7 +147,10 @@ void EventThread::process(RGSSThreadData &rtData)
std::map<int, SDL_Gamepad*> controllers; std::map<int, SDL_Gamepad*> controllers;
std::map<int, SDL_Joystick*> joysticks; 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)) { if (SDL_IsGamepad(i)) {
//Load as game controller //Load as game controller
SDL_Gamepad *gc = SDL_OpenGamepad(i); SDL_Gamepad *gc = SDL_OpenGamepad(i);
@ -580,7 +583,7 @@ bool EventThread::eventFilter(void *data, SDL_Event *event)
/* Workaround for Windows pausing on drag */ /* Workaround for Windows pausing on drag */
default: default:
if (event->window.event->type == SDL_EVENT_WINDOW_MOVED) if (event->window.type == SDL_EVENT_WINDOW_MOVED)
{ {
if (shState != NULL && shState->rgssVersion > 0) if (shState != NULL && shState->rgssVersion > 0)
{ {

2
src/settingsmenu.cpp
View file

@ -147,7 +147,7 @@ std::string sourceDescString(const SourceDesc &src)
if (src.d.scan == SDL_SCANCODE_LSHIFT) if (src.d.scan == SDL_SCANCODE_LSHIFT)
return findtext(TRSTR_KEYBIND_SHIFT, "Shift"); 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); const char *str = SDL_GetKeyName(key);
if (*str == '\0') { if (*str == '\0') {