foxygit / doom Log in
commit 442785ab0df75d6c2ae6e3c04e82b4a6d7c4167a
Author:     Mike Swanson <mikeonthecomputer@gmail.com>
AuthorDate: Fri Aug 26 21:08:11 2016 -0700
Commit:     Mike Swanson <mikeonthecomputer@gmail.com>
CommitDate: Fri Aug 26 21:08:11 2016 -0700

    d_iwad: Really ensure vanilla loading order for GOG.com installs

    I had re-sorted the list in 5e91906781f8783b26a735dc57b17eba2fe9da36
    so that Doom 2 took precedence over Ultimate Doom, but it neglected
    the full extent of the load order in vanilla Final Doom.  Given
    multiple IWADs in the current directory (in vanilla), Final Doom will
    load one of the following depending on what files exist: doom2,
    plutonia, tnt, doom.  In the referenced commit, the order was doom2,
    doom, tnt, plutonia.

    Basically, it was 100% wrong in 2.2.1, but now should be correct. 😁
---
 src/d_iwad.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/d_iwad.c b/src/d_iwad.c
index 2a446db4..a586fbd3 100644
--- a/src/d_iwad.c
+++ b/src/d_iwad.c
@@ -162,19 +162,19 @@ static registry_value_t root_path_keys[] =
         "PATH",
     },

-    // Ultimate Doom
+    // Final Doom

     {
         HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1435827232",
+        SOFTWARE_KEY "\\GOG.com\\Games\\1435848742",
         "PATH",
     },

-    // Final Doom
+    // Ultimate Doom

     {
         HKEY_LOCAL_MACHINE,
-        SOFTWARE_KEY "\\GOG.com\\Games\\1435848742",
+        SOFTWARE_KEY "\\GOG.com\\Games\\1435827232",
         "PATH",
     },

@@ -195,8 +195,8 @@ static char *root_path_subdirs[] =
     "Doom2",
     "Final Doom",
     "Ultimate Doom",
-    "TNT",
     "Plutonia",
+    "TNT",
 };

 // Location where Steam is installed