From 82c7b4c7ebf8ebbd927a27a8cedda67c4c50a464 Mon Sep 17 00:00:00 2001 From: pentarctagon Date: Wed, 25 Sep 2024 23:58:38 -0500 Subject: [PATCH] use the correct editor dir location fixes issue brought up on the forums: https://forums.wesnoth.org/viewtopic.php?t=58725 --- src/filesystem_common.cpp | 4 ++-- src/game_initialization/create_engine.cpp | 8 ++++---- src/menu_events.cpp | 3 +-- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/filesystem_common.cpp b/src/filesystem_common.cpp index 8eff92cc4d6..566cc679f10 100644 --- a/src/filesystem_common.cpp +++ b/src/filesystem_common.cpp @@ -304,7 +304,7 @@ std::string read_map(const std::string& name) } if(res.empty()) { - res = read_file(get_user_data_dir() + "/editor/maps/" + name); + res = read_file(get_legacy_editor_dir() + "/maps/" + name); } return res; @@ -323,7 +323,7 @@ std::string read_scenario(const std::string& name) } if(res.empty()) { - res = read_file(get_user_data_dir() + "/editor/scenarios/" + name); + res = read_file(get_legacy_editor_dir() + "/scenarios/" + name); } return res; diff --git a/src/game_initialization/create_engine.cpp b/src/game_initialization/create_engine.cpp index 108ed6d519f..1ad7835dafb 100644 --- a/src/game_initialization/create_engine.cpp +++ b/src/game_initialization/create_engine.cpp @@ -265,10 +265,10 @@ create_engine::create_engine(saved_game& state) dependency_manager_.reset(new depcheck::manager(game_config_, state_.classification().is_multiplayer())); // TODO: the editor dir is already configurable, is the preferences value - filesystem::get_files_in_dir(filesystem::get_user_data_dir() + "/editor/maps", &user_map_names_, + filesystem::get_files_in_dir(filesystem::get_legacy_editor_dir() + "/maps", &user_map_names_, nullptr, filesystem::name_mode::FILE_NAME_ONLY); - filesystem::get_files_in_dir(filesystem::get_user_data_dir() + "/editor/scenarios", &user_scenario_names_, + filesystem::get_files_in_dir(filesystem::get_legacy_editor_dir() + "/scenarios", &user_scenario_names_, nullptr, filesystem::name_mode::FILE_NAME_ONLY); DBG_MP << "initializing all levels, eras and mods"; @@ -687,10 +687,10 @@ void create_engine::init_all_levels() { config data; try { - read(data, *preprocess_file(filesystem::get_user_data_dir() + "/editor/scenarios/" + user_scenario_names_[i])); + read(data, *preprocess_file(filesystem::get_legacy_editor_dir() + "/scenarios/" + user_scenario_names_[i])); } catch(const config::error & e) { ERR_CF << "Caught a config error while parsing user made (editor) scenarios:\n" << e.message; - ERR_CF << "Skipping file: " << (filesystem::get_user_data_dir() + "/editor/scenarios/" + user_scenario_names_[i]); + ERR_CF << "Skipping file: " << (filesystem::get_legacy_editor_dir() + "/scenarios/" + user_scenario_names_[i]); continue; } diff --git a/src/menu_events.cpp b/src/menu_events.cpp index f74dbd50cc1..c9a692afaac 100644 --- a/src/menu_events.cpp +++ b/src/menu_events.cpp @@ -149,8 +149,7 @@ void menu_handler::status_table() void menu_handler::save_map() { - const std::string& input_name - = filesystem::get_dir(filesystem::get_dir(filesystem::get_user_data_dir() + "/editor") + "/maps/"); + const std::string input_name = filesystem::get_legacy_editor_dir() + "/maps/"; gui2::dialogs::file_dialog dlg;