diff --git a/binding-mri/profiler-binding.cpp b/binding-mri/profiler-binding.cpp index 34c611d..c48e938 100644 --- a/binding-mri/profiler-binding.cpp +++ b/binding-mri/profiler-binding.cpp @@ -66,12 +66,7 @@ static VALUE profiler_set(VALUE, VALUE v) { void ProfilerInit() { VALUE module = rb_define_module("Profiler"); - tp = rb_tracepoint_new( - Qnil, - RUBY_EVENT_CALL | RUBY_EVENT_RETURN, - tp_cb, - nullptr - ); + tp = rb_tracepoint_new(Qnil, RUBY_EVENT_CALL | RUBY_EVENT_RETURN, tp_cb, nullptr); rb_gc_register_address(&tp); rb_define_singleton_method(module, "set", RUBY_METHOD_FUNC(profiler_set), 1); diff --git a/oneshot.conf b/oneshot.conf index 5508877..d38cc35 100644 --- a/oneshot.conf +++ b/oneshot.conf @@ -9,7 +9,7 @@ # relative to gameFolder and ignoring both RTPs and # encrypted archives. -# Enable reset on F12 press and Ruby profiller +# Enable reset on F12 press and Ruby profiler debugMode=false # Start game in fullscreen mode, diff --git a/scripts/Data_Settings.rb b/scripts/Data_Settings.rb index a69a48b..bbd488e 100644 --- a/scripts/Data_Settings.rb +++ b/scripts/Data_Settings.rb @@ -50,12 +50,12 @@ module Settings # Debug :debug => false, :debug_character => false, - :debug_text => false, :debug_text_scene_title => true, + :debug_text => false, :debug_picture_names => false, :debug_lightmap => false, :SDL_HINT_SHUTDOWN_DBUS_ON_QUIT => false, - :profiller => false, + :profiler => false, } reset_controls! end @@ -557,7 +557,7 @@ class Window_Settings :type => :bool, :name => "Show debug text", :parameter => :debug_text, - :icon => [1, 0], + :icon => [1, 0], }, { :type => :bool, @@ -579,9 +579,9 @@ class Window_Settings }, { :type => :bool, - :name => "Profiller", + :name => "Profiler", + :parameter => :profiler, :icon => [1, 0], - :parameter => :profiller }, { :type => :sep }, { diff --git a/scripts/Settings_Classes.rb b/scripts/Settings_Classes.rb index f4a6d88..bfa4664 100644 --- a/scripts/Settings_Classes.rb +++ b/scripts/Settings_Classes.rb @@ -850,6 +850,8 @@ class Window_Settings redraw end end + + # ---------------------------------------------------------------------------------------- class ActionParameter < BaseParameter TYPE = :action @@ -881,6 +883,7 @@ class Window_Settings end end + # ---------------------------------------------------------------------------------------- class CustomParameter < BaseParameter TYPE = :custom def initialize(settings_content, screen_id, position, name, icon, parameter, init_value, callbacks) diff --git a/scripts/Settings_Setters.rb b/scripts/Settings_Setters.rb index 7705f24..3c35483 100644 --- a/scripts/Settings_Setters.rb +++ b/scripts/Settings_Setters.rb @@ -79,15 +79,15 @@ module Settings end end - def vsync(value) - if value == 0 - Graphics.setVsync(1) - elsif value == 1 - Graphics.setVsync(-1) - else - Graphics.setVsync(0) - end - end + def vsync(value) + if value == 0 + Graphics.setVsync(1) + elsif value == 1 + Graphics.setVsync(-1) + else + Graphics.setVsync(0) + end + end def SDL_HINT_SHUTDOWN_DBUS_ON_QUIT(value) if value @@ -97,17 +97,18 @@ module Settings end end - def profiller(value) - Profiler.set(value) + def profiler(value) + Profiler.set(value) end + def wallpaper_mode(value) - if value == 0 - Sunshine.wallpapermode="normal" - elsif value == 1 - Sunshine.wallpapermode="fallback" - else - Sunshine.wallpapermode="disabled" - end + if value == 0 + Sunshine.wallpapermode="normal" + elsif value == 1 + Sunshine.wallpapermode="fallback" + else + Sunshine.wallpapermode="disabled" + end end end end