aboutsummaryrefslogtreecommitdiff
path: root/game/src
diff options
context:
space:
mode:
author Hop311 <Hop3114@gmail.com>2023-12-18 23:06:48 +0100
committer GitHub <noreply@github.com>2023-12-18 23:06:48 +0100
commit71dd8f7411f37a6621985d39f3ef45b975884d59 (patch)
tree0c336e402341a141e58206c458c617d2c1e36727 /game/src
parente35b9ed5d753a6690e720d5403953f89d8f1faad (diff)
parent5ecbade59609265901caf55266af217e309e2d24 (diff)
Merge pull request #172 from OpenVicProject/new-pop-history
New pop history loading + bookmark selection by index
Diffstat (limited to 'game/src')
-rw-r--r--game/src/Game/GameSession/GameSession.gd2
-rw-r--r--game/src/Game/GameSession/MapView.gd1
2 files changed, 2 insertions, 1 deletions
diff --git a/game/src/Game/GameSession/GameSession.gd b/game/src/Game/GameSession/GameSession.gd
index 2a27e3d..305709c 100644
--- a/game/src/Game/GameSession/GameSession.gd
+++ b/game/src/Game/GameSession/GameSession.gd
@@ -4,7 +4,7 @@ extends Control
func _ready():
Events.Options.load_settings_from_file()
- if GameSingleton.setup_game() != OK:
+ if GameSingleton.setup_game(0) != OK:
push_error("Failed to setup game")
func _process(_delta : float):
diff --git a/game/src/Game/GameSession/MapView.gd b/game/src/Game/GameSession/MapView.gd
index 62bdd20..01e5844 100644
--- a/game/src/Game/GameSession/MapView.gd
+++ b/game/src/Game/GameSession/MapView.gd
@@ -129,6 +129,7 @@ func zoom_out() -> void:
func _on_province_selected(index : int) -> void:
_map_shader_material.set_shader_parameter(GameLoader.ShaderManager.param_selected_index, index)
+ print("Province selected with index: ", index)
# REQUIREMENTS
# * SS-31