From ecd0d92d30152e954443fcc7ccaa84bd3f329cf1 Mon Sep 17 00:00:00 2001 From: Mathew Velasquez Date: Sat, 17 Dec 2016 15:59:38 -0500 Subject: [PATCH 1/3] Reverting some marshal stuff --- binding-mri/filesystem-binding.cpp | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/binding-mri/filesystem-binding.cpp b/binding-mri/filesystem-binding.cpp index 7076326..4bc5e03 100644 --- a/binding-mri/filesystem-binding.cpp +++ b/binding-mri/filesystem-binding.cpp @@ -223,7 +223,7 @@ fileIntBindingInit() /* We overload the built-in 'Marshal::load()' function to silently * insert our utf8proc that ensures all read strings will be * UTF-8 encoded */ - // VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal")); - // rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load"); - // _rb_define_module_function(marsh, "load", _marshalLoad); + VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal")); + rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load"); + _rb_define_module_function(marsh, "load", _marshalLoad); } From 355b2d8528346e5e759076a11fd7ea7b9f366d48 Mon Sep 17 00:00:00 2001 From: mshirt Date: Sat, 17 Dec 2016 00:53:37 -0600 Subject: [PATCH 2/3] Moving the Cancel higher This change prevents the player from opening the fast travel menu and the inventory from the Menu at the same time. --- scripts/Window_MainMenu.rb | 22 ++++++++++++---------- 1 file changed, 12 insertions(+), 10 deletions(-) diff --git a/scripts/Window_MainMenu.rb b/scripts/Window_MainMenu.rb index b8c6706..28f8adc 100644 --- a/scripts/Window_MainMenu.rb +++ b/scripts/Window_MainMenu.rb @@ -103,6 +103,18 @@ class Window_MainMenu < Window_Selectable return end + + # Cancel menu + if Input.trigger?(Input::CANCEL) || + Input.trigger?(Input::MENU) || + Input.trigger?(Input::ITEMS) + unless Input.trigger?(Input::ITEMS) + $game_system.se_play($data_system.cancel_se) + end + @fade_out = true + return + end + # Select menu item if Input.trigger?(Input::ACTION) self.active = false @@ -129,15 +141,5 @@ class Window_MainMenu < Window_Selectable return end - # Cancel menu - if Input.trigger?(Input::CANCEL) || - Input.trigger?(Input::MENU) || - Input.trigger?(Input::ITEMS) - unless Input.trigger?(Input::ITEMS) - $game_system.se_play($data_system.cancel_se) - end - @fade_out = true - return - end end end From 07f2d5d6faff4cd0be1eb56c4f78862a2db350df Mon Sep 17 00:00:00 2001 From: mshirt Date: Sat, 17 Dec 2016 16:43:58 -0600 Subject: [PATCH 3/3] More anti-lag changes --- scripts/Game_Map.rb | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/scripts/Game_Map.rb b/scripts/Game_Map.rb index 4df6f17..7df9174 100644 --- a/scripts/Game_Map.rb +++ b/scripts/Game_Map.rb @@ -498,7 +498,12 @@ class Game_Map end # Update map event for event in @events.values - event.update + if (event.list != nil && event.list.size > 1) || (event.x * 128 > $game_map.display_x - (10 * 128)) && + (event.x * 128 < $game_map.display_x + (30 * 128)) && + (event.y * 128 > ($game_map.display_y) - (10 * 128) && + (event.y * 128 < ($game_map.display_y) + (27 * 128))) + event.update + end end # Update common event for common_event in @common_events.values