Author: sveinung Date: Wed Nov 2 15:27:35 2016 New Revision: 34332 URL: http://svn.gna.org/viewcvs/freeciv?rev=34332&view=rev Log: tilespec_reread(): initialize dependency first.
The function tileset_player_init() falls back to sprites.background.color if the player doesn't have a color. But sprites.background.color is set in tileset_background_init(). Make tilespec_reread() call tileset_background_init() before it calls tileset_player_init(). See bug #25239 Modified: branches/S2_6/client/tilespec.c Modified: branches/S2_6/client/tilespec.c URL: http://svn.gna.org/viewcvs/freeciv/branches/S2_6/client/tilespec.c?rev=34332&r1=34331&r2=34332&view=diff ============================================================================== --- branches/S2_6/client/tilespec.c (original) +++ branches/S2_6/client/tilespec.c Wed Nov 2 15:27:35 2016 @@ -1285,10 +1285,10 @@ } if (game_fully_initialized) { + tileset_background_init(tileset); players_iterate(pplayer) { tileset_player_init(tileset, pplayer); } players_iterate_end; - tileset_background_init(tileset); boot_help_texts(); /* "About Current Tileset" */ } @@ -6580,6 +6580,9 @@ /* XXX: if player hasn't been assigned a color, perhaps there's no * point proceeding with an arbitrary color; this should only happen * in pregame. Probably blank sprites would be better. */ + + fc_assert_ret(t->sprites.background.color != NULL); + color = t->sprites.background.color; } _______________________________________________ Freeciv-commits mailing list Freeciv-commits@gna.org https://mail.gna.org/listinfo/freeciv-commits