Merge pull request #4778 from Algebro7/tw-game-manager-fix

Update GameManager package/class to new name
MegaMek · Sep 3, 2024 · 1348549 · 1348549
2 parents 32c96c3 + 3aae92e
commit 1348549
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/MekHQ/src/mekhq/MekHQ.java b/MekHQ/src/mekhq/MekHQ.java
@@ -60,7 +60,7 @@
 import megamek.server.Server;
 import megamek.common.event.*;
 import megamek.common.net.marshalling.SanityInputFilter;
-import megamek.server.GameManager;
+import megamek.server.totalwarfare.TWGameManager;
 import megameklab.MegaMekLab;
 import mekhq.campaign.Campaign;
 import mekhq.campaign.CampaignController;
@@ -406,7 +406,7 @@ public void startHost(Scenario scenario, boolean loadSavegame, List<Unit> meks)
         hostDialog.dispose();
 
         try {
-            myServer = new Server(password, port, new GameManager(), register, metaserver);
+            myServer = new Server(password, port, new TWGameManager(), register, metaserver);
             if (loadSavegame) {
                 FileDialog f = new FileDialog(campaignGUI.getFrame(), "Load Savegame");
                 f.setDirectory(System.getProperty("user.dir") + "/savegames");

diff --git a/MekHQ/src/mekhq/gui/dialog/EditMapSettingsDialog.java b/MekHQ/src/mekhq/gui/dialog/EditMapSettingsDialog.java
@@ -25,7 +25,7 @@
 import megamek.common.Configuration;
 import megamek.common.MapSettings;
 import megamek.common.util.fileUtils.MegaMekFile;
-import megamek.server.GameManager;
+import megamek.server.totalwarfare.TWGameManager;
 import megamek.server.ServerBoardHelper;
 import mekhq.MekHQ;
 import mekhq.campaign.mission.Scenario;
@@ -147,7 +147,7 @@ private void initComponents() {
         panSizeRandom.add(spnMapY);
 
         comboMapSize = new JComboBox<>();
-        for (BoardDimensions size : GameManager.getBoardSizes()) {
+        for (BoardDimensions size : TWGameManager.getBoardSizes()) {
             comboMapSize.addItem(size);
         }
         if (mapSizeX > 0 & mapSizeY > 0) {