0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

require_modification/campaign now defaults to yes (#8135)

Browse source 
It's better to be defensive with those default values,
especially now that the mp lobby code can automatically
download addons, having require_modification set to true
isn't inconvenient for the users either.

(The issue that the added comment is about isn't something
that was added in this commit)
This commit is contained in:
gfgtdf 2024-02-01 01:29:20 +01:00 • committed by GitHub
parent e506c2a1ff
commit 05d1e4b9ba
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game_initialization/lobby_data.cpp
View file

@ -205,7 +205,7 @@ game_info::game_info(const config& game, const std::vector<std::string>& install
mod_info.emplace_back(cfg["name"].str(), true);
info_stream << ' ' << mod_info.back().first;
if(cfg["require_modification"].to_bool(false)) {
if(cfg["require_modification"].to_bool(true)) {
if(auto mod = game_config.find_child("modification", "id", cfg["id"])) {
addon_req result = check_addon_version_compatibility(*mod, game);
addons_outcome = std::max(addons_outcome, result); // Elevate to most severe error level encountered so far

8
src/saved_game.cpp
View file

@ -230,6 +230,9 @@ void saved_game::set_defaults()
};
if(auto campaign = game_config.find_child("campaign", "id", classification_.campaign)) {
// FIXME: The mp code could use `require_scenario` to check whether we have the addon in question installed.
// But since [scenario]s are usually hidden behind `#ifdef CAMPAIGN_DEFINE` it would not be able to find them.
// Investigate how this should actually work.
bool require_campaign = campaign["require_campaign"].to_bool(true);
starting_point_["require_scenario"] = require_campaign;
}
@ -318,6 +321,7 @@ void saved_game::check_require_scenario()
config& content = scenario.add_child("content");
content["id"] = starting_point_["id"];
content["name"] = starting_point_["name"];
// TODO: would it be better if this ued the actual tagname ([multiplayer]/[scenario]) instead of always using [scenario]
content["type"] = "scenario";
mp_settings_.update_addon_requirements(scenario);
@ -330,9 +334,7 @@ void saved_game::load_non_scenario(const std::string& type, const std::string& i
// Note the addon_id if this mod is required to play the game in mp.
std::string require_attr = "require_" + type;
// By default, eras have "require_era = true", and mods have "require_modification = false".
// anything with no addon_id is from mainline, and therefore isn't required in the sense that all players already have it
const bool require_default = cfg["addon_id"].empty() ? false : type == "era";
const std::string version_default = cfg["addon_id"].empty() ? game_config::wesnoth_version.str() : "";
config non_scenario;
// if there's no addon_id, then this isn't an add-on
@ -340,7 +342,7 @@ void saved_game::load_non_scenario(const std::string& type, const std::string& i
non_scenario["name"] = cfg["addon_title"].str("mainline");
non_scenario["version"] = cfg["addon_version"].str(version_default);
non_scenario["min_version"] = cfg["addon_min_version"];
non_scenario["required"] = cfg[require_attr].to_bool(require_default);
non_scenario["required"] = cfg[require_attr].to_bool(!cfg["addon_id"].empty());
config& content = non_scenario.add_child("content");
content["id"] = id;
content["name"] = cfg["addon_title"].str(cfg["name"].str(""));