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

Merge remote-tracking branch 'mathewv/master'

Browse source
This commit is contained in:
Vinyl Darkscratch 2016-12-17 22:53:21 -08:00
commit d16959f0e8
3 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
binding-mri/filesystem-binding.cpp
View file

@ -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);
}

7
scripts/Game_Map.rb
View file

@ -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

22
scripts/Window_MainMenu.rb
View file

@ -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