diff options
author | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-08 19:57:05 -0500 |
---|---|---|
committer | Star Rauchenberger <fefferburbia@gmail.com> | 2024-02-08 19:57:05 -0500 |
commit | 18868c978b56e14f11a700c33fe8572fd953a16f (patch) | |
tree | 4135eb63166ef40e38c6e07c333e2ea801535300 | |
parent | c5d9a2493d317a72a5bcb33c51d82918bbc360d3 (diff) | |
download | lingo-race-18868c978b56e14f11a700c33fe8572fd953a16f.tar.gz lingo-race-18868c978b56e14f11a700c33fe8572fd953a16f.tar.bz2 lingo-race-18868c978b56e14f11a700c33fe8572fd953a16f.zip |
Hey don't hijack load twice you dummy
-rw-r--r-- | racing/lobby.gd | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/racing/lobby.gd b/racing/lobby.gd index 2f965d9..10fefb6 100644 --- a/racing/lobby.gd +++ b/racing/lobby.gd | |||
@@ -15,7 +15,7 @@ const MAX_PLAYERS = 250 | |||
15 | const PROTOCOL_VERSION = 2 | 15 | const PROTOCOL_VERSION = 2 |
16 | const RECIPIENT_BROADCAST_ALL = -1 | 16 | const RECIPIENT_BROADCAST_ALL = -1 |
17 | const LOBBY_MAP_NAME = "ll1_racing" | 17 | const LOBBY_MAP_NAME = "ll1_racing" |
18 | const VERSION = "0.0.5" | 18 | const VERSION = "0.0.6" |
19 | 19 | ||
20 | const LL1_AREAS = [ | 20 | const LL1_AREAS = [ |
21 | ["Starting Room", 0, 0, 0], | 21 | ["Starting Room", 0, 0, 0], |
@@ -74,7 +74,6 @@ const LL1_AREAS = [ | |||
74 | 74 | ||
75 | func _ready(): | 75 | func _ready(): |
76 | global._print("Starting Lobby") | 76 | global._print("Starting Lobby") |
77 | installScriptExtension(ResourceLoader.load("user://maps/racing/load.gd")) | ||
78 | 77 | ||
79 | # P2P solve messages should still be received while paused. | 78 | # P2P solve messages should still be received while paused. |
80 | set_pause_mode(Node.PAUSE_MODE_PROCESS) | 79 | set_pause_mode(Node.PAUSE_MODE_PROCESS) |
@@ -84,6 +83,8 @@ func _ready(): | |||
84 | Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) | 83 | Input.set_mouse_mode(Input.MOUSE_MODE_VISIBLE) |
85 | 84 | ||
86 | if global.get_node_or_null("RaceManager") == null: | 85 | if global.get_node_or_null("RaceManager") == null: |
86 | installScriptExtension(ResourceLoader.load("user://maps/racing/load.gd")) | ||
87 | |||
87 | var race_manager_script = load("user://maps/racing/manager.gd") | 88 | var race_manager_script = load("user://maps/racing/manager.gd") |
88 | var race_manager = race_manager_script.new() | 89 | var race_manager = race_manager_script.new() |
89 | race_manager.name = "RaceManager" | 90 | race_manager.name = "RaceManager" |
@@ -417,6 +418,7 @@ func _start_game(): | |||
417 | ) | 418 | ) |
418 | global.entry_rotate = Vector3(0, 0, 0) | 419 | global.entry_rotate = Vector3(0, 0, 0) |
419 | global.sets_entry_point = true | 420 | global.sets_entry_point = true |
421 | |||
420 | var _discard = get_tree().change_scene("res://scenes/load_screen.tscn") | 422 | var _discard = get_tree().change_scene("res://scenes/load_screen.tscn") |
421 | 423 | ||
422 | 424 | ||