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

Removed GlobalScriptPaths option

Browse Source 
* storing global scripts across multiple paths is almost never needed,
and no publicly available mod really uses the option. If one doesn't
want to put their global scripts in the main folder, they can always
package the scripts in a mod dat file/folder instead.
This commit is contained in:
NovaRain
2026-04-10 08:54:46 +08:00
parent 802a49b627
commit bfbdea7e83
4 changed files with 27 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
artifacts/ddraw.ini
+2 -7
View File
@@ -841,11 +841,6 @@ DivisionOperatorFix=1
;XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX
[Scripts]
;Comma-separated list of masked paths to load global scripts from
;Use only a single backslash \ as the directory separator
;Paths outside of scripts folder are supported
GlobalScriptPaths=scripts\gl*.int,scripts\sfall\gl*.int
;Uncomment the option to specify an additional directory for ini files used by scripts
;The game will search for ini files first relative to this directory and then relative to the root directory if not found
;The path length is limited to 61 characters
@@ -885,8 +880,8 @@ SkipCompatModeCheck=0
;show_script_messages=1
;show_tile_num=1
;[sound]
;debug=0
;debug_sfxc=0
;debug=1
;debug_sfxc=1
;-------
DebugMode=0
sfall/Modules/HookScripts.cpp
+1 -2
View File
@@ -200,8 +200,7 @@ void HookScripts::LoadHookScript(const char* name, int id) {
static void InitHookScriptFile(const char* name, int id) {
ScriptProgram prog;
dlog("> ", DL_HOOK);
dlog(name, DL_HOOK);
dlog_f("> %s", DL_HOOK, name);
InitScriptProgram(prog, name);
if (prog.ptr) {
HookScript hook;
sfall/Modules/ScriptExtender.cpp
+22 -43
View File
@@ -18,14 +18,12 @@
#include <unordered_set>
#include <unordered_map>
#include <map>
#include <stack>
#include "..\main.h"
#include "..\FalloutEngine\Fallout2.h"
#include "..\InputFuncs.h"
#include "..\Logging.h"
#include "..\Utils.h"
#include "..\version.h"
#include "HookScripts.h"
#include "LoadGameHook.h"
@@ -103,8 +101,7 @@ static long executeTimedEventDepth = 0;
static std::stack<TimedEvent*> executeTimedEvents;
static std::list<TimedEvent> timerEventScripts;
static std::vector<std::string> globalScriptPathList;
static std::map<std::string, std::string> globalScriptFilesList;
static std::vector<std::string> globalScriptFilesList;
static std::vector<GlobalScript> globalScripts;
static std::unordered_set<fo::Program*> checkedScripts;
@@ -427,11 +424,9 @@ void __fastcall SetSelfObject(fo::Program* script, fo::GameObject* obj) {
}
// loads script from .int file into a ScriptProgram struct, filling script pointer and proc lookup table
void InitScriptProgram(ScriptProgram &prog, const char* fileName, bool fullPath) {
void InitScriptProgram(ScriptProgram &prog, const char* fileName) {
prog.initialized = false;
fo::Program* scriptPtr = (fullPath)
? fo::func::allocateProgram(fileName)
: fo::func::loadProgram(fileName);
fo::Program* scriptPtr = fo::func::loadProgram(fileName);
if (scriptPtr) {
prog.ptr = scriptPtr;
@@ -505,10 +500,9 @@ static void LoadGlobalScriptsList() {
dlogr("Running global scripts...", DL_SCRIPT);
ScriptProgram prog;
for (const auto& item : globalScriptFilesList) {
auto &scriptFile = item.second;
dlog("> " + scriptFile, DL_SCRIPT);
InitScriptProgram(prog, scriptFile.c_str(), true);
for (const auto& scriptFile : globalScriptFilesList) {
dlog_f("> %s.int", DL_SCRIPT, scriptFile.c_str());
InitScriptProgram(prog, scriptFile.c_str());
if (prog.ptr) {
GlobalScript gscript = GlobalScript(prog);
gscript.startProc = prog.procLookup[fo::Scripts::ScriptProc::start]; // get 'start' procedure position
@@ -536,36 +530,27 @@ static void InitGlobalScripts() {
isGlobalScriptLoading = 0;
}
static void PrepareGlobalScriptsListByMask() {
static void PrepareGlobalScriptsList() {
globalScriptFilesList.clear();
for (const auto& fileMask : globalScriptPathList) {
char** filenames;
auto basePath = fileMask.substr(0, fileMask.find_last_of("\\/") + 1); // path to scripts without mask
int count = fo::func::db_get_file_list(fileMask.c_str(), &filenames);
for (int i = 0; i < count; i++) {
char* name = _strlwr(filenames[i]); // name of the script in lower case
if (name[0] != 'g' || name[1] != 'l') continue; // fix bug in db_get_file_list fuction (if the script name begins with a non-Latin character)
char** filenames;
int count = fo::func::db_get_file_list("scripts\\gl*.int", &filenames);
std::string baseName(name);
int lastDot = baseName.find_last_of('.');
if ((baseName.length() - lastDot) > 4) continue; // skip files with invalid extension (bug in db_get_file_list fuction)
for (int i = 0; i < count; i++) {
char* name = _strlwr(filenames[i]); // name of the script in lower case
if (name[0] != 'g' || name[1] != 'l') continue; // fix bug in db_get_file_list fuction (if the script name begins with a non-Latin character)
baseName = baseName.substr(0, lastDot); // script name without extension
if (basePath != fo::var::script_path_base || !IsGameScript(baseName.c_str())) {
dlog_f("Found global script: %s\n", DL_SCRIPT, name);
std::string fullPath(basePath);
fullPath += name;
// prevent loading global scripts with the same name from different directories
if (globalScriptFilesList.find(baseName) != globalScriptFilesList.end()) {
fo::func::debug_printf("\n[SFALL] Script: %s will not be executed. A script with the same name already exists in another directory.", fullPath);
continue;
}
globalScriptFilesList.emplace(std::move(baseName), std::move(fullPath)); // script files should be sorted in alphabetical order
}
std::string baseName(name);
int lastDot = baseName.find_last_of('.');
if ((baseName.length() - lastDot) > 4) continue; // skip files with invalid extension (bug in db_get_file_list fuction)
baseName = baseName.substr(0, lastDot); // script name without extension
if (!IsGameScript(baseName.c_str())) {
dlog_f("Found global script: %s\n", DL_SCRIPT, name);
globalScriptFilesList.push_back(std::move(baseName));
}
fo::func::db_free_file_list(&filenames, 0);
}
fo::func::db_free_file_list(&filenames, 0);
globalScripts.reserve(globalScriptFilesList.size());
checkedScripts.reserve(globalScriptFilesList.size());
}
@@ -578,9 +563,8 @@ static void LoadGlobalScripts() {
dlogr("Loading global scripts:", DL_SCRIPT|DL_INIT);
if (!listIsPrepared) { // only once
PrepareGlobalScriptsListByMask();
PrepareGlobalScriptsList();
listIsPrepared = !alwaysFindScripts;
if (listIsPrepared) globalScriptPathList.clear(); // clear path list, it is no longer needed
}
dlogr("Finished loading global scripts.", DL_SCRIPT|DL_INIT);
}
@@ -942,11 +926,6 @@ void ScriptExtender::init() {
OnInputLoop() += RunGlobalScriptsOnInput;
Worldmap::OnWorldmapLoop() += RunGlobalScriptsOnWorldMap;
globalScriptPathList = IniReader::GetConfigList("Scripts", "GlobalScriptPaths", "scripts\\gl*.int");
for (size_t i = 0; i < globalScriptPathList.size(); i++) {
ToLowerCase(globalScriptPathList[i]);
}
iniConfigFolder = IniReader::GetConfigString("Scripts", "IniConfigFolder", "");
size_t len = iniConfigFolder.length();
if (len) {
sfall/Modules/ScriptExtender.h
+2 -3
View File
@@ -97,9 +97,8 @@ void __fastcall SetSelfObject(fo::Program* script, fo::GameObject* obj);
// loads script from .int file into a ScriptProgram struct, filling script pointer and proc lookup table
// prog - reference to program structure
// fileName - the script file name without extension (if fullPath is false) or a full file path (if fullPath is true)
// fullPath - controls how fileName is used (see above)
void InitScriptProgram(ScriptProgram &prog, const char* fileName, bool fullPath = false);
// fileName - the script file name without extension
void InitScriptProgram(ScriptProgram &prog, const char* fileName);
// init program after load, needs to be called once
void RunScriptProgram(ScriptProgram &prog);