aboutsummaryrefslogtreecommitdiff
path: root/game
diff options
context:
space:
mode:
Diffstat (limited to 'game')
-rw-r--r--game/src/Autoload/Events.gd1
-rw-r--r--game/src/GameSession/GameSession.gd2
-rw-r--r--game/src/GameSession/GameSessionMenu.gd1
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: