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

rename "current_player" -> "reserved_for"

Browse source 
Conflicts:
	src/game_initialization/connect_engine.cpp
	src/game_initialization/connect_engine.hpp
This commit is contained in:
gfgtdf 2014-11-03 02:26:07 +01:00
parent 005c99fc23
commit d0623f16da
3 changed files with 22 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
src/game_initialization/connect_engine.cpp
View file

@ -244,7 +244,7 @@ void connect_engine::import_user(const config& data, const bool observer,
// Check if user has a side(s) reserved for him.
BOOST_FOREACH(side_engine_ptr side, side_engines_) {
if (side->current_player() == username && side->player_id().empty()) {
if (side->reserved_for() == username && side->player_id().empty()) {
side->place_user(data);
side_assigned = true;
@ -270,9 +270,9 @@ void connect_engine::import_user(const config& data, const bool observer,
BOOST_FOREACH(side_engine_ptr user_side, side_engines_) {
if (user_side->player_id() == username) {
BOOST_FOREACH(side_engine_ptr side, side_engines_) {
if (!side->current_player().empty() &&
if (!side->reserved_for().empty() &&
side->player_id().empty() &&
side->current_player() == user_side->cfg()["side"]) {
side->reserved_for() == user_side->cfg()["side"]) {
side->place_user(data);
}
@ -796,7 +796,7 @@ void connect_engine::load_previous_sides_users(LOAD_USERS load_users)
BOOST_FOREACH(side_engine_ptr side, side_engines_) {
const std::string& save_id = side->save_id();
if (side_users.find(save_id) != side_users.end()) {
side->set_current_player(side_users[save_id]);
side->set_reserved_for(side_users[save_id]);
if (load_users == RESERVE_USERS) {
side->update_controller_options();
@ -831,7 +831,7 @@ side_engine::side_engine(const config& cfg, connect_engine& parent_engine,
color_(index),
gold_(cfg["gold"].to_int(100)),
income_(cfg["income"]),
current_player_(cfg["current_player"]),
reserved_for_(cfg["current_player"]),
player_id_(),
ai_algorithm_(),
waiting_to_choose_faction_(allow_changes_),
@ -842,7 +842,7 @@ side_engine::side_engine(const config& cfg, connect_engine& parent_engine,
// Check if this side should give its control to some other side.
const int side_cntr = cfg_["controller"].to_int(-1);
if (side_cntr != -1) {
current_player_ = lexical_cast<std::string>(side_cntr);
reserved_for_ = lexical_cast<std::string>(side_cntr);
// Remove this attribute to avoid locking side
// to non-existing controller type.
@ -869,7 +869,7 @@ side_engine::side_engine(const config& cfg, connect_engine& parent_engine,
set_controller(CNTR_EMPTY);
} else if (cfg_["controller"] == "ai") {
set_controller(CNTR_COMPUTER);
} else if (!current_player_.empty()) {
} else if (!reserved_for_.empty()) {
// Reserve a side for "current_player", unless the side
// is played by an AI.
set_controller(CNTR_RESERVED);
@ -938,7 +938,7 @@ config side_engine::new_config() const
// Side's current player is the player which is currently taken that side
// or the one which is reserved to it.
res["current_player"] = !player_id_.empty() ? player_id_ :
(controller_ == CNTR_RESERVED ? current_player_ : "");
(controller_ == CNTR_RESERVED ? reserved_for_ : "");
res["controller"] = (res["current_player"] == preferences::login()) ?
"human" : controller_names[controller_];
@ -988,7 +988,7 @@ config side_engine::new_config() const
break;
case CNTR_RESERVED: {
utils::string_map symbols;
symbols["playername"] = current_player_;
symbols["playername"] = reserved_for_;
description = vgettext("(Reserved for $playername)",symbols);
break;
@ -1127,7 +1127,7 @@ bool side_engine::available_for_user(const std::string& name) const
// Side is still available to someone.
return true;
}
if (controller_ == CNTR_RESERVED && current_player_ == name) {
if (controller_ == CNTR_RESERVED && reserved_for_ == name) {
// Side is available only for the player with specific name.
return true;
}
@ -1230,7 +1230,7 @@ void side_engine::update_controller_options()
add_controller_option(CNTR_COMPUTER, _("Computer Player"), "ai");
add_controller_option(CNTR_EMPTY, _("Empty"), "null");
if (!current_player_.empty()) {
if (!reserved_for_.empty()) {
add_controller_option(CNTR_RESERVED, _("Reserved"), "human");
}

13
src/game_initialization/connect_engine.hpp
View file

@ -195,9 +195,9 @@ public:
int income() const { return income_; }
void set_income(int income) { income_ = income; }
const std::string& player_id() const { return player_id_; }
const std::string& current_player() const { return current_player_; }
void set_current_player(const std::string& current_player)
{ current_player_ = current_player; }
const std::string& reserved_for() const { return reserved_for_; }
void set_reserved_for(const std::string& reserved_for)
{ reserved_for_ = reserved_for; }
const std::string& ai_algorithm() const { return ai_algorithm_; }
void set_ai_algorithm(const std::string& ai_algorithm)
{ ai_algorithm_ = ai_algorithm; }
@ -233,7 +233,12 @@ private:
int color_;
int gold_;
int income_;
std::string current_player_;
// set during create_engines constructor never set after that.
// the name of the player who is preferred for this side,
// if controller_ == reserved only this player can take this side.
// can also be a number of a side if this side shoudl be controlled
// by the player who controlls that side
std::string reserved_for_;
std::string player_id_;
std::string ai_algorithm_;

4
src/game_initialization/multiplayer_connect.cpp
View file

@ -62,7 +62,7 @@ connect::side::side(connect& parent, ng::side_engine_ptr engine) :
changed_(false),
label_player_number_(parent.video(), str_cast(engine_->index() + 1),
font::SIZE_LARGE, font::LOBBY_COLOR),
label_original_controller_(parent.video(), engine_->current_player(),
label_original_controller_(parent.video(), engine_->reserved_for(),
font::SIZE_SMALL),
label_gold_(parent.video(), "100", font::SIZE_SMALL, font::LOBBY_COLOR),
label_income_(parent.video(), _("Normal"), font::SIZE_SMALL,
@ -352,7 +352,7 @@ void connect::side::update_controller_ui()
combo_ai_algorithm_.hide(true);
label_original_controller_.hide(false);
label_original_controller_.set_text(engine_->current_player());
label_original_controller_.set_text(engine_->reserved_for());
}
} else {
combo_ai_algorithm_.hide(true);