Author: jtn Date: Mon Nov 30 22:19:51 2015 New Revision: 30826 URL: http://svn.gna.org/viewcvs/freeciv?rev=30826&view=rev Log: Fix assertion failure and blank barbarian name in the case where a dead barbarian player was revived but no leader names were available for its nation.
See gna bug #24130. Modified: branches/S2_5/server/barbarian.c Modified: branches/S2_5/server/barbarian.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/barbarian.c?rev=30826&r1=30825&r2=30826&view=diff ============================================================================== --- branches/S2_5/server/barbarian.c (original) +++ branches/S2_5/server/barbarian.c Mon Nov 30 22:19:51 2015 @@ -104,8 +104,8 @@ * This is needed in case ruleset defines just one leader for * barbarian nation. */ barbarians->name[0] = '\0'; - sz_strlcpy(barbarians->name, - pick_random_player_name(nation_of_player(barbarians))); + server_player_set_name(barbarians, + pick_random_player_name(nation_of_player(barbarians))); sz_strlcpy(barbarians->username, ANON_USER_NAME); /* I need to make them to forget the map, I think */ whole_map_iterate(ptile) { _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits