Skip to content

Commit

Permalink
Fixed|All Games|Resources: Order of required game data files
Browse files Browse the repository at this point in the history 
First the original IWAD, then additional lumps.
  • Loading branch information
@skyjake
skyjake committed Jun 11, 2016
1 parent 955af7d commit 02dc905
Show file tree
Hide file tree
Showing 4 changed files with 24 additions and 24 deletions.
20 changes: 10 additions & 10 deletions doomsday/apps/plugins/doom/src/d_api.cpp
View file
Expand Up @@ -76,7 +76,7 @@ static char const *gameIds[NUM_GAME_MODES] =
static void setCommonParameters(Game &game)
{
//game.addResource(RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
game.setRequiredPackages(StringList() << "net.dengine.legacy.doom_2");
game.addRequiredPackage("net.dengine.legacy.doom_2");
}

/**
Expand All @@ -98,8 +98,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/hacx.mapinfo"));
setCommonParameters(hacx);
hacx.addRequiredPackage("banjo.hacx");
setCommonParameters(hacx);
//hacx.addResource(RC_PACKAGE, FF_STARTUP, "hacx.wad", "HACX-R;PLAYPAL");
hacx.addResource(RC_DEFINITION, 0, "hacx.ded", 0);

Expand All @@ -113,8 +113,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/chex.mapinfo"));
setCommonParameters(chex);
chex.addRequiredPackage("digitalcafe.chexquest");
setCommonParameters(chex);
//chex.addResource(RC_PACKAGE, FF_STARTUP, "chex.wad", "E1M1;E4M1;_DEUTEX_;POSSH0M0");
chex.addResource(RC_DEFINITION, 0, "chex.ded", 0);

Expand All @@ -127,8 +127,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom2-tnt.mapinfo"));
setCommonParameters(tnt);
tnt.addRequiredPackage("com.idsoftware.finaldoom.tnt");
setCommonParameters(tnt);
//tnt.addResource(RC_PACKAGE, FF_STARTUP, "tnt.wad", "CAVERN5;CAVERN7;STONEW1");
tnt.addResource(RC_DEFINITION, 0, "doom2-tnt.ded", 0);

Expand All @@ -141,8 +141,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom2-plut.mapinfo"));
setCommonParameters(plut);
plut.addRequiredPackage("com.idsoftware.finaldoom.plutonia");
setCommonParameters(plut);
//plut.addResource(RC_PACKAGE, FF_STARTUP, "plutonia.wad", "_DEUTEX_;MAP01;MAP25;MC5;MC11;MC16;MC20");
plut.addResource(RC_DEFINITION, 0, "doom2-plut.ded", 0);

Expand All @@ -156,8 +156,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom2-freedm.mapinfo"));
setCommonParameters(freedm);
freedm.addRequiredPackage("freedoom.freedm");
setCommonParameters(freedm);
//freedm.addResource(RC_PACKAGE, FF_STARTUP, "freedm.wad", "MAP01");
freedm.addResource(RC_DEFINITION, 0, "doom2-freedm.ded", 0);

Expand All @@ -170,8 +170,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom2.mapinfo"));
setCommonParameters(d2);
d2.addRequiredPackage("com.idsoftware.doom2");
setCommonParameters(d2);
//d2.addResource(RC_PACKAGE, FF_STARTUP, "doom2f.wad;doom2.wad", "MAP01;MAP02;MAP03;MAP04;MAP10;MAP20;MAP25;MAP30;VILEN1;VILEO1;VILEQ1;GRNROCK");
d2.addResource(RC_DEFINITION, 0, "doom2.ded", 0);

Expand All @@ -184,8 +184,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom1-ultimate.mapinfo"));
setCommonParameters(ultimate);
ultimate.addRequiredPackage("com.idsoftware.doom.ultimate");
setCommonParameters(ultimate);
//ultimate.addResource(RC_PACKAGE, FF_STARTUP, "doomu.wad;doom.wad", "E4M1;E4M2;E4M3;E4M4;E4M5;E4M6;E4M7;E4M8;E4M9;M_EPI4");
ultimate.addResource(RC_DEFINITION, 0, "doom1-ultimate.ded", 0);

Expand All @@ -198,8 +198,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom1.mapinfo"));
d1.addRequiredPackage("com.idsoftware.doom");
setCommonParameters(d1);
d1.addRequiredPackage("com.idsoftware.doom com.idsoftware.doom.ultimate");
//d1.addResource(RC_PACKAGE, FF_STARTUP, "doom.wad", "E2M1;E2M2;E2M3;E2M4;E2M5;E2M6;E2M7;E2M8;E2M9;E3M1;E3M2;E3M3;E3M4;E3M5;E3M6;E3M7;E3M8;E3M9;CYBRE1;CYBRD8;FLOOR7_2");
d1.addResource(RC_DEFINITION, 0, "doom1.ded", 0);

Expand All @@ -212,8 +212,8 @@ int G_RegisterGames(int hookType, int param, void *data)
Game::DEF_LEGACYSAVEGAME_NAME_EXP, LEGACYSAVEGAMENAMEEXP,
Game::DEF_LEGACYSAVEGAME_SUBFOLDER, LEGACYSAVEGAMESUBFOLDER,
Game::DEF_MAPINFO_PATH, "$(App.DataPath)/$(GamePlugin.Name)/doom1-share.mapinfo"));
setCommonParameters(shareware);
shareware.addRequiredPackage("com.idsoftware.doom.shareware");
setCommonParameters(shareware);
//shareware.addResource(RC_PACKAGE, FF_STARTUP, "doom1.wad", "E1M1;E1M2;E1M3;E1M4;E1M5;E1M6;E1M7;E1M8;E1M9;D_E1M1;FLOOR4_8;FLOOR7_2");
shareware.addResource(RC_DEFINITION, 0, "doom1-share.ded", 0);
return true;
Expand Down
4 changes: 2 additions & 2 deletions doomsday/apps/plugins/doom64/src/d64_api.cpp
View file
Expand Up @@ -75,8 +75,8 @@ int G_RegisterGames(int hookType, int param, void* data)
//game.addResource(RC_PACKAGE, FF_STARTUP, "doom64.wad", "MAP01;MAP20;MAP33;F_SUCK");
game.addResource(RC_DEFINITION, 0, PLUGIN_NAMETEXT ".ded", 0);
game.setRequiredPackages(StringList()
<< "net.dengine.legacy.doom64_2"
<< "kaiser.doom64");
<< "kaiser.doom64"
<< "net.dengine.legacy.doom64_2");
return true;
}

Expand Down
12 changes: 6 additions & 6 deletions doomsday/apps/plugins/heretic/src/h_api.cpp
View file
Expand Up @@ -85,8 +85,8 @@ int G_RegisterGames(int hookType, int param, void* data)
//extended.addResource(RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
//extended.addResource(RC_PACKAGE, FF_STARTUP, "heretic.wad", "EXTENDED;E5M2;E5M7;E6M2;MUMSIT;WIZACT;MUS_CPTD;CHKNC5;SPAXA1A5");
extended.addResource(RC_DEFINITION, 0, "heretic-ext.ded", 0);
extended.setRequiredPackages(StringList() << "net.dengine.legacy.heretic_2"
<< "com.ravensoftware.heretic.extended");
extended.setRequiredPackages(StringList() << "com.ravensoftware.heretic.extended"
<< "net.dengine.legacy.heretic_2");

/* Heretic */
Game &htc = games.defineGame(gameIds[heretic],
Expand All @@ -100,8 +100,8 @@ int G_RegisterGames(int hookType, int param, void* data)
//htc.addResource(RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
//htc.addResource(RC_PACKAGE, FF_STARTUP, "heretic.wad", "E2M2;E3M6;MUMSIT;WIZACT;MUS_CPTD;CHKNC5;SPAXA1A5");
htc.addResource(RC_DEFINITION, 0, "heretic.ded", 0);
htc.setRequiredPackages(StringList() << "net.dengine.legacy.heretic_2"
<< "com.ravensoftware.heretic com.ravensoftware.heretic.extended");
htc.setRequiredPackages(StringList() << "com.ravensoftware.heretic"
<< "net.dengine.legacy.heretic_2");

/* Heretic (Shareware) */
Game &shareware = games.defineGame(gameIds[heretic_shareware],
Expand All @@ -115,8 +115,8 @@ int G_RegisterGames(int hookType, int param, void* data)
//shareware.addResource(RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
//shareware.addResource(RC_PACKAGE, FF_STARTUP, "heretic1.wad", "E1M1;MUMSIT;WIZACT;MUS_CPTD;CHKNC5;SPAXA1A5");
shareware.addResource(RC_DEFINITION, 0, "heretic-share.ded", 0);
shareware.setRequiredPackages(StringList() << "net.dengine.legacy.heretic_2"
<< "com.ravensoftware.heretic.shareware");
shareware.setRequiredPackages(StringList() << "com.ravensoftware.heretic.shareware"
<< "net.dengine.legacy.heretic_2");
return true;

#undef STARTUPPK3
Expand Down
12 changes: 6 additions & 6 deletions doomsday/apps/plugins/hexen/src/x_api.cpp
View file
Expand Up @@ -69,7 +69,7 @@ static char const *gameIds[NUM_GAME_MODES] =
static void setCommonParameters(Game &game)
{
//game.addResource(RC_PACKAGE, FF_STARTUP, STARTUPPK3, 0);
game.setRequiredPackages(StringList() << "net.dengine.legacy.hexen_2");
game.addRequiredPackage("net.dengine.legacy.hexen_2");
}

/**
Expand All @@ -88,9 +88,9 @@ 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"));
setCommonParameters(deathkings);
deathkings.addRequiredPackage("com.ravensoftware.hexen");
deathkings.addRequiredPackage("com.ravensoftware.hexen.deathkings");
setCommonParameters(deathkings);
//deathkings.addResource(RC_PACKAGE, FF_STARTUP, "hexdd.wad", "MAP59;MAP60");
//deathkings.addResource(RC_PACKAGE, FF_STARTUP, "hexen.wad", "MAP08;MAP22;TINTTAB;FOGMAP;TRANTBLA;DARTA1;ARTIPORK;SKYFOG;TALLYTOP;GROVER");
deathkings.addResource(RC_DEFINITION, 0, "hexen-dk.ded", 0);
Expand All @@ -104,8 +104,8 @@ 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"));
setCommonParameters(hxn);
hxn.addRequiredPackage("com.ravensoftware.hexen_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);

Expand All @@ -118,8 +118,8 @@ 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"));
setCommonParameters(hexen10);
hexen10.addRequiredPackage("com.ravensoftware.hexen_1.0");
setCommonParameters(hexen10);
//hexen10.addResource(RC_PACKAGE, FF_STARTUP, "hexen.wad", "MAP08;MAP22;MAP41;TINTTAB;FOGMAP;DARTA1;ARTIPORK;SKYFOG;GROVER");
hexen10.addResource(RC_DEFINITION, 0, "hexen-v10.ded", 0);

Expand All @@ -132,9 +132,9 @@ 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"));
setCommonParameters(demo);
demo.addRequiredPackage("com.ravensoftware.hexen.demo "
"com.ravensoftware.hexen.macdemo");
setCommonParameters(demo);
//demo.addResource(RC_PACKAGE, FF_STARTUP, "hexendemo.wad;machexendemo.wad;hexen.wad", "MAP01;MAP04;TINTTAB;FOGMAP;DARTA1;ARTIPORK;DEMO3==18150");
demo.addResource(RC_DEFINITION, 0, "hexen-demo.ded", 0);

Expand All @@ -147,8 +147,8 @@ 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"));
setCommonParameters(beta);
beta.addRequiredPackage("com.ravensoftware.hexen.beta");
setCommonParameters(beta);
//beta.addResource(RC_PACKAGE, FF_STARTUP, "hexendemo.wad;machexendemo.wad;hexenbeta.wad;hexen.wad", "MAP01;MAP04;TINTTAB;FOGMAP;DARTA1;ARTIPORK;AFLYA0;DEMO3==13866");
beta.addResource(RC_DEFINITION, 0, "hexen-demo.ded", 0);

Expand Down

0 comments on commit 02dc905

Please sign in to comment.