Merge remote-tracking branch 'mathewv/master'

This commit is contained in:
Vinyl Darkscratch 2016-12-16 13:15:03 -08:00
commit 4662417dbe
1 changed files with 1 additions and 1 deletions

View File

@ -439,5 +439,5 @@ def activate_balcony?(ypos)
!$scene.menu_open? && !$scene.menu_open? &&
$game_player.y == ypos && $game_player.y == ypos &&
$game_player.direction == 8 && $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 end