1 files changed, 6 insertions, 0 deletions

@@ -205,6 +205,7 @@ func update_locations(reset_locations = true):
         for location_id in ap.client._accessible_locations:
                 if not ap.client._checked_locations.has(location_id):
                         var location_name = gamedata.location_name_by_id.get(location_id, "(Unknown)")
+                        var map_name = gamedata.get_map_name_for_location(location_id)
                         (
                                 locations
                                 . append(
@@ -214,6 +215,7 @@ func update_locations(reset_locations = true):
                                                 "id": location_id,
                                                 "ignored": ap._ignored_locations.has(location_id),
                                                 "hint": ap.client._hinted_locations.has(location_id),
+                                                "current": ap.prioritize_current_map and map_name == global.map,
                                         }
                                 )
                         )
@@ -221,6 +223,7 @@ func update_locations(reset_locations = true):
         for port_id in ap.client._accessible_worldports:
                 if not ap.client._checked_worldports.has(port_id):
                         var port_name = gamedata.get_worldport_display_name(port_id)
+                        var map_name = gamedata.get_map_name_for_port(port_id)
                         (
                                 locations
                                 . append(
@@ -230,6 +233,7 @@ func update_locations(reset_locations = true):
                                                 "id": port_id,
                                                 "ignored": false,
                                                 "hint": false,
+                                                "current": ap.prioritize_current_map and map_name == global.map,
                                         }
                                 )
                         )
@@ -362,6 +366,8 @@ func _cmp_tracker_objects(a, b) -> bool:
                 return !a["ignored"]
         elif a["hint"] != b["hint"]:
                 return a["hint"]
+        elif a["current"] != b["current"]:
+                return a["current"]
         else:
                 return a["name"] < b["name"]