From 9d2c10aae698f8e8e92ad5c65b66c2d8df571b04 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Fri, 26 Mar 2021 12:29:18 +0800 Subject: [PATCH] Removed DataLoadOrderPatch from ddraw.ini (always enabled) --- artifacts/ddraw.ini | 3 ++- sfall/LoadOrder.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index e1944956..878b34b7 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -266,7 +266,8 @@ 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 -DataLoadOrderPatch=1 +;This option is always enabled in 4.3/3.8.30 or later. The information is left for reference only +;DataLoadOrderPatch=1 ;To change the default and starting player models, uncomment the next four lines. ;The default models can also be changed ingame via script diff --git a/sfall/LoadOrder.cpp b/sfall/LoadOrder.cpp index 6f4a9557..c87413c2 100644 --- a/sfall/LoadOrder.cpp +++ b/sfall/LoadOrder.cpp @@ -84,7 +84,7 @@ static void __fastcall game_init_databases_hook() { // eax = _master_db_handle master_patches->next = paths; // master_patches.next -> paths *ptr_paths = master_patches; // set master_patches node at the beginning of the chain of paths } - +/* static void __fastcall game_init_databases_hook1() { char masterPatch[MAX_PATH]; iniGetString("system", "master_patches", "", masterPatch, MAX_PATH - 1, (const char*)FO_VAR_gconfig_file_name); @@ -96,7 +96,7 @@ static void __fastcall game_init_databases_hook1() { } *ptr_master_db_handle = node; // set pointer to master_patches node } - +*/ static void MultiPatchesPatch() { //if (GetConfigInt("Misc", "MultiPatches", 0)) { dlog("Applying load multiple patches patch.", DL_INIT); @@ -291,16 +291,16 @@ void LoadOrder_OnGameLoad() { void LoadOrder_Init() { MultiPatchesPatch(); - if (GetConfigInt("Misc", "DataLoadOrderPatch", 1)) { + //if (GetConfigInt("Misc", "DataLoadOrderPatch", 1)) { dlog("Applying data load order patch.", DL_INIT); MakeCall(0x444259, game_init_databases_hack1); MakeCall(0x4442F1, game_init_databases_hack2); HookCall(0x44436D, game_init_databases_hook); SafeWrite8(0x4DFAEC, 0x1D); // error correction (ecx > ebx) dlogr(" Done", DL_INIT); - } else { - HookCall(0x44436D, game_init_databases_hook1); - } + //} else { + // HookCall(0x44436D, game_init_databases_hook1); + //} // Redefined behavior for replacing art aliases for critters // first check the existence of the art file of the current critter and then replace the art alias if file not found