chocolate-doom · SmileTheory · Oct 19, 2019 · Oct 19, 2019 · Oct 20, 2019 · Oct 21, 2019
diff --git a/src/d_mode.c b/src/d_mode.c
@@ -118,25 +118,27 @@ int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode)
 
 static struct {
     GameMission_t mission;
-    GameVersion_t version;
+    NetGameVersion_t version;
 } valid_versions[] = {
-    { doom,     exe_doom_1_2 },
-    { doom,     exe_doom_1_666 },
-    { doom,     exe_doom_1_7 },
-    { doom,     exe_doom_1_8 },
-    { doom,     exe_doom_1_9 },
-    { doom,     exe_hacx },
-    { doom,     exe_ultimate },
-    { doom,     exe_final },
-    { doom,     exe_final2 },
-    { doom,     exe_chex },
-    { heretic,  exe_heretic_1_3 },
-    { hexen,    exe_hexen_1_1 },
-    { strife,   exe_strife_1_2 },
-    { strife,   exe_strife_1_31 },
+    { doom,     net_doom_1_0 },
+    { doom,     net_doom_1_1 },
+    { doom,     net_doom_1_2 },
+    { doom,     net_doom_1_666 },
+    { doom,     net_doom_1_7 },
+    { doom,     net_doom_1_8 },
+    { doom,     net_doom_1_9 },
+    { doom,     net_hacx },
+    { doom,     net_ultimate },
+    { doom,     net_final },
+    { doom,     net_final2 },
+    { doom,     net_chex },
+    { heretic,  net_heretic_1_3 },
+    { hexen,    net_hexen_1_1 },
+    { strife,   net_strife_1_2 },
+    { strife,   net_strife_1_31 },
 };
 
-boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version)
+boolean D_ValidNetGameVersion(GameMission_t mission, NetGameVersion_t version)
 {
     int i;
 
@@ -160,6 +162,34 @@ boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version)
     return false;
 }
 
+// Order of these is the same as in GameVersion_t
+const NetGameVersion_t game_to_net_version_table[] =
+{
+    net_doom_1_0,
+    net_doom_1_1,
+    net_doom_1_2,
+    net_doom_1_666,
+    net_doom_1_7,
+    net_doom_1_8,
+    net_doom_1_9,
+    net_hacx,
+    net_ultimate,
+    net_final,
+    net_final2,
+    net_chex,
+
+    net_heretic_1_3,
+
+    net_hexen_1_1,
+    net_strife_1_2,
+    net_strife_1_31
+};
+
+    NetGameVersion_t D_NetGameVersion(int gameversion)
+{
+    return game_to_net_version_table[gameversion];
+}
+
 // Does this mission type use ExMy form, rather than MAPxy form?
 
 boolean D_IsEpisodeMap(GameMission_t mission)

diff --git a/src/d_mode.h b/src/d_mode.h
@@ -53,10 +53,13 @@ typedef enum
 } GameMode_t;
 
 // What version are we emulating?
+// NOTE: if you change this, alter game_to_net_version_table[] in d_mode.c
 
 typedef enum
 {
-    exe_doom_1_2,    // Doom 1.2: shareware and registered
+    exe_doom_1_0,    // Doom 1.0: shareware
+    exe_doom_1_1,    // Doom 1.1: shareware and registered
+    exe_doom_1_2,    // Doom 1.2: "
     exe_doom_1_666,  // Doom 1.666: for shareware, registered and commercial
     exe_doom_1_7,    // Doom 1.7/1.7a: "
     exe_doom_1_8,    // Doom 1.8: "
@@ -74,6 +77,33 @@ typedef enum
     exe_strife_1_31  // Strife v1.31
 } GameVersion_t;
 
+// What version are we reporting across the network?
+// This is the old GameVersion_t with the new compatibility options appended
+// NEVER change this order, only add to the end
+
+typedef enum
+{
+    net_doom_1_2,    // Doom 1.2: shareware and registered
+    net_doom_1_666,  // Doom 1.666: for shareware, registered and commercial
+    net_doom_1_7,    // Doom 1.7/1.7a: "
+    net_doom_1_8,    // Doom 1.8: "
+    net_doom_1_9,    // Doom 1.9: "
+    net_hacx,        // Hacx
+    net_ultimate,    // Ultimate Doom (retail)
+    net_final,       // Final Doom
+    net_final2,      // Final Doom (alternate exe)
+    net_chex,        // Chex Quest executable (based on Final Doom)
+
+    net_heretic_1_3, // Heretic 1.3
+
+    net_hexen_1_1,   // Hexen 1.1
+    net_strife_1_2,  // Strife v1.2
+    net_strife_1_31,  // Strife v1.31
+
+    net_doom_1_0,    // Doom 1.0: shareware
+    net_doom_1_1,    // Doom 1.1: shareware and registered
+} NetGameVersion_t;
+
 // What IWAD variant are we using?
 
 typedef enum
@@ -97,7 +127,8 @@ typedef enum
 } skill_t;
 
 boolean D_ValidGameMode(GameMission_t mission, GameMode_t mode);
-boolean D_ValidGameVersion(GameMission_t mission, GameVersion_t version);
+boolean D_ValidNetGameVersion(GameMission_t mission, NetGameVersion_t version);
+NetGameVersion_t D_NetGameVersion(int gameversion);
 boolean D_ValidEpisodeMap(GameMission_t mission, GameMode_t mode,
                           int episode, int map);
 int D_GetNumEpisodes(GameMission_t mission, GameMode_t mode);

diff --git a/src/doom/CMakeLists.txt b/src/doom/CMakeLists.txt
@@ -11,6 +11,7 @@ add_library(doom STATIC
             deh_thing.c
             deh_weapon.c
                             d_englsh.h
+            d_compat.c      d_compat.h
             d_items.c       d_items.h
             d_main.c        d_main.h
             d_net.c

diff --git a/src/doom/Makefile.am b/src/doom/Makefile.am
@@ -17,6 +17,7 @@ deh_sound.c                     \
 deh_thing.c                     \
 deh_weapon.c                    \
                    d_englsh.h   \
+d_compat.c         d_compat.h   \
 d_items.c          d_items.h    \
 d_main.c           d_main.h     \
 d_net.c                         \

diff --git a/src/doom/am_map.c b/src/doom/am_map.c
@@ -719,6 +719,7 @@ AM_Responder
             rc = false;
         }
 
+        // Automap cheat works in multiplayer prior to Doom v1.9
         if ((!deathmatch || gameversion <= exe_doom_1_8)
          && cht_CheckCheat(&cheat_amap, ev->data2))
         {