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.
This commit is contained in:
mshirt 2016-12-17 00:53:37 -06:00
parent ecd0d92d30
commit 355b2d8528

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