upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-11 17:16:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

MP scenario gold, income, team, and colour are only suggestions.

Browse Source
This commit is contained in:
Danny Daemonic 2006-08-31 13:32:51 +00:00
parent ec9a3ee6e1
commit dae9e9d501
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/multiplayer_connect.cpp
View File

@ -150,14 +150,14 @@ connect::side::side(connect& parent, const config& cfg, int index) :
combo_leader_.set_items(leader_name_pseudolist); combo_leader_.set_items(leader_name_pseudolist);
combo_leader_.set_selected(0); combo_leader_.set_selected(0);
} else if(parent_->params_.use_map_settings) { } else if(parent_->params_.use_map_settings) {
//lock gold and income sliders if those are set by the scenario //gold, income, team, and colour are only suggestions unless explicitly locked
if(!cfg_["gold"].empty()) if(cfg_["gold_lock"] == "yes")
slider_gold_.enable(false); slider_gold_.enable(false);
if(!cfg_["income"].empty()) if(cfg_["income_lock"] == "yes")
slider_income_.enable(false); slider_income_.enable(false);
if(!cfg_["team_name"].empty()) if(cfg_["team_lock"] == "yes")
combo_team_.enable(false); combo_team_.enable(false);
if(!cfg_["colour"].empty()) if(cfg_["colour_lock"] == "yes")
combo_colour_.enable(false); combo_colour_.enable(false);
//set the leader //set the leader
@ -555,9 +555,10 @@ config connect::side::get_config() const
if(parent_->params_.use_map_settings && enabled_) { if(parent_->params_.use_map_settings && enabled_) {
config trimmed = cfg_; config trimmed = cfg_;
trimmed["side"] = "";
trimmed["controller"] = ""; trimmed["controller"] = "";
trimmed["description"] = ""; trimmed["description"] = "";
trimmed["side"] = ""; trimmed["team_name"] = "";
if(controller_ != CNTR_COMPUTER) { if(controller_ != CNTR_COMPUTER) {
//only override names for computer controlled players //only override names for computer controlled players
trimmed["user_description"] = ""; trimmed["user_description"] = "";