Author: jtn
Date: Mon Nov 30 22:19:48 2015
New Revision: 30825
URL: http://svn.gna.org/viewcvs/freeciv?rev=30825&view=rev
Log:
pick_random_player_name() could in rare circumstances fail to find a
unique nation leader name even if one was available, leading to
unnecessary use of "Player no. 3".
See gna bug #24129.
Modified:
branches/S2_5/server/srv_main.c
Modified: branches/S2_5/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/srv_main.c?rev=30825&r1=30824&r2=30825&view=diff
==============================================================================
--- branches/S2_5/server/srv_main.c (original)
+++ branches/S2_5/server/srv_main.c Mon Nov 30 22:19:48 2015
@@ -2271,24 +2271,31 @@
}
/****************************************************************************
- Returns a random ruler name picked from given nation ruler names, given
- that nation's number. If it fails it iterates through "Player 1",
- "Player 2", ... until an unused name is found.
+ Returns a random ruler name picked from given nation's ruler names
+ that is not already in use.
+ May return NULL if no unique name is available.
****************************************************************************/
const char *pick_random_player_name(const struct nation_type *pnation)
{
const char *choice = NULL;
- int i = 0;
+ struct nation_leader_list *candidates = nation_leader_list_new();
+ int n;
nation_leader_list_iterate(nation_leaders(pnation), pleader) {
const char *name = nation_leader_name(pleader);
if (NULL == player_by_name(name)
- && NULL == player_by_user(name)
- && 0 == fc_rand(++i)) {
- choice = name;
+ && NULL == player_by_user(name)) {
+ nation_leader_list_append(candidates, pleader);
}
} nation_leader_list_iterate_end;
+
+ n = nation_leader_list_size(candidates);
+ if (n > 0) {
+ choice = nation_leader_name(nation_leader_list_get(candidates,
+ fc_rand(n)));
+ }
+ nation_leader_list_destroy(candidates);
return choice;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
