Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update GameManager package/class to new name #4778

Merged
merged 1 commit into from
Sep 3, 2024
Merged

Update GameManager package/class to new name #4778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/MekHQ.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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");
Expand Down
4 changes: 2 additions & 2 deletions MekHQ/src/mekhq/gui/dialog/EditMapSettingsDialog.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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) {
Expand Down