Author: alink
Date: Thu Apr 2 01:18:54 2009
New Revision: 34379
URL: http://svn.gna.org/viewcvs/wesnoth?rev=34379&view=rev
Log:
Fix bug #13243, missing column and wrong order of info in some multiplayer UI.
This mainly revert r29879 except the change in playcampaign.cpp which seems to
have changed too much to need it. Not sure yet how to backport it to 1.6.
It also resurrect a (internal, I think) user_description key but any name works
Modified:
trunk/src/multiplayer_connect.cpp
trunk/src/multiplayer_wait.cpp
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=34379&r1=34378&r2=34379&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Thu Apr 2 01:18:54 2009
@@ -682,14 +682,14 @@
assert(false);
break;
}
- res["name"] = t_string(description, "wesnoth");
+ res["user_description"] = 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["name"] = id_;
+ res["user_description"] = id_;
}
if(enabled_) {
@@ -775,7 +775,7 @@
*/
if(controller_ != CNTR_COMPUTER) {
// Only override names for computer controlled players
- trimmed["name"] = "";
+ trimmed["user_description"] = "";
}
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=34379&r1=34378&r2=34379&view=diff
==============================================================================
--- trunk/src/multiplayer_wait.cpp (original)
+++ trunk/src/multiplayer_wait.cpp Thu Apr 2 01:18:54 2009
@@ -453,7 +453,7 @@
continue;
}
- std::string description = sd["description"];
+ std::string description = sd["user_description"];
const std::string faction_id = sd["id"];
t_string side_name = sd["name"];
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
