upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-28 01:52:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address bug #12316. I believe alink's diagnosis on the tracker was correct.

Browse Source
This commit is contained in:
Eric S. Raymond 2008-10-04 19:43:57 +00:00
parent a1c2d9d281
commit ba0876ab29
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/multiplayer_connect.cpp
View File

@ -702,14 +702,14 @@ config connect::side::get_config() const
assert(false);
break;
}
res["user_description"] = t_string(description, "wesnoth");
res["name"] = t_string(description, "wesnoth");
} else {
res["id"] = id_ + res["side"];
if(enabled_ && cfg_.get_attribute("save_id").empty()) {
res["save_id"] = id_ + res["side"].str();
}
res["user_description"] = id_;
res["name"] = id_;
}
if(enabled_) {
@ -795,7 +795,7 @@ config connect::side::get_config() const
*/
if(controller_ != CNTR_COMPUTER) {
// Only override names for computer controlled players
trimmed["user_description"] = "";
trimmed["name"] = "";
}
trimmed.prune();
res.merge_with(trimmed);

2
src/multiplayer_wait.cpp
View File

@ -459,7 +459,7 @@ void wait::generate_menu()
continue;
}
std::string description = sd["user_description"];
std::string description = sd["description"];
const std::string faction_id = sd["id"];
t_string side_name = sd["name"];

2
src/playcampaign.cpp
View File

@ -505,7 +505,7 @@ LEVEL_RESULT play_game(display& disp, game_state& gamestate, const config& game_
if (player) {
(**side)["current_player"] = player->name;
/** @todo TODO : remove (see TODO line 276 in server/game.cpp) */
(**side)["user_description"] = player->name;
(**side)["name"] = player->name;
}
(**side)["controller"] = ctr->second.controller;
}