Allow loading related maps if map is loaded

soulsmods · Dec 2, 2023 · f41f733 · f41f733
1 parent 1240f40
commit f41f733
Showing 1 changed file with 21 additions and 21 deletions.
diff --git a/src/StudioCore/MsbEditor/SceneTree.cs b/src/StudioCore/MsbEditor/SceneTree.cs
@@ -817,27 +817,6 @@ public void OnGui()
 
                             _universe.LoadMap(mapid, selected);
                         }
-
-                        if (_universe.GameType is GameType.EldenRing)
-                        {
-                            if (mapid.StartsWith("m60"))
-                            {
-                                if (ImGui.Selectable("Load Related Maps"))
-                                {
-                                    if (selected)
-                                    {
-                                        _selection.ClearSelection();
-                                    }
-
-                                    _universe.LoadMap(mapid);
-                                    _universe.LoadRelatedMapsER(mapid, _universe.LoadedObjectContainers);
-                                }
-                            }
-                        }
-                        else if (_universe.GameType is GameType.ArmoredCoreVI)
-                        {
-                            //TODO AC6
-                        }
                     }
                     else if (map is Map m)
                     {
@@ -864,6 +843,27 @@ public void OnGui()
                         }
                     }
 
+                    if (_universe.GameType is GameType.EldenRing)
+                    {
+                        if (mapid.StartsWith("m60"))
+                        {
+                            if (ImGui.Selectable("Load Related Maps"))
+                            {
+                                if (selected)
+                                {
+                                    _selection.ClearSelection();
+                                }
+
+                                _universe.LoadMap(mapid);
+                                _universe.LoadRelatedMapsER(mapid, _universe.LoadedObjectContainers);
+                            }
+                        }
+                    }
+                    else if (_universe.GameType is GameType.ArmoredCoreVI)
+                    {
+                        //TODO AC6
+                    }
+
                     if (_universe.GetLoadedMapCount() > 1)
                     {
                         if (ImGui.Selectable("Unload All Maps"))