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

fix https://gna.org/bugs/?7746

Browse source 
improve the way allow_player tag are handled

host no longer take side if no allowes and controller are set as
config set it
This commit is contained in:
Serge Martin 2006-11-16 17:35:59 +00:00
parent 7c1d4926f0
commit 40acef116d
2 changed files with 35 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
src/multiplayer_connect.cpp
View file

@ -62,16 +62,20 @@ connect::side::side(connect& parent, const config& cfg, int index) :
slider_income_(parent.video()),
label_gold_(parent.video(), "100", font::SIZE_SMALL, font::LOBBY_COLOUR),
label_income_(parent.video(), _("Normal"), font::SIZE_SMALL, font::LOBBY_COLOUR),
enabled_(!parent_->params_.saved_game),
changed_(false),
allow_player_(utils::string_bool(cfg_["allow_player"], true)),
enabled_(!parent_->params_.saved_game), changed_(false),
llm_(parent.era_sides_, &parent.game_data_, enabled_ ? &combo_leader_ : NULL)
{
if(utils::string_bool(cfg_["allow_player"], true) && enabled_) {
if(allow_player_ && enabled_) {
controller_ = parent_->default_controller_;
} else {
for(size_t i = CNTR_NETWORK; i != CNTR_LAST; ++i) {
size_t i = CNTR_NETWORK;
//if player isn't allowed, network controller doesn't make sense
if (!allow_player_)
++i;
for(; i != CNTR_LAST; ++i) {
if(cfg_["controller"] == controller_names[i]) {
controller_ = (mp::controller)i;
controller_ = static_cast<mp::controller>(i);
break;
}
}
@ -248,7 +252,8 @@ connect::side::side(const side& a) :
combo_team_(a.combo_team_), combo_colour_(a.combo_colour_),
slider_gold_(a.slider_gold_), slider_income_(a.slider_income_),
label_gold_(a.label_gold_), label_income_(a.label_income_),
enabled_(a.enabled_), changed_(a.changed_), llm_(a.llm_)
allow_player_(a.allow_player_), enabled_(a.enabled_),
changed_(a.changed_), llm_(a.llm_)
{
llm_.set_combo((enabled_ && leader_.empty()) ? &combo_leader_ : NULL);
}
@ -366,7 +371,12 @@ bool connect::side::changed()
bool connect::side::available() const
{
return controller_ == CNTR_NETWORK && id_.empty();
return allow_player_ && controller_ == CNTR_NETWORK && id_.empty();
}
bool connect::side::allow_player() const
{
return allow_player_;
}
void connect::side::update_controller_ui()
@ -774,13 +784,21 @@ connect::connect(display& disp, const config& game_config, const game_data& data
throw config::error(_("The scenario is invalid because it has no sides."));
}
int side_choice = 0;
//take the first available side or available side with id == login
int side_choice = -1;
for(side_list::const_iterator s = sides_.begin(); s != sides_.end(); ++s) {
if(s->get_save_id() == preferences::login()) {
side_choice = s - sides_.begin();
if (s->allow_player()) {
if (side_choice == -1)
side_choice = s - sides_.begin();
if(s->get_save_id() == preferences::login()) {
side_choice = s - sides_.begin();
break;
}
}
}
sides_[side_choice].set_id(preferences::login());
if (side_choice != -1)
sides_[side_choice].set_id(preferences::login());
update_playerlist_state();

7
src/multiplayer_connect.hpp
View file

@ -58,9 +58,13 @@ public:
// the "type=" defining the leader type, else it does not.
config get_config() const;
// Returns true if this side is waiting for a network player.
// Returns true if this side is waiting for a network player
// and players allowed
bool available() const;
//return true if players are allowed to take this side
bool allow_player() const;
// Sets the controller of a side.
void set_controller(mp::controller controller);
mp::controller get_controller() const;
@ -126,6 +130,7 @@ public:
gui::label label_gold_;
gui::label label_income_;
bool allow_player_;
bool enabled_;
bool changed_;
leader_list_manager llm_;