Rename the options fields to make their purpose more clear

FAForever · May 22, 2024 · b222645 · b222645
1 parent cc7c808
commit b222645
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameScenario.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/header/GameScenario.java
@@ -4,6 +4,6 @@
 
 public record GameScenario(String mapPath, Integer mapVersion, String mapDescription, String mapScript, String mapSave,
                            String mapName, Integer mapSizeX, Integer mapSizeZ, Integer reclaimMassValue,
-                           Integer reclaimEnergyValue, GameOptions primaryGameOptions,
-                           Map<String, String> secondaryGameOptions) {
+                           Integer reclaimEnergyValue, GameOptions gameOptions,
+                           Map<String, String> modOptions) {
 }
diff --git a/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java b/faf-commons-data/src/main/java/com/faforever/commons/replay/header/ReplayHeaderParser.java
@@ -103,11 +103,11 @@ public static ReplayHeader parse(LittleEndianDataInputStream dataStream) throws
       if (gameScenario instanceof LuaData.Table table) {
 
         // retrieve and manage the game options
-        GameOptions primaryOptions = null;
-        Map<String, String> secondaryOptions = null;
+        GameOptions gameOptions = null;
+        Map<String, String> modOptions = null;
         if (table.value().get("Options") instanceof LuaData.Table optionsTable) {
 
-          primaryOptions = new GameOptions(
+          gameOptions = new GameOptions(
             GameOptions.AutoTeams.findByKey(optionsTable.getString("AutoTeams")),
             GameOptions.TeamLock.findByKey(optionsTable.getString("TeamLock")),
             GameOptions.TeamSpawn.findByKey(optionsTable.getString("TeamSpawn")),
@@ -133,7 +133,7 @@ public static ReplayHeader parse(LittleEndianDataInputStream dataStream) throws
           optionsTable.removeKey("Unranked");
           optionsTable.removeKey("Victory");
 
-          secondaryOptions = optionsTable.toMap();
+          modOptions = optionsTable.toMap();
         }
 
         Integer sizeX = null;
@@ -159,7 +159,7 @@ public static ReplayHeader parse(LittleEndianDataInputStream dataStream) throws
           table.getString("name"),
           sizeX, sizeZ,
           massReclaimValue, energyReclaimValue,
-          primaryOptions, secondaryOptions
+          gameOptions, modOptions
         );
 
       }