Resources|Hexen: Detect Macintosh version of Hexen IWAD

IssueID #2287
skyjake · Oct 26, 2018 · b1e2579 · b1e2579
1 parent 1fefdc0
commit b1e2579
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/doomsday/apps/libdoomsday/net.dengine.base.pack/databundles.dei b/doomsday/apps/libdoomsday/net.dengine.base.pack/databundles.dei
@@ -615,6 +615,20 @@ package "com.ravensoftware.hexen_1.1" {
     }
 }
 
+package "com.ravensoftware.hexen.mac_1.1" {
+    format: IWAD 
+    fileName: hexen.wad
+    fileSize: 21078584 
+    lumps <MAP08, MAP22, TINTTAB, FOGMAP, TRANTBLA, DARTA1, ARTIPORK, SKYFOG, TALLYTOP, GROVER>
+    lumpDirCRC32: 6340baf
+    info {
+        title: Hexen (Macintosh)
+        author: Raven Software
+        license: All rights reserved
+        tags: gamedata hexen vanilla mac
+    }
+}
+
 package "com.ravensoftware.hexen.beta" {
     format: IWAD 
     fileName <hexen.wad, hexenbeta.wad>

diff --git a/doomsday/apps/plugins/hexen/src/x_api.cpp b/doomsday/apps/plugins/hexen/src/x_api.cpp
@@ -87,7 +87,7 @@ static int G_RegisterGames(int, int, void *)
                             Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
                             Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
                             Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/hexen-dk.mapinfo"));
-    deathkings.addRequiredPackage("com.ravensoftware.hexen");
+    deathkings.addRequiredPackage("com.ravensoftware.hexen com.ravensoftware.hexen.mac");
     deathkings.addRequiredPackage("com.ravensoftware.hexen.deathkings");
     setCommonParameters(deathkings);
     //deathkings.addResource(RC_PACKAGE, FF_STARTUP, "hexdd.wad", "MAP59;MAP60");
@@ -104,7 +104,7 @@ static int G_RegisterGames(int, int, void *)
                             Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
                             Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
                             Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/hexen.mapinfo"));
-    hxn.addRequiredPackage("com.ravensoftware.hexen_1.1");
+    hxn.addRequiredPackage("com.ravensoftware.hexen_1.1 com.ravensoftware.hexen.mac_1.1");
     setCommonParameters(hxn);
     //hxn.addResource(RC_PACKAGE, FF_STARTUP, "hexen.wad", "MAP08;MAP22;TINTTAB;FOGMAP;TRANTBLA;DARTA1;ARTIPORK;SKYFOG;TALLYTOP;GROVER");
     hxn.addResource(RC_DEFINITION, 0, "hexen.ded", 0);