From 89054f5d60908440b9e5592cf00dbb2ef9304a34 Mon Sep 17 00:00:00 2001 From: Randy Heit Date: Sat, 4 Apr 2015 18:39:22 -0500 Subject: [PATCH] Use filtering and LOADACS to autoload strfhelp.o - No more special case for STRFHELP in the executable! --- src/p_acs.cpp | 6 ------ wadsrc/static/{ => filter/strife}/acs/strfhelp.o | Bin wadsrc/static/filter/strife/loadacs.txt | 1 + 3 files changed, 1 insertion(+), 6 deletions(-) rename wadsrc/static/{ => filter/strife}/acs/strfhelp.o (100%) create mode 100644 wadsrc/static/filter/strife/loadacs.txt diff --git a/src/p_acs.cpp b/src/p_acs.cpp index 8894bc936..5556507b7 100644 --- a/src/p_acs.cpp +++ b/src/p_acs.cpp @@ -1409,12 +1409,6 @@ void DPlaneWatcher::Tick () // own behavior is loaded (if it has one). void FBehavior::StaticLoadDefaultModules () { - // When playing Strife, STRFHELP is always loaded. - if (gameinfo.gametype == GAME_Strife) - { - StaticLoadModule (Wads.CheckNumForName ("STRFHELP", ns_acslibrary)); - } - // Scan each LOADACS lump and load the specified modules in order int lump, lastlump = 0; diff --git a/wadsrc/static/acs/strfhelp.o b/wadsrc/static/filter/strife/acs/strfhelp.o similarity index 100% rename from wadsrc/static/acs/strfhelp.o rename to wadsrc/static/filter/strife/acs/strfhelp.o diff --git a/wadsrc/static/filter/strife/loadacs.txt b/wadsrc/static/filter/strife/loadacs.txt new file mode 100644 index 000000000..eb41c01ae --- /dev/null +++ b/wadsrc/static/filter/strife/loadacs.txt @@ -0,0 +1 @@ +strfhelp