From b94d2633d234765fb251d20e86144cfade9392c7 Mon Sep 17 00:00:00 2001 From: m Date: Mon, 15 May 2023 18:07:25 -0500 Subject: [PATCH] very tiny cleanup [skip ci] --- src/client/component/script.cpp | 19 ++++++++++--------- 1 file changed, 10 insertions(+), 9 deletions(-) diff --git a/src/client/component/script.cpp b/src/client/component/script.cpp index 60522061..1e3cdb75 100644 --- a/src/client/component/script.cpp +++ b/src/client/component/script.cpp @@ -117,15 +117,17 @@ namespace script void load_scripts() { const utils::nt::library host{}; - load_scripts_folder((game::get_appdata_path() / "data"/ "scripts").string(), false); - load_scripts_folder((host.get_folder() / "boiii" / "scripts").string(), false); - } - void load_custom_scripts() - { - const utils::nt::library host{}; - load_scripts_folder((game::get_appdata_path() / "data" / "custom_scripts").string(), true); - load_scripts_folder((host.get_folder() / "boiii" / "custom_scripts").string(), true); + const auto data_folder = game::get_appdata_path() / "data"; + const auto boiii_folder = host.get_folder() / "boiii"; + + // scripts folder is for overriding stock scripts the game uses + load_scripts_folder((data_folder / "scripts").string(), false); + load_scripts_folder((boiii_folder / "scripts").string(), false); + + // custom_scripts is for loading completely custom scripts the game doesn't use + load_scripts_folder((data_folder / "custom_scripts").string(), true); + load_scripts_folder((boiii_folder / "custom_scripts").string(), true); } game::RawFile* db_find_x_asset_header_stub(const game::XAssetType type, const char* name, @@ -165,7 +167,6 @@ namespace script game::GScr_LoadGametypeScript(); load_scripts(); - load_custom_scripts(); } int server_script_checksum_stub()