libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 08:17:40 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

SCI: Minor resource code cleanup

Browse Source
This commit is contained in:
sluicebox 2024-06-19 16:26:34 -06:00
parent 38f3960298
commit 241910af57
2 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
engines/sci/resource/resource.cpp
View File

@ -630,7 +630,7 @@ Resource *ResourceManager::testResource(const ResourceId &id) const {
return _resMap.getValOrDefault(id, NULL);
}
int ResourceManager::addAppropriateSources() {
void ResourceManager::addAppropriateSources() {
#ifdef ENABLE_SCI32
_multiDiscAudio = false;
#endif
@ -676,7 +676,7 @@ int ResourceManager::addAppropriateSources() {
SearchMan.listMatchingMembers(files, "ressci.0##");
if (mapFiles.empty() || files.empty())
return 0;
return;
if (Common::File::exists("ressci.001") && !Common::File::exists("resource.aud")) {
_multiDiscAudio = true;
@ -718,7 +718,7 @@ int ResourceManager::addAppropriateSources() {
}
#else
} else
return 0;
return;
#endif
addPatchDir(".");
@ -740,17 +740,15 @@ int ResourceManager::addAppropriateSources() {
}
}
#endif
return 1;
}
int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fslist) {
void ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fslist) {
ResourceSource *map = nullptr;
Common::Array<ResourceSource *> sci21Maps;
#ifdef ENABLE_SCI32
ResourceSource *sci21PatchMap = 0;
const Common::FSNode *sci21PatchRes = 0;
ResourceSource *sci21PatchMap = nullptr;
const Common::FSNode *sci21PatchRes = nullptr;
_multiDiscAudio = false;
#endif
@ -787,7 +785,7 @@ int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fsl
}
if (!map && sci21Maps.empty())
return 0;
return;
#ifdef ENABLE_SCI32
if (sci21PatchMap && sci21PatchRes)
@ -818,8 +816,6 @@ int ResourceManager::addAppropriateSourcesForDetection(const Common::FSList &fsl
// This function is only called by the advanced detector, and we don't really need
// to add a patch directory or message.map here
return 1;
}
void ResourceManager::addScriptChunkSources() {

6
engines/sci/resource/resource.h
View File

@ -218,7 +218,7 @@ public:
output += intToBase36(getNumber(), 3); // Map
output += intToBase36(getTuple() >> 24, 2); // Noun
output += intToBase36((getTuple() >> 16) & 0xff, 2); // Verb
output += '.'; // Separator
output += '.'; // Separator
output += intToBase36((getTuple() >> 8) & 0xff, 2); // Cond
output += intToBase36(getTuple() & 0xff, 1); // Seq
@ -357,12 +357,12 @@ public:
/**
* Adds all of the resource files for a game
*/
int addAppropriateSources();
void addAppropriateSources();
/**
* Similar to the function above, only called from the fallback detector
*/
int addAppropriateSourcesForDetection(const Common::FSList &fslist); // TODO: Switch from FSList to Common::Archive?
void addAppropriateSourcesForDetection(const Common::FSList &fslist); // TODO: Switch from FSList to Common::Archive?
/**
* Looks up a resource's data.