+ Bug: GameOptionsDialog does not match MegaMek's GameOptionsDialog

    This bug was caused by duplicating G.O.D. rather than just
implementing MM's
    version of it. I added the one minor thing the MM version needed
added to support
    MHQ and other external programs, and then switched to using it. I
also removed the
    MHQ included version to avoid mistakes in the future.

Author: Dylan-M

MekHQ/.classpath

@@ -26,7 +26,7 @@
 	<classpathentry kind="lib" path="lib/Ostermiller.jar"/>
 	<classpathentry kind="lib" path="lib/TabPanel.jar"/>
 	<classpathentry kind="lib" path="lib/vecmath.jar"/>
-	<classpathentry kind="lib" path="MegaMek.jar"/>
-	<classpathentry kind="lib" path="MegaMekLab.jar"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MegaMek"/>
+	<classpathentry combineaccessrules="false" kind="src" path="/MegaMekLab"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

MekHQ/docs/history.txt

@@ -1,6 +1,11 @@
 VERSION HISTORY
 ----------------------------------
 v0.3.26-git
++ Bug: GameOptionsDialog does not match MegaMek's GameOptionsDialog
+    This bug was caused by duplicating G.O.D. rather than just implementing MM's
+    version of it. I added the one minor thing the MM version needed added to support
+    MHQ and other external programs, and then switched to using it. I also removed the
+    MHQ included version to avoid mistakes in the future.
 
 v0.3.25 (2016-02-21 14:15 UTC)
 + Updating MHQ Data files to be in line with MM 41.14 (Multi-commits)

MekHQ/src/mekhq/gui/CampaignGUI.java

@@ -112,6 +112,7 @@
 
 import megamek.client.RandomNameGenerator;
 import megamek.client.RandomUnitGenerator;
+import megamek.client.ui.swing.GameOptionsDialog;
 import megamek.common.AmmoType;
 import megamek.common.Crew;
 import megamek.common.Dropship;
@@ -122,6 +123,7 @@
 import megamek.common.MechView;
 import megamek.common.MiscType;
 import megamek.common.TargetRoll;
+import megamek.common.TechConstants;
 import megamek.common.UnitType;
 import megamek.common.WeaponType;
 import megamek.common.loaders.EntityLoadingException;
@@ -199,7 +201,6 @@
 import mekhq.gui.dialog.DailyReportLogDialog;
 import mekhq.gui.dialog.DataLoadingDialog;
 import mekhq.gui.dialog.GMToolsDialog;
-import mekhq.gui.dialog.GameOptionsDialog;
 import mekhq.gui.dialog.HireBulkPersonnelDialog;
 import mekhq.gui.dialog.MaintenanceReportDialog;
 import mekhq.gui.dialog.ManageAssetsDialog;
@@ -4444,12 +4445,12 @@ private void menuOptionsActionPerformed(java.awt.event.ActionEvent evt) {// GEN-
     }// GEN-LAST:event_menuOptionsActionPerformed
 
     private void menuOptionsMMActionPerformed(java.awt.event.ActionEvent evt) {// GEN-FIRST:event_menuOptionsActionPerformed
-        GameOptionsDialog god = new GameOptionsDialog(getFrame(), getCampaign());
+        GameOptionsDialog god = new GameOptionsDialog(getFrame(), getCampaign().getGameOptions(), false);
         god.refreshOptions();
         god.setVisible(true);
         if (!god.wasCancelled()) {
             getCampaign().setGameOptions(god.getOptions());
-            god.setCampaignOptionsFromGameOptions();
+            setCampaignOptionsFromGameOptions();
             refreshCalendar();
             changePersonnelView();
             refreshPersonnelList();
@@ -8669,4 +8670,18 @@ public JTable getServicedUnitTable() {
     public UnitTableModel getServicedUnitModel() {
         return servicedUnitModel;
     }
+
+    private void setCampaignOptionsFromGameOptions() {
+        getCampaign().getCampaignOptions().setUseTactics(getCampaign().getGameOptions().getOption("command_init").booleanValue());
+        getCampaign().getCampaignOptions().setInitBonus(getCampaign().getGameOptions().getOption("individual_initiative").booleanValue());
+        getCampaign().getCampaignOptions().setToughness(getCampaign().getGameOptions().getOption("toughness").booleanValue());
+        getCampaign().getCampaignOptions().setArtillery(getCampaign().getGameOptions().getOption("artillery_skill").booleanValue());
+        getCampaign().getCampaignOptions().setAbilities(getCampaign().getGameOptions().getOption("pilot_advantages").booleanValue());
+        getCampaign().getCampaignOptions().setEdge(getCampaign().getGameOptions().getOption("edge").booleanValue());
+        getCampaign().getCampaignOptions().setImplants(getCampaign().getGameOptions().getOption("manei_domini").booleanValue());
+        getCampaign().getCampaignOptions().setQuirks(getCampaign().getGameOptions().getOption("stratops_quirks").booleanValue());
+        getCampaign().getCampaignOptions().setLimitByYear(getCampaign().getGameOptions().getOption("is_eq_limits").booleanValue());
+        getCampaign().getCampaignOptions().setAllowCanonOnly(getCampaign().getGameOptions().getOption("canon_only").booleanValue());
+        getCampaign().getCampaignOptions().setTechLevel(TechConstants.getSimpleLevel(getCampaign().getGameOptions().getOption("techlevel").stringValue()));
+    }
 }