diff options
| author |   Hop311 <Hop3114@gmail.com> | 2023-05-24 12:32:37 +0200 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2023-05-24 12:32:37 +0200 |
| commit | 0a1a50cde54fee469bc0069978cd27a2bd1a2fb0 (patch) | |
| tree | 2ba58efbe0ff3cfdc6f73b7a9e0bfab399d5e0d3 /game | |
| parent | ac36a373139e3e815f70720b37d4ffc8d9062df9 (diff) | |
| parent | d6db91738ceee5cce9e7b7efc32bec89a83fa790 (diff) | |
Merge pull request #124 from OpenVicProject/bug-fixes
Date fix + string fix + Logger queue
Diffstat (limited to 'game')
| -rw-r--r-- | game/src/Autoload/Events.gd | 2 | ||||
| -rw-r--r-- | game/src/GameSession/GameSession.gd | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/game/src/Autoload/Events.gd b/game/src/Autoload/Events.gd index 0193a08..8800041 100644 --- a/game/src/Autoload/Events.gd +++ b/game/src/Autoload/Events.gd @@ -25,6 +25,8 @@ const _compatibility_mode_path : String = "" # REQUIREMENTS # * FS-333, FS-334, FS-335, FS-341 func _ready(): + GameSingleton.setup_logger() + var start := Time.get_ticks_usec() if _compatibility_mode_path: diff --git a/game/src/GameSession/GameSession.gd b/game/src/GameSession/GameSession.gd index 556b98e..5bb1c2f 100644 --- a/game/src/GameSession/GameSession.gd +++ b/game/src/GameSession/GameSession.gd @@ -4,7 +4,7 @@ extends Control func _ready(): Events.Options.load_settings_from_file() - if GameSingleton.setup() != OK: + if GameSingleton.setup_game() != OK: push_error("Failed to setup game") func _process(delta : float): |