From b2494fa184fc151dccabe7ec4b3db9112c88c317 Mon Sep 17 00:00:00 2001 From: DepressedTWM Date: Sun, 19 Jul 2026 16:05:31 +0400 Subject: [PATCH] rgfjg --- CMakeLists.txt | 2 +- binding-mri/binding-util.h | 2 +- changelogs/0.1.1.txt | 1 + scripts/Data_Settings.rb | 8 +++++++- scripts/Data_Settings_Setters.rb | 9 +++++++++ src/main.cpp | 10 ++++++++-- 6 files changed, 27 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 685a66d..57f28c8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -4,7 +4,7 @@ include(FindPackageHandleStandardArgs) # Options option(STEAM "Build for Steam" OFF) -option(DEBUG "Debug mode" ON) +option(DEBUG "Debug mode" OFF) option(NATIVE "Use native instructions(for local use only)" OFF) #Configuration diff --git a/binding-mri/binding-util.h b/binding-mri/binding-util.h index c56d1ac..8964139 100644 --- a/binding-mri/binding-util.h +++ b/binding-mri/binding-util.h @@ -24,7 +24,7 @@ #include //костыль ебаный сука -#undef SDL_snprintf +#undef snprintf #undef inline #include "exception.h" diff --git a/changelogs/0.1.1.txt b/changelogs/0.1.1.txt index 00430ef..d88c751 100644 --- a/changelogs/0.1.1.txt +++ b/changelogs/0.1.1.txt @@ -78,3 +78,4 @@ Rewrited Linux build scripts Deleted unused maps Game maps size fixed Big performance fix +Added way to select prefered Scaling mode via Settings diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb index 3fc2a96..71bbafa 100644 --- a/scripts/Data_Settings.rb +++ b/scripts/Data_Settings.rb @@ -13,7 +13,7 @@ module Settings :frameskip => true, :twm_shader => true, :light => true, - :light_shadows => true, + :scaling_mode => 0, # UI :in_game_timer => false, @@ -168,6 +168,12 @@ class Window_Settings :name => tr('Dynamic Light'), :parameter => :light, }, + { + :type => :enum, + :name => tr('Scaling mode'), + :parameter => :scaling_mode, + :values => [tr("Nearest Neighbor"), tr("Smooth(old)")] + }, ], tr("UI") => [ { diff --git a/scripts/Data_Settings_Setters.rb b/scripts/Data_Settings_Setters.rb index 0d63d12..87518d7 100644 --- a/scripts/Data_Settings_Setters.rb +++ b/scripts/Data_Settings_Setters.rb @@ -31,6 +31,15 @@ module Settings Graphics.resize_screen(new_width, new_height) end end + + def scaling_mode(value) + if value == 0 + Graphics.smooth = false + else + Graphics.smooth = true + end + end + def colorblind(value) $game_switches[252] = value end diff --git a/src/main.cpp b/src/main.cpp index e10e8ab..b3b5dc8 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -50,7 +50,11 @@ #include "gl-fun.h" #include "i18n.h" #include "security.h" -#include "modloader.h" + +#ifndef ps2 + #include "modloader.h" +#endif + #include "sunshine.h" #include "define.h" @@ -299,6 +303,7 @@ int main(int argc, char *argv[]){ } } + #ifndef ps2 std::string new_path = ModLoader(conf); if(new_path != ""){ if (chdir(new_path.c_str()) != 0){ @@ -306,7 +311,8 @@ int main(int argc, char *argv[]){ return 0; } } - + #endif + extern int screenMain(Config &conf); if (conf.screenMode) return screenMain(conf);