Unpause dev progress but show pause menu. Fixes #112
This commit is contained in:
@@ -150,6 +150,7 @@ func toggle_room_selector_visibility():
|
|||||||
|
|
||||||
|
|
||||||
func _input(event: InputEvent) -> void:
|
func _input(event: InputEvent) -> void:
|
||||||
|
super(event)
|
||||||
if escoria.get_escoria().is_ready_for_inputs():
|
if escoria.get_escoria().is_ready_for_inputs():
|
||||||
if event.is_action_pressed("ui_show_room_selector"):
|
if event.is_action_pressed("ui_show_room_selector"):
|
||||||
toggle_room_selector_visibility()
|
toggle_room_selector_visibility()
|
||||||
@@ -385,17 +386,23 @@ func show_ui():
|
|||||||
|
|
||||||
|
|
||||||
func hide_main_menu():
|
func hide_main_menu():
|
||||||
|
escoria.current_state = escoria.GAME_STATE.DEFAULT
|
||||||
if get_node(main_menu).visible:
|
if get_node(main_menu).visible:
|
||||||
get_node(main_menu).hide()
|
get_node(main_menu).hide()
|
||||||
show_ui()
|
show_ui()
|
||||||
|
|
||||||
func show_main_menu():
|
func show_main_menu():
|
||||||
|
if escoria.current_state == escoria.GAME_STATE.PAUSED:
|
||||||
|
return
|
||||||
|
escoria.current_state = escoria.GAME_STATE.PAUSED
|
||||||
|
|
||||||
if not get_node(main_menu).visible:
|
if not get_node(main_menu).visible:
|
||||||
get_node(main_menu).reset()
|
get_node(main_menu).reset()
|
||||||
get_node(main_menu).show()
|
get_node(main_menu).show()
|
||||||
hide_ui()
|
hide_ui()
|
||||||
|
|
||||||
func unpause_game():
|
func unpause_game():
|
||||||
|
escoria.current_state = escoria.GAME_STATE.DEFAULT
|
||||||
if get_node(pause_menu).visible:
|
if get_node(pause_menu).visible:
|
||||||
get_node(pause_menu).hide()
|
get_node(pause_menu).hide()
|
||||||
escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.resume()
|
escoria.object_manager.get_object(ESCObjectManager.SPEECH).node.resume()
|
||||||
@@ -404,10 +411,14 @@ func unpause_game():
|
|||||||
escoria.set_game_paused(false)
|
escoria.set_game_paused(false)
|
||||||
|
|
||||||
func pause_game():
|
func pause_game():
|
||||||
|
if escoria.current_state == escoria.GAME_STATE.PAUSED:
|
||||||
|
return
|
||||||
if get_video_player().is_playing():
|
if get_video_player().is_playing():
|
||||||
get_video_player().skip()
|
get_video_player().skip()
|
||||||
return
|
return
|
||||||
if not get_node(pause_menu).visible and not get_node(main_menu).visible:
|
if not get_node(pause_menu).visible and not get_node(main_menu).visible:
|
||||||
|
escoria.current_state = escoria.GAME_STATE.PAUSED
|
||||||
|
|
||||||
get_node(pause_menu).reset()
|
get_node(pause_menu).reset()
|
||||||
get_node(pause_menu).set_save_enabled(escoria.save_manager.save_enabled)
|
get_node(pause_menu).set_save_enabled(escoria.save_manager.save_enabled)
|
||||||
get_node(pause_menu).show()
|
get_node(pause_menu).show()
|
||||||
|
|||||||
Reference in New Issue
Block a user