3 files changed, 13 insertions, 1 deletions

@@ -128,6 +128,10 @@ func saveLocaldata():
 
 func connectToServer():
         _last_new_item = -1
+        _batch_locations = false
+        _held_locations = []
+        _held_location_scouts = []
+        _location_scouts = {}
         _letters_setup = false
         _held_letters = {}
 
@@ -396,6 +400,8 @@ func _client_connected(slot_data):
                                                 _item_locks[door] = [door_group.get_ap_id(), 1]
 
         # Create a reverse item locks map for processing items.
+        _inverse_item_locks = {}
+
         for door_id in _item_locks.keys():
                 var lock = _item_locks.get(door_id)
 
@@ -4,3 +4,9 @@ extends "res://scripts/ui/pauseMenu.gd"
 func _pause_game():
         global.get_node("Textclient").dismiss()
         super._pause_game()
+
+
+func _main_menu():
+        global.loaded = false
+        global.get_node("Archipelago").disconnect_from_ap()
+        super._main_menu()
@@ -50,7 +50,7 @@ func _ready():
 
 
 func _input(event):
-        if event is InputEventKey and event.pressed:
+        if global.loaded and event is InputEventKey and event.pressed:
                 if event.keycode == KEY_TAB and !Input.is_key_pressed(KEY_SHIFT):
                         if !get_tree().paused:
                                 is_open = true