Rim/t7x
Rim/t7x
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Merge pull request #748 from diamante0018/main

Browse Source 
fix(scripts): fix for me being a bit silly
This commit is contained in:
Edo 2023-05-20 11:56:18 +01:00 committed by GitHub
commit a4b2e2b259
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/component/script.cpp
View File

@ -113,7 +113,7 @@ namespace script
} }
} }
std::optional<std::string> get_game_type_specific_folder() std::optional<std::filesystem::path> get_game_type_specific_folder()
{ {
switch (game::Com_SessionMode_GetMode()) switch (game::Com_SessionMode_GetMode())
{ {
@ -135,7 +135,7 @@ namespace script
const auto data_folder = game::get_appdata_path() / "data"; const auto data_folder = game::get_appdata_path() / "data";
const auto boiii_folder = host.get_folder() / "boiii"; const auto boiii_folder = host.get_folder() / "boiii";
const auto load = [&data_folder, &boiii_folder](const std::string& folder, const bool is_custom) const auto load = [&data_folder, &boiii_folder](const std::filesystem::path& folder, const bool is_custom)
{ {
load_scripts_folder((data_folder / folder).string(), is_custom); load_scripts_folder((data_folder / folder).string(), is_custom);
load_scripts_folder((boiii_folder / folder).string(), is_custom); load_scripts_folder((boiii_folder / folder).string(), is_custom);
@ -149,7 +149,7 @@ namespace script
if (const auto game_type = get_game_type_specific_folder(); game_type.has_value()) if (const auto game_type = get_game_type_specific_folder(); game_type.has_value())
{ {
load(game_type.value(), true); load("custom_scripts" / game_type.value(), true);
} }
} }