Skip to content

Commit

Permalink
ENGINES: Bump the base resource priority to start at 1
Browse files Browse the repository at this point in the history 
Because 0 now means blacklisted
  • Loading branch information
@DrMcCoy
DrMcCoy committed Aug 15, 2012
1 parent 08c6e09 commit 4bc41c9
Show file tree
Hide file tree
Showing 8 changed files with 72 additions and 72 deletions.
70 changes: 35 additions & 35 deletions src/engines/dragonage/dragonage.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,41 +153,41 @@ void DragonAgeEngine::init() {
ResMan.addArchiveDir(Aurora::kArchiveERF, "modules/single player/data");

status("Loading core resource files");
indexMandatoryArchive(Aurora::kArchiveERF, "2da.erf" , 0);
indexMandatoryArchive(Aurora::kArchiveERF, "anims.erf" , 1);
indexMandatoryArchive(Aurora::kArchiveERF, "chargen.gpu.rim" , 2);
indexMandatoryArchive(Aurora::kArchiveERF, "chargen.rim" , 3);
indexMandatoryArchive(Aurora::kArchiveERF, "consolescripts.erf" , 4);
indexMandatoryArchive(Aurora::kArchiveERF, "designerareas.erf" , 5);
indexMandatoryArchive(Aurora::kArchiveERF, "designercreatures.erf" , 6);
indexMandatoryArchive(Aurora::kArchiveERF, "designercutscenes.erf" , 7);
indexMandatoryArchive(Aurora::kArchiveERF, "designerdialogs.erf" , 8);
indexMandatoryArchive(Aurora::kArchiveERF, "designeritems.erf" , 9);
indexMandatoryArchive(Aurora::kArchiveERF, "designerplaceables.erf", 10);
indexMandatoryArchive(Aurora::kArchiveERF, "designerplots.erf" , 11);
indexMandatoryArchive(Aurora::kArchiveERF, "designerscripts.rim" , 12);
indexMandatoryArchive(Aurora::kArchiveERF, "designertriggers.erf" , 13);
indexMandatoryArchive(Aurora::kArchiveERF, "face.erf" , 14);
indexMandatoryArchive(Aurora::kArchiveERF, "global.rim" , 15);
indexMandatoryArchive(Aurora::kArchiveERF, "globalvfx.rim" , 16);
indexMandatoryArchive(Aurora::kArchiveERF, "gui.erf" , 17);
indexMandatoryArchive(Aurora::kArchiveERF, "guiexport.erf" , 18);
indexMandatoryArchive(Aurora::kArchiveERF, "iterationtests.erf" , 19);
indexMandatoryArchive(Aurora::kArchiveERF, "lightprobedata.erf" , 20);
indexMandatoryArchive(Aurora::kArchiveERF, "materialobjects.erf" , 21);
indexMandatoryArchive(Aurora::kArchiveERF, "materials.erf" , 22);
indexMandatoryArchive(Aurora::kArchiveERF, "misc.erf" , 23);
indexMandatoryArchive(Aurora::kArchiveERF, "modelhierarchies.erf" , 24);
indexMandatoryArchive(Aurora::kArchiveERF, "modelmeshdata.erf" , 25);
indexMandatoryArchive(Aurora::kArchiveERF, "pathfindingpatches.erf", 26);
indexMandatoryArchive(Aurora::kArchiveERF, "postprocesseffects.erf", 27);
indexMandatoryArchive(Aurora::kArchiveERF, "resmetrics.erf" , 28);
indexMandatoryArchive(Aurora::kArchiveERF, "scripts.erf" , 29);
indexMandatoryArchive(Aurora::kArchiveERF, "shaders.erf" , 30);
indexMandatoryArchive(Aurora::kArchiveERF, "states.erf" , 31);
indexMandatoryArchive(Aurora::kArchiveERF, "subqueuefiles.erf" , 32);
indexMandatoryArchive(Aurora::kArchiveERF, "textures.erf" , 33);
indexMandatoryArchive(Aurora::kArchiveERF, "tints.erf" , 34);
indexMandatoryArchive(Aurora::kArchiveERF, "2da.erf" , 1);
indexMandatoryArchive(Aurora::kArchiveERF, "anims.erf" , 2);
indexMandatoryArchive(Aurora::kArchiveERF, "chargen.gpu.rim" , 3);
indexMandatoryArchive(Aurora::kArchiveERF, "chargen.rim" , 4);
indexMandatoryArchive(Aurora::kArchiveERF, "consolescripts.erf" , 5);
indexMandatoryArchive(Aurora::kArchiveERF, "designerareas.erf" , 6);
indexMandatoryArchive(Aurora::kArchiveERF, "designercreatures.erf" , 7);
indexMandatoryArchive(Aurora::kArchiveERF, "designercutscenes.erf" , 8);
indexMandatoryArchive(Aurora::kArchiveERF, "designerdialogs.erf" , 9);
indexMandatoryArchive(Aurora::kArchiveERF, "designeritems.erf" , 10);
indexMandatoryArchive(Aurora::kArchiveERF, "designerplaceables.erf", 11);
indexMandatoryArchive(Aurora::kArchiveERF, "designerplots.erf" , 12);
indexMandatoryArchive(Aurora::kArchiveERF, "designerscripts.rim" , 13);
indexMandatoryArchive(Aurora::kArchiveERF, "designertriggers.erf" , 14);
indexMandatoryArchive(Aurora::kArchiveERF, "face.erf" , 15);
indexMandatoryArchive(Aurora::kArchiveERF, "global.rim" , 16);
indexMandatoryArchive(Aurora::kArchiveERF, "globalvfx.rim" , 17);
indexMandatoryArchive(Aurora::kArchiveERF, "gui.erf" , 18);
indexMandatoryArchive(Aurora::kArchiveERF, "guiexport.erf" , 19);
indexMandatoryArchive(Aurora::kArchiveERF, "iterationtests.erf" , 20);
indexMandatoryArchive(Aurora::kArchiveERF, "lightprobedata.erf" , 21);
indexMandatoryArchive(Aurora::kArchiveERF, "materialobjects.erf" , 22);
indexMandatoryArchive(Aurora::kArchiveERF, "materials.erf" , 23);
indexMandatoryArchive(Aurora::kArchiveERF, "misc.erf" , 24);
indexMandatoryArchive(Aurora::kArchiveERF, "modelhierarchies.erf" , 25);
indexMandatoryArchive(Aurora::kArchiveERF, "modelmeshdata.erf" , 26);
indexMandatoryArchive(Aurora::kArchiveERF, "pathfindingpatches.erf", 27);
indexMandatoryArchive(Aurora::kArchiveERF, "postprocesseffects.erf", 28);
indexMandatoryArchive(Aurora::kArchiveERF, "resmetrics.erf" , 29);
indexMandatoryArchive(Aurora::kArchiveERF, "scripts.erf" , 30);
indexMandatoryArchive(Aurora::kArchiveERF, "shaders.erf" , 31);
indexMandatoryArchive(Aurora::kArchiveERF, "states.erf" , 32);
indexMandatoryArchive(Aurora::kArchiveERF, "subqueuefiles.erf" , 33);
indexMandatoryArchive(Aurora::kArchiveERF, "textures.erf" , 34);
indexMandatoryArchive(Aurora::kArchiveERF, "tints.erf" , 35);

status("Loading core ability resource files");
indexMandatoryArchive(Aurora::kArchiveERF, "bearform.rim" , 40);
Expand Down
4 changes: 2 additions & 2 deletions src/engines/jade/jade.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ void JadeEngine::run(const Common::UString &target) {
void JadeEngine::init() {
status("Setting base directory");
ResMan.registerDataBaseDir(_baseDirectory);
indexMandatoryDirectory("", 0, 0, 0);
indexMandatoryDirectory("", 0, 0, 1);

status("Adding extra archive directories");
ResMan.addArchiveDir(Aurora::kArchiveBIF, "data");
Expand Down Expand Up @@ -223,7 +223,7 @@ void JadeEngine::init() {
ResMan.addArchiveDir(Aurora::kArchiveRIM, "data/j300_hench");

status("Loading main KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 0);
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 1);

status("Loading global auxiliary resources");
indexMandatoryArchive(Aurora::kArchiveERF, "loadscreens.mod" , 10);
Expand Down
6 changes: 3 additions & 3 deletions src/engines/kotor/kotor.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,7 @@ void KotOREngine::initResources() {
if (_platform == Aurora::kPlatformXbox)
ResMan.addTypeAlias(Aurora::kFileTypeTXB, Aurora::kFileTypeTPC);

indexMandatoryDirectory("", 0, 0, 0);
indexMandatoryDirectory("", 0, 0, 1);

status("Adding extra archive directories");
ResMan.addArchiveDir(Aurora::kArchiveBIF, (_platform == Aurora::kPlatformXbox) ? "dataxbox" : "data");
Expand All @@ -199,9 +199,9 @@ void KotOREngine::initResources() {
ResMan.addArchiveDir(Aurora::kArchiveRIM, "modules");

status("Loading main KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 0);
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 1);

if (indexOptionalArchive(Aurora::kArchiveKEY, "live1.key", 1)) {
if (indexOptionalArchive(Aurora::kArchiveKEY, "live1.key", 2)) {
status("Loading Xbox DLC KEY");
_hasLiveKey = true;
}
Expand Down
4 changes: 2 additions & 2 deletions src/engines/kotor2/kotor2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ void KotOR2Engine::initResources() {
if (_platform == Aurora::kPlatformXbox)
ResMan.addTypeAlias(Aurora::kFileTypeTXB, Aurora::kFileTypeTPC);

indexMandatoryDirectory("", 0, 0, 0);
indexMandatoryDirectory("", 0, 0, 1);

status("Adding extra archive directories");
ResMan.addArchiveDir(Aurora::kArchiveBIF, (_platform == Aurora::kPlatformXbox) ? "dataxbox" : "data");
Expand All @@ -188,7 +188,7 @@ void KotOR2Engine::initResources() {
ResMan.addArchiveDir(Aurora::kArchiveERF, "SuperModels");

status("Loading main KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 0);
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 1);

if (_platform != Aurora::kPlatformXbox) {
status("Loading high-res texture packs");
Expand Down
18 changes: 9 additions & 9 deletions src/engines/nwn/nwn.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ void NWNEngine::init() {
void NWNEngine::initResources() {
status("Setting base directory");
ResMan.registerDataBaseDir(_baseDirectory);
indexMandatoryDirectory("", 0, 0, 0);
indexMandatoryDirectory("", 0, 0, 1);

status("Adding extra archive directories");
ResMan.addArchiveDir(Aurora::kArchiveBIF, "data");
Expand All @@ -184,24 +184,24 @@ void NWNEngine::initResources() {
ResMan.addArchiveDir(Aurora::kArchiveERF, "texturepacks");

status("Loading main KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 0);
indexMandatoryArchive(Aurora::kArchiveKEY, "chitin.key", 1);

status("Loading expansions and patch KEYs");

// Base game patch
indexOptionalArchive(Aurora::kArchiveKEY, "patch.key", 1);
indexOptionalArchive(Aurora::kArchiveKEY, "patch.key", 2);

// Expansion 1: Shadows of Undrentide (SoU)
_hasXP1 = indexOptionalArchive(Aurora::kArchiveKEY, "xp1.key", 2);
indexOptionalArchive(Aurora::kArchiveKEY, "xp1patch.key", 3);
_hasXP1 = indexOptionalArchive(Aurora::kArchiveKEY, "xp1.key", 3);
indexOptionalArchive(Aurora::kArchiveKEY, "xp1patch.key", 4);

// Expansion 2: Hordes of the Underdark (HotU)
_hasXP2 = indexOptionalArchive(Aurora::kArchiveKEY, "xp2.key", 4);
indexOptionalArchive(Aurora::kArchiveKEY, "xp2patch.key", 5);
_hasXP2 = indexOptionalArchive(Aurora::kArchiveKEY, "xp2.key", 5);
indexOptionalArchive(Aurora::kArchiveKEY, "xp2patch.key", 6);

// Expansion 3: Kingmaker (resources also included in the final 1.69 patch)
_hasXP3 = indexOptionalArchive(Aurora::kArchiveKEY, "xp3.key", 6);
indexOptionalArchive(Aurora::kArchiveKEY, "xp3patch.key", 7);
_hasXP3 = indexOptionalArchive(Aurora::kArchiveKEY, "xp3.key", 7);
indexOptionalArchive(Aurora::kArchiveKEY, "xp3patch.key", 8);

status("Loading GUI textures");
indexMandatoryArchive(Aurora::kArchiveERF, "gui_32bit.erf" , 10);
Expand Down
36 changes: 18 additions & 18 deletions src/engines/nwn2/nwn2.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -213,24 +213,24 @@ void NWN2Engine::init() {

status("Loading main resource files");

indexMandatoryArchive(Aurora::kArchiveZIP, "2da.zip" , 0);
indexMandatoryArchive(Aurora::kArchiveZIP, "actors.zip" , 1);
indexMandatoryArchive(Aurora::kArchiveZIP, "animtags.zip" , 2);
indexMandatoryArchive(Aurora::kArchiveZIP, "convo.zip" , 3);
indexMandatoryArchive(Aurora::kArchiveZIP, "ini.zip" , 4);
indexMandatoryArchive(Aurora::kArchiveZIP, "lod-merged.zip" , 5);
indexMandatoryArchive(Aurora::kArchiveZIP, "music.zip" , 6);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_materials.zip", 7);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_models.zip" , 8);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_vfx.zip" , 9);
indexMandatoryArchive(Aurora::kArchiveZIP, "prefabs.zip" , 10);
indexMandatoryArchive(Aurora::kArchiveZIP, "scripts.zip" , 11);
indexMandatoryArchive(Aurora::kArchiveZIP, "sounds.zip" , 12);
indexMandatoryArchive(Aurora::kArchiveZIP, "soundsets.zip" , 13);
indexMandatoryArchive(Aurora::kArchiveZIP, "speedtree.zip" , 14);
indexMandatoryArchive(Aurora::kArchiveZIP, "templates.zip" , 15);
indexMandatoryArchive(Aurora::kArchiveZIP, "vo.zip" , 16);
indexMandatoryArchive(Aurora::kArchiveZIP, "walkmesh.zip" , 17);
indexMandatoryArchive(Aurora::kArchiveZIP, "2da.zip" , 1);
indexMandatoryArchive(Aurora::kArchiveZIP, "actors.zip" , 2);
indexMandatoryArchive(Aurora::kArchiveZIP, "animtags.zip" , 3);
indexMandatoryArchive(Aurora::kArchiveZIP, "convo.zip" , 4);
indexMandatoryArchive(Aurora::kArchiveZIP, "ini.zip" , 5);
indexMandatoryArchive(Aurora::kArchiveZIP, "lod-merged.zip" , 6);
indexMandatoryArchive(Aurora::kArchiveZIP, "music.zip" , 7);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_materials.zip", 8);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_models.zip" , 9);
indexMandatoryArchive(Aurora::kArchiveZIP, "nwn2_vfx.zip" , 10);
indexMandatoryArchive(Aurora::kArchiveZIP, "prefabs.zip" , 11);
indexMandatoryArchive(Aurora::kArchiveZIP, "scripts.zip" , 12);
indexMandatoryArchive(Aurora::kArchiveZIP, "sounds.zip" , 13);
indexMandatoryArchive(Aurora::kArchiveZIP, "soundsets.zip" , 14);
indexMandatoryArchive(Aurora::kArchiveZIP, "speedtree.zip" , 15);
indexMandatoryArchive(Aurora::kArchiveZIP, "templates.zip" , 16);
indexMandatoryArchive(Aurora::kArchiveZIP, "vo.zip" , 17);
indexMandatoryArchive(Aurora::kArchiveZIP, "walkmesh.zip" , 18);

status("Loading expansions resource files");

Expand Down
4 changes: 2 additions & 2 deletions src/engines/sonic/sonic.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,9 @@ void SonicEngine::run(const Common::UString &target) {

void SonicEngine::init() {
status("Indexing the ROM file");
indexMandatoryArchive(Aurora::kArchiveNDS, _romFile, 0);
indexMandatoryArchive(Aurora::kArchiveNDS, _romFile, 1);
status("Indexing the main HERF file");
indexMandatoryArchive(Aurora::kArchiveHERF, "test.herf", 1);
indexMandatoryArchive(Aurora::kArchiveHERF, "test.herf", 2);
}

void SonicEngine::playIntroVideos() {
Expand Down
2 changes: 1 addition & 1 deletion src/engines/thewitcher/thewitcher.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ void TheWitcherEngine::init() {
ResMan.addArchiveDir(Aurora::kArchiveERF, "data/modules/!final");

status("Loading main KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "main.key", 0);
indexMandatoryArchive(Aurora::kArchiveKEY, "main.key", 1);

status("Loading the localized base KEY");
indexMandatoryArchive(Aurora::kArchiveKEY, "localized.key", 10);
Expand Down

0 comments on commit 4bc41c9

Please sign in to comment.