Author: jtn
Date: Tue May 12 09:25:12 2015
New Revision: 29060
URL: http://svn.gna.org/viewcvs/freeciv?rev=29060&view=rev
Log:
Non-zero multiplier defaults were not reliably honoured.
See gna bug #23585.
Modified:
branches/S2_6/common/player.c
branches/S2_6/server/srv_main.c
Modified: branches/S2_6/common/player.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/common/player.c?rev=29060&r1=29059&r2=29060&view=diff
==============================================================================
--- branches/S2_6/common/player.c (original)
+++ branches/S2_6/common/player.c Tue May 12 09:25:12 2015
@@ -489,6 +489,7 @@
/****************************************************************************
Set player structure to its default values.
+ No initialisation to ruleset-dependent values should be done here.
****************************************************************************/
static void player_defaults(struct player *pplayer)
{
@@ -564,10 +565,6 @@
pplayer->tile_known.bits = 0;
pplayer->rgb = NULL;
-
- multipliers_iterate(pmul) {
- pplayer->multipliers[multiplier_index(pmul)] = pmul->def;
- } multipliers_iterate_end;
/* pplayer->server is initialised in
./server/plrhand.c:server_player_init()
Modified: branches/S2_6/server/srv_main.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_6/server/srv_main.c?rev=29060&r1=29059&r2=29060&view=diff
==============================================================================
--- branches/S2_6/server/srv_main.c (original)
+++ branches/S2_6/server/srv_main.c Tue May 12 09:25:12 2015
@@ -2702,6 +2702,10 @@
* select a valid government on game start. */
pplayer->revolution_finishes = 0;
}
+
+ multipliers_iterate(pmul) {
+ pplayer->multipliers[multiplier_index(pmul)] = pmul->def;
+ } multipliers_iterate_end;
} players_iterate_end;
}
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
