Merge remote-tracking branch 'mathewv/master'

This commit is contained in:
Vinyl Darkscratch 2016-12-16 13:15:03 -08:00
commit 4662417dbe

View file

@ -439,5 +439,5 @@ def activate_balcony?(ypos)
!$scene.menu_open? &&
$game_player.y == ypos &&
$game_player.direction == 8 &&
Input.trigger?(Input::ACTION) && !$game_system.map_interpreter.running?
Input.trigger?(Input::ACTION) && !$game_system.map_interpreter.running? && !$game_temp.menus_visible
end