Merge remote-tracking branch 'mathewv/master'

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"));
+	VALUE marsh = rb_const_get(rb_cObject, rb_intern("Marshal"));
-	// rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load");
+	rb_define_alias(rb_singleton_class(marsh), "_mkxp_load_alias", "load");
-	// _rb_define_module_function(marsh, "load", _marshalLoad);
+	_rb_define_module_function(marsh, "load", _marshalLoad);
 }

scripts/Game_Map.rb

@@ -498,8 +498,13 @@ class Game_Map
     end
     # Update map event
     for event in @events.values
+	  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
       common_event.update

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