Bug #1 » 0002-Pick-random-nations-before-setting-turn-number-to-1.patch
| server/plrhand.c | ||
|---|---|---|
|
packet->color_green = preferred->g;
|
||
|
packet->color_blue = preferred->b;
|
||
|
} else {
|
||
|
fc_assert(game.info.turn < 1);
|
||
|
fc_assert(game.info.turn < 1); /* Game has not yet started */
|
||
|
packet->color_valid = FALSE;
|
||
|
/* Client shouldn't use these dummy values */
|
||
|
packet->color_red = 0;
|
||
| server/srv_main.c | ||
|---|---|---|
|
}
|
||
|
/**********************************************************************//**
|
||
|
Handles a pick-nation packet from the client. These packets are
|
||
|
Handles a pick-nation packet from the client. These packets are
|
||
|
handled by connection because ctrl users may edit anyone's nation in
|
||
|
pregame, and editing is possible during a running game.
|
||
|
**************************************************************************/
|
||
| ... | ... | |
|
#endif
|
||
|
if (game.info.is_new_game) {
|
||
|
game.info.turn++; /* pregame T0 -> game T1 */
|
||
|
fc_assert(game.info.turn == 1);
|
||
|
game.info.year = game.server.start_year;
|
||
|
/* Must come before assign_player_colors() */
|
||
|
generate_players();
|
||
|
final_ruleset_adjustments();
|
||
|
game.info.turn++; /* Pregame T0 -> game T1 */
|
||
|
fc_assert(game.info.turn == 1);
|
||
|
game.info.year = game.server.start_year;
|
||
|
}
|
||
|
/* If we have a tile map, and MAPGEN_SCENARIO == map.server.generator,
|
||
|
* call map_fractal_generate anyway to make the specials, huts and
|
||
|
* call map_fractal_generate() anyway to make the specials, huts and
|
||
|
* continent numbers. */
|
||
|
if (map_is_empty()
|
||
|
|| (MAPGEN_SCENARIO == wld.map.server.generator
|
||