Backported [ExtraPatches] section from 4.x

* in pre-4.1.9 configuration, without .dat autoloading.

artifacts/ddraw.ini

@@ -10,6 +10,16 @@ UseCommandLine=0
 ;This file can be placed in text\<language>\ for sfall to get the translations depending on the game language
 ;TranslationsINI=sfall\Translations.ini
 
+;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
+[ExtraPatches]
+;This section allows you to set multiple paths to folders containing mods or patches
+;Paths to folders and Fallout .dat files are supported
+;The PatchFileXX options are available from 0 to 99. Larger numbers take precedence over smaller numbers (same as patchXXX.dat)
+;The complete data load order is:
+;master_patches > critter_patches > PatchFile99..PatchFile0 > patchXXX.dat > sfall.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
+;PatchFile0=mods\RP_data
+;PatchFile1=
+
 ;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
 [Speed]
 ;Set to 1 to enable options related to the game speed adjustment (SpeedMulti#, SpeedKey#, SpeedModKey, and SpeedToggleKey)
@@ -271,7 +281,7 @@ UseFileSystemOverride=0
 
 ;Set to 1 to use the modified data load order for the engine to find game data
 ;Original: patchXXX.dat > critter_patches > critter_dat > f2_res_patches > f2_res_dat > master_patches > master_dat
-;Modified: master_patches > critter_patches > patchXXX.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
+;Modified: master_patches > critter_patches > extra_patches > patchXXX.dat > sfall.dat > critter_dat > f2_res_patches > f2_res_dat > master_dat
 ;This option is always enabled in 4.3/3.8.30 or later. The information is left for reference only
 DataLoadOrderPatch=1
 

sfall/Modules/LoadOrder.cpp

@@ -18,7 +18,7 @@
 
 #include "..\main.h"
 #include "..\FalloutEngine\Fallout2.h"
-
+#include "..\Utils.h"
 #include "LoadOrder.h"
 
 namespace sfall
@@ -37,6 +37,7 @@ static DWORD format;
 static bool cutsPatch   = false;
 
 static char sfallRes[14] = "sfall.dat"; // for sfall_XX.dat filename
+static std::vector<std::string> patchFiles;
 static std::vector<int> savPrototypes;
 
 void PlayerGenderCutsRestore() {
@@ -191,8 +192,20 @@ end:
 	}
 }
 
+static void InitExtraPatches() {
+	for (std::vector<std::string>::iterator it = patchFiles.begin(); it != patchFiles.end(); ++it) {
+		if (!it->empty()) fo::func::db_init(it->c_str(), 0);
+	}
+	// free memory
+	patchFiles.clear();
+	patchFiles.shrink_to_fit();
+}
+
 static void __fastcall game_init_databases_hook() { // eax = _master_db_handle
 	fo::PathNode* master_patches = *fo::ptr::master_db_handle;
+
+	/*if (!patchFiles.empty())*/ InitExtraPatches();
+
 	fo::PathNode* critter_patches = *fo::ptr::critter_db_handle;
 	fo::PathNode* paths = *fo::ptr::paths;    // beginning of the chain of paths
 	// insert master_patches/critter_patches at the beginning of the chain of paths
@@ -236,8 +249,43 @@ static void __fastcall game_init_databases_hook1() {
 	*fo::ptr::master_db_handle = node; // set pointer to master_patches node
 
 	fo::func::db_init(sfallRes, 0);
+	InitExtraPatches();
 }
 */
+static bool NormalizePath(std::string &path) {
+	if (path.find(':') != std::string::npos) return false;
+
+	int pos = 0;
+	do { // replace all '/' char with '\'
+		pos = path.find('/', pos);
+		if (pos != std::string::npos) path[pos] = '\\';
+	} while (pos != std::string::npos);
+
+	if (path.find(".\\") != std::string::npos || path.find("..\\") != std::string::npos) return false;
+	while (path.front() == '\\') path.erase(0, 1); // remove firsts '\'
+	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);
+		std::string patch = IniReader::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) {
+		for (size_t j = size - 1; j > i; --j) {
+			if (patchFiles[j] == patchFiles[i]) {
+				patchFiles[i].clear();
+			}
+		}
+	}
+}
+
 static void MultiPatchesPatch() {
 	//if (IniReader::GetConfigInt("Misc", "MultiPatches", 0)) {
 		dlog("Applying load multiple patches patch.", DL_INIT);
@@ -480,6 +528,7 @@ void LoadOrder::OnGameLoad() {
 
 void LoadOrder::init() {
 	SfallResourceFile(); // Add external sfall resource file (load order: > patchXXX.dat > sfall.dat > ... [last])
+	GetExtraPatches();
 	MultiPatchesPatch();
 
 	//if (IniReader::GetConfigInt("Misc", "DataLoadOrderPatch", 1)) {
@@ -489,7 +538,7 @@ void LoadOrder::init() {
 		HookCall(0x44436D, game_init_databases_hook);
 		SafeWrite8(0x4DFAEC, 0x1D); // error correction (ecx > ebx)
 		dlogr(" Done", DL_INIT);
-	//} else {
+	//} else /*if (!patchFiles.empty())*/ {
 	//	HookCall(0x44436D, game_init_databases_hook1);
 	//}