Author: esr
Date: Sat Oct 4 21:43:57 2008
New Revision: 29879
URL: http://svn.gna.org/viewcvs/wesnoth?rev=29879&view=rev
Log:
Address bug #12316. I believe alink's diagnosis on the tracker was correct.
Modified:
trunk/src/multiplayer_connect.cpp
trunk/src/multiplayer_wait.cpp
trunk/src/playcampaign.cpp
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Sat Oct 4 21:43:57 2008
@@ -702,14 +702,14 @@
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 @@
*/
if(controller_ != CNTR_COMPUTER) {
// Only override names for computer controlled players
- trimmed["user_description"] = "";
+ trimmed["name"] = "";
}
trimmed.prune();
res.merge_with(trimmed);
Modified: trunk/src/multiplayer_wait.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_wait.cpp?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/src/multiplayer_wait.cpp (original)
+++ trunk/src/multiplayer_wait.cpp Sat Oct 4 21:43:57 2008
@@ -459,7 +459,7 @@
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"];
Modified: trunk/src/playcampaign.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/playcampaign.cpp?rev=29879&r1=29878&r2=29879&view=diff
==============================================================================
--- trunk/src/playcampaign.cpp (original)
+++ trunk/src/playcampaign.cpp Sat Oct 4 21:43:57 2008
@@ -505,7 +505,7 @@
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;
}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
