Author: cazfi
Date: Wed Mar 26 19:32:47 2014
New Revision: 24729
URL: http://svn.gna.org/viewcvs/freeciv?rev=24729&view=rev
Log:
Set national style and gender for players created as barbarians or civilwar
rebels.
Reported by Sveinung Kvilhaugsvik <sveinung>
See bug #21853
Modified:
trunk/server/barbarian.c
trunk/server/plrhand.c
Modified: trunk/server/barbarian.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/barbarian.c?rev=24729&r1=24728&r2=24729&view=diff
==============================================================================
--- trunk/server/barbarian.c (original)
+++ trunk/server/barbarian.c Wed Mar 26 19:32:47 2014
@@ -125,8 +125,7 @@
server_player_init(barbarians, TRUE, TRUE);
nation = pick_a_nation(NULL, FALSE, FALSE, type);
- player_set_nation(barbarians, nation);
- sz_strlcpy(barbarians->name, pick_random_player_name(nation));
+ player_nation_defaults(barbarians, nation, TRUE);
if (game_was_started()) {
/* Find a color for the new player. */
assign_player_colors();
Modified: trunk/server/plrhand.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/plrhand.c?rev=24729&r1=24728&r2=24729&view=diff
==============================================================================
--- trunk/server/plrhand.c (original)
+++ trunk/server/plrhand.c Wed Mar 26 19:32:47 2014
@@ -2332,6 +2332,7 @@
{
struct player_research *new_research, *old_research;
struct player *cplayer;
+ struct nation_type *rebel_nation;
/* make a new player, or not */
cplayer = server_create_player(-1, default_ai_type_name(), NULL);
@@ -2341,11 +2342,10 @@
server_player_init(cplayer, TRUE, TRUE);
/* Rebel will always be an AI player */
- player_set_nation(cplayer, pick_a_nation
- (nation_of_player(pplayer)->server.civilwar_nations,
- TRUE, FALSE, NOT_A_BARBARIAN));
- server_player_set_name(cplayer,
- pick_random_player_name(nation_of_player(cplayer)));
+ rebel_nation =
pick_a_nation(nation_of_player(pplayer)->server.civilwar_nations,
+ TRUE, FALSE, NOT_A_BARBARIAN);
+ player_nation_defaults(cplayer, rebel_nation, TRUE);
+
fc_assert(game_was_started());
/* Find a color for the new player. */
assign_player_colors();
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
