Author: cazfi
Date: Thu Nov 19 18:00:18 2015
New Revision: 30691
URL: http://svn.gna.org/viewcvs/freeciv?rev=30691&view=rev
Log:
Fixed fair generator gcc-4.2 warnings.
See bug #24088
Modified:
branches/S2_5/server/generator/mapgen.c
Modified: branches/S2_5/server/generator/mapgen.c
URL:
http://svn.gna.org/viewcvs/freeciv/branches/S2_5/server/generator/mapgen.c?rev=30691&r1=30690&r2=30691&view=diff
==============================================================================
--- branches/S2_5/server/generator/mapgen.c (original)
+++ branches/S2_5/server/generator/mapgen.c Thu Nov 19 18:00:18 2015
@@ -3449,7 +3449,7 @@
int players_per_island = 1;
int teams_num = 0, team_players_num = 0, single_players_num = 0;
int i, iter = CLIP(1, 100000 / map_num_tiles(), 10);
- bool done;
+ bool done = FALSE;
teams_iterate(pteam) {
i = player_list_size(team_members(pteam));
@@ -3573,9 +3573,10 @@
log_debug("playermass=%d, islandmass1=%d, islandmass2=%d, islandmass3=%d",
playermass, islandmass1, islandmass2, islandmass3);
+ pmap = fair_map_new();
+
while (--iter >= 0) {
done = TRUE;
- pmap = fair_map_new();
whole_map_iterate(ptile) {
struct fair_tile *pftile = pmap + tile_index(ptile);
@@ -3738,6 +3739,7 @@
}
fair_map_destroy(pmap);
+ pmap = fair_map_new();
/* Decrease land mass, for better chances. */
islandmass1 = (islandmass1 * 99) / 100;
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
