From 04d7f4aefa759b69830fd96a1c365171322c6921 Mon Sep 17 00:00:00 2001 From: NovaRain Date: Thu, 23 May 2019 17:04:51 +0800 Subject: [PATCH] Removed LoadProtoMaxLimit option from ddraw.ini. * now the proto limit is always handled by set_proto_data function when needed, since the related issue was originally from using it to process lots of protos at once. --- artifacts/ddraw.ini | 4 ---- sfall/Modules/Objects.cpp | 13 +------------ 2 files changed, 1 insertion(+), 16 deletions(-) diff --git a/artifacts/ddraw.ini b/artifacts/ddraw.ini index b98ca32c..0fb211dd 100644 --- a/artifacts/ddraw.ini +++ b/artifacts/ddraw.ini @@ -366,10 +366,6 @@ CorpseDeleteTime=6 ;Set to 1 (or some higher number if needed, the maximum is 127) to prevent 100% CPU use ProcessorIdle=-1 -;Set a number of how many protos per type can be loaded into memory at once (valid range: 512..4096) -;Set to -1 to let set_proto_data script function automatically increase the limit when needed -LoadProtoMaxLimit=-1 - ;Set to 1 if using the hero appearance mod ;You can add AppChCrt.frm and AppChEdt.frm files to art\intrface\ to set a custom background for the character screen EnableHeroAppearanceMod=0 diff --git a/sfall/Modules/Objects.cpp b/sfall/Modules/Objects.cpp index 7d54e5b2..5531e819 100644 --- a/sfall/Modules/Objects.cpp +++ b/sfall/Modules/Objects.cpp @@ -127,9 +127,7 @@ end: } void Objects::LoadProtoAutoMaxLimit() { - if (maxCountProto != -1) { - MakeCall(0x4A21B2, proto_ptr_hack); - } + MakeCall(0x4A21B2, proto_ptr_hack); } void Objects::init() { @@ -137,15 +135,6 @@ void Objects::init() { RestoreObjUnjamAllLocks(); }; - int maxlimit = GetConfigInt("Misc", "LoadProtoMaxLimit", -1); - if (maxlimit != -1) { - maxCountProto = -1; - if (maxlimit > 512) { - if (maxlimit > 4096) maxlimit = 4096; - SafeWrite32(0x4A21B3, maxlimit); - } - } - HookCall(0x4A38A5, new_obj_id_hook); SafeWrite8(0x4A38B3, 0x90); // fix ID increment