fallout2sfall/sfall
0
0
Fork 0
mirror of https://github.com/sfall-team/sfall.git synced 2026-07-27 16:52:34 -07:00
Code Issues Packages Projects Releases Wiki Activity

Changed the priority of files in AutoSearchPath

Browse Source 
* now they have higher priority than the PatchFileXX options.

Minor code edits/fixes.
This commit is contained in:
NovaRain
2020-04-30 10:13:44 +08:00
parent 35d2491bcb
commit 007b415740
6 changed files with 35 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sfall/Modules/LoadOrder.cpp
+10 -9
View File
@@ -109,7 +109,7 @@ static fo::PathNode* __fastcall RemoveDatabase(const char* pathPatches) {
while (paths) {
if (_stricmp(paths->path, pathPatches) == 0) { // found path
fo::PathNode* nextPaths = paths->next; // pointer to the node of the next path
// TODO: need to check if this condition is used correctly
// TODO: need to check if this condition is used correctly (everything seems to be in order here)
if (paths != _paths)
_paths->next = nextPaths; // replace the pointer in the previous node, removing the current(found) path from the chain
else // if the current node is equal to the previous node
@@ -204,7 +204,15 @@ static bool NormalizePath(std::string &path) {
return true;
}
// Patches placed at the back of the vector will have priority in the chain over the front (previous) patches
static void GetExtraPatches() {
char patchFile[12] = "PatchFile";
for (int i = 0; i < 100; i++) {
_itoa(i, &patchFile[9], 10);
auto patch = GetConfigString("ExtraPatches", patchFile, "", MAX_PATH);
if (patch.empty() || !NormalizePath(patch) || GetFileAttributes(patch.c_str()) == INVALID_FILE_ATTRIBUTES) continue;
patchFiles.push_back(patch);
}
std::string searchPath = GetConfigString("ExtraPatches", "AutoSearchPath", "mods\\", MAX_PATH);
if (!searchPath.empty() && NormalizePath(searchPath)) {
if (searchPath.back() != '\\') searchPath += "\\";
@@ -223,13 +231,6 @@ static void GetExtraPatches() {
FindClose(hFind);
}
}
char patchFile[12] = "PatchFile";
for (int i = 0; i < 100; i++) {
_itoa(i, &patchFile[9], 10);
auto patch = GetConfigString("ExtraPatches", patchFile, "", MAX_PATH);
if (patch.empty() || !NormalizePath(patch) || GetFileAttributes(patch.c_str()) == INVALID_FILE_ATTRIBUTES) continue;
patchFiles.push_back(patch);
}
// Remove first duplicates
size_t size = patchFiles.size();
for (size_t i = 1; i < size; ++i) {
@@ -381,7 +382,7 @@ end:
}
}
#define _F_SAV (const char*)0x50A480
#define _F_SAV (const char*)0x50A480
#define _F_PROTO_CRITTERS (const char*)0x50A490
static void RemoveSavFiles() {