Author: sveinung
Date: Tue Mar 22 06:07:32 2016
New Revision: 32262
URL: http://svn.gna.org/viewcvs/freeciv?rev=32262&view=rev
Log:
Fair islands: generate valid resources.
Fix the way the fair island map generator resource placement interacts with
Resource as Extra.
See bug #24533
Modified:
trunk/server/generator/mapgen.c
Modified: trunk/server/generator/mapgen.c
URL:
http://svn.gna.org/viewcvs/freeciv/trunk/server/generator/mapgen.c?rev=32262&r1=32261&r2=32262&view=diff
==============================================================================
--- trunk/server/generator/mapgen.c (original)
+++ trunk/server/generator/mapgen.c Tue Mar 22 06:07:32 2016
@@ -2958,6 +2958,7 @@
for (r = pftile->pterrain->resources; *r != NULL; r++) {
if (fc_rand(++j) == 0) {
pftile->presource = *r;
+ BV_SET(pftile->extras, extra_index((*r)->self));
}
}
/* Note that 'pftile->presource' might be NULL if there is no suitable
@@ -3677,8 +3678,8 @@
fc_assert(pftile->pterrain != NULL);
tile_set_terrain(ptile, pftile->pterrain);
+ ptile->extras = pftile->extras;
tile_set_resource(ptile, pftile->presource);
- ptile->extras = pftile->extras;
if (pftile->flags & FTF_STARTPOS) {
struct startpos *psp = map_startpos_new(ptile);
_______________________________________________
Freeciv-commits mailing list
Freeciv-commits@gna.org
https://mail.gna.org/listinfo/freeciv-commits
