Returning to main menu now disconnects

3 files changed, 18 insertions, 5 deletions

@@ -98,10 +98,15 @@ func _ready():
         _client.connect("data_received", self, "_on_data")
 
 
-func _errored():
-        global._print("AP connection failed")
+func _reset_state():
         _should_process = false
         _authenticated = false
+        _map_loaded = false
+
+
+func _errored():
+        global._print("AP connection failed")
+        _reset_state()
 
         emit_signal(
                 "could_not_connect",
@@ -109,10 +114,9 @@ func _errored():
         )
 
 
-func _closed():
+func _closed(_was_clean = true):
         global._print("Connection closed")
-        _should_process = false
-        _authenticated = false
+        _reset_state()
 
         if not _initiated_disconnect:
                 emit_signal("could_not_connect", "Disconnected from Archipelago")
@@ -0,0 +1,8 @@
+extends "res://scripts/pause_menu.gd"
+
+
+func _main_menu():
+        var apclient = global.get_node("Archipelago")
+        apclient.disconnect_from_ap()
+
+        ._main_menu()
@@ -24,6 +24,7 @@ func _ready():
                 installScriptExtension("user://maps/Archipelago/painting_eye.gd")
                 installScriptExtension("user://maps/Archipelago/panelLevelSwitch.gd")
                 installScriptExtension("user://maps/Archipelago/panelEnd.gd")
+                installScriptExtension("user://maps/Archipelago/pause_menu.gd")
 
         global.get_node("Archipelago").connect("client_connected", self, "connectionSuccessful")
         global.get_node("Archipelago").connect("could_not_connect", self, "connectionUnsuccessful")