diff options
| author |   Hop311 <hop3114@gmail.com> | 2023-04-25 22:35:59 +0200 |
|---|---|---|
| committer | Hop311 <hop3114@gmail.com> | 2023-04-25 22:35:59 +0200 |
| commit | 50327abf33078c44fef85c62ce3d90e23056fb34 (patch) | |
| tree | f39e8fe64c024ecfde01d2bc4faacb7cf0dddc2c /game | |
| parent | 8fba1c8a02f8680e0d80279b8b6451fea4a40a62 (diff) | |
Further cleanup + reset on return to main menu
Diffstat (limited to 'game')
| -rw-r--r-- | game/src/Autoload/Events.gd | 1 | ||||
| -rw-r--r-- | game/src/GameSession/GameSession.gd | 2 | ||||
| -rw-r--r-- | game/src/GameSession/GameSessionMenu.gd | 1 |
3 files changed, 2 insertions, 2 deletions
diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd index 0ee2eff..7540d3e 100644 --- a/game/src/Autoload/Events.gd +++ b/game/src/Autoload/Events.gd @@ -19,4 +19,3 @@ func _ready(): push_error("Failed to load regions") if GameSingleton.load_province_shape_file(_province_shape_file) != OK: push_error("Failed to load province shapes") - GameSingleton.finished_loading_data() diff --git a/game/src/GameSession/GameSession.gd b/game/src/GameSession/GameSession.gd index 2761815..556b98e 100644 --- a/game/src/GameSession/GameSession.gd +++ b/game/src/GameSession/GameSession.gd @@ -4,6 +4,8 @@ extends Control func _ready(): Events.Options.load_settings_from_file() + if GameSingleton.setup() != OK: + push_error("Failed to setup game") func _process(delta : float): GameSingleton.try_tick() diff --git a/game/src/GameSession/GameSessionMenu.gd b/game/src/GameSession/GameSessionMenu.gd index 70a1630..6f373d7 100644 --- a/game/src/GameSession/GameSessionMenu.gd +++ b/game/src/GameSession/GameSessionMenu.gd @@ -45,7 +45,6 @@ func show_save_dialog_button() -> void: # * SS-47 # * UIFUN-69 func _on_main_menu_confirmed() -> void: - # TODO - reset map when going back to main menu get_tree().change_scene_to_packed(_main_menu_scene) # REQUIREMENTS: |