Author: noyga
Date: Sun May 18 12:09:07 2008
New Revision: 26687
URL: http://svn.gna.org/viewcvs/wesnoth?rev=26687&view=rev
Log:
Document r26679
Modified:
trunk/changelog
trunk/src/multiplayer_connect.cpp
Modified: trunk/changelog
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/changelog?rev=26687&r1=26686&r2=26687&view=diff
==============================================================================
--- trunk/changelog (original)
+++ trunk/changelog Sun May 18 12:09:07 2008
@@ -51,6 +51,8 @@
* WML engine:
* titlescreen is now randomly loaded
* fix [teleport] capturing villages with the wrong side (bug #11683)
+ * SideWML recruit= no longer locks the faction except if explicitely wanted
+ with the new key faction_from_recruit=yes
* wesnothd
* added expiration time to bans
* added restart command to server that does gracefull restart
Modified: trunk/src/multiplayer_connect.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/multiplayer_connect.cpp?rev=26687&r1=26686&r2=26687&view=diff
==============================================================================
--- trunk/src/multiplayer_connect.cpp (original)
+++ trunk/src/multiplayer_connect.cpp Sun May 18 12:09:07 2008
@@ -274,7 +274,7 @@
find.push_back(leader_);
search_field = "leader";
}
-
+ // Pick the first faction with the greater amount of
data matching the criteria
int faction_index = 0;
int best_score = 0;
std::vector<config*>::const_iterator faction =
parent.era_sides_.begin();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits