DELTA 26969 0 311
SVN             Ğĥx?) Z ) 8Ħh B¤&  Yİ7 Ş7  ~ ĦfĞ(` ˘,ÔG ­.ö( ^¤!Add resources on 'pmap'.
****************************************************************************/
static void fair_map_make_resources(struct fair_tile *pmap)
{
  struct fair_tile *pftile, *pftile2;
  struct resource **r;
  int i, j;

  for (i = 0; i < MAP_INDEX_SIZE; i++) {
    pftile = pmapmappftile->flags |= FTF_NO_RESOURCEmap}

/****************************************************************************
  Add huts on 'pmap'.
****************************************************************************/
static void fair_map_make_huts(struct fair_tile *pmap)
{
  struct fair_tile *pftile;
  int i, j, k;

  for (i = map.server.huts, j = 0;
       i * map_num_tiles() >= 2000 && j < map_num_tiles() * 2; j++) {
    k = fc_rand(MAP_INDEX_SIZE);
    pftile = pmap + k;
    while (pftile->flags & FTF_NO_HUT) {
      pftile++;
      if (pftile - pmap == MAP_INDEX_SIZE) {
        pftile = pmap;
      }
      if (pftile - pmap == k) {
        break;
      }
    }
    if (pftile->flags & FTF_NO_HUT) {
      break; /* Cannot make huts anymore. */
    }

    i--;
    if (pftile->pterrain == NULL || pftile->flags & FTF_OCEAN) {
      continue; /* Not an used tile, or sea tile. */
    }

    set_special(&pftile->specials, S_HUT);
    pftile->flags |= FTF_HAS_HUT;
    square_iterate(index_to_tile(pftile - pmap), 3, ptile) {
      pmap[tile_index(ptile)].flags |= FTF_NO_HUT;
    } square_iterate_end;
  }if (startpos_num > 0) {
    /* Islands with start positions must have the same resources and the
     * same huts. Other ones don't matter. */

    /* Make resources. */
    if (map.server.riches > 0) {
      fair_map_make_resources(pisland);
    }

    /* Make huts. */
    if (map.server.huts > 0) {
      fair_map_make_huts(pisland);
    }

    /* Make sure there will be no more resources and huts on assigned
     * tiles. */
    for (i = 0; i < MAP_INDEX_SIZE; i++) {
      pftile = pisland + i;
      if (pftile->flags & FTF_ASSIGNED) {
        pftile->flags |= (FTF_NO_RESOURCE | FTF_NO_HUT);
      }(FTF_ASSIGNED | FTF_NO_HUT)Finalize the map. */
  for (i = 0; i < MAP_INDEX_SIZE; i++) {
    /* Mark all tiles as assigned, for adding resources and huts. */
    struct fair_tile *pftile = pmap + i;

    if (pftile->pterrain == deepest_ocean) {
      pftile->flags |= FTF_OCEAN;
    }
    pftile->flags |= FTF_ASSIGNED;
  }
  if (map.server.riches > 0) {
    fair_map_make_resources(pmap);
  }
  if (map.server.huts > 0) {
    fair_map_make_huts(pmap)ENDREP
id: 2mg.5kv.r26974/2591
type: file
pred: 2mg.5kv.r26969/338
count: 107
text: 26974 0 2566 125816 dd8cd114e06041d5059bd34e81c66017
props: 10829 1266 111 0 18cdb9becb11c47631b7a093e907200c
cpath: /branches/S2_5/server/generator/mapgen.c
copyroot: 22812 /branches/S2_5

PLAIN
K 11
Makefile.am
V 25
file 2mf.5ck.r17430/10847
K 12
height_map.c
V 25
file 2mj.5kv.r23660/84874
K 12
height_map.h
V 26
file 2mk.5bk.r13949/117031
K 8
mapgen.c
V 24
file 2mg.5kv.r26974/2591
K 8
mapgen.h
V 25
file 2mh.5ck.r19265/30017
K 17
mapgen_topology.c
V 25
file 2ml.5kv.r26429/13128
K 17
mapgen_topology.h
V 25
file 2mm.5ck.r20375/12470
K 10
startpos.c
V 24
file 2mt.5kv.r23379/6069
K 10
startpos.h
V 24
file 2mu.5ck.r18296/4932
K 17
temperature_map.c
V 25
file 2mn.5ck.r21647/34611
K 17
temperature_map.h
V 25
file 2mo.5ck.r20375/12210
K 11
utilities.c
V 25
file 2mp.5kv.r23334/11757
K 11
utilities.h
V 25
file 2mq.5ck.r20229/19347
END
ENDREP
id: 2me.5kv.r26974/3513
type: dir
pred: 2me.5kv.r26969/1257
count: 174
text: 26974 2858 642 642 c1d21c84858f1d13342550d0a0bf5230
props: 11108 4081 68 0 445aae39c72ff2e5199436fb06040160
cpath: /branches/S2_5/server/generator
copyroot: 22812 /branches/S2_5

PLAIN
K 11
Makefile.am
V 22
file 5q.5kv.r26602/963
K 8
advisors
V 24
dir 4n2.5kv.r26906/47337
K 9
aiiface.c
V 25
file 4gm.5kv.r26906/48252
K 9
aiiface.h
V 25
file 4gn.5kv.r26906/48872
K 6
auth.c
V 25
file 39c.5ck.r20274/32101
K 6
auth.h
V 25
file 39d.5ck.r18977/19170
K 11
barbarian.c
V 24
file lw.5kv.r25427/14169
K 11
barbarian.h
V 24
file lx.5ck.r22667/36940
K 14
citizenshand.c
V 25
file 6mz.5kv.r26906/48561
K 14
citizenshand.h
V 25
file 6n0.5kv.r26906/49176
K 10
cityhand.c
V 24
file 10.5ck.r19573/66885
K 10
cityhand.h
V 23
file 4f.0.r13297/423686
K 11
citytools.c
V 23
file 4g.5kv.r26847/1980
K 11
citytools.h
V 24
file 4h.5kv.r26533/10341
K 10
cityturn.c
V 23
file 4i.5kv.r26886/9710
K 10
cityturn.h
V 24
file 4j.5ck.r22267/13479
K 11
civserver.c
V 23
file 4k.5kv.r24557/7334
K 11
civserver.h
V 21
file 4l.0.r2805/33121
K 10
commands.c
V 24
file 2ly.5kv.r26965/1329
K 10
commands.h
V 24
file 2lz.5ck.r21821/2153
K 13
connecthand.c
V 24
file 2dw.5kv.r26264/1131
K 13
connecthand.h
V 24
file 2dx.5kv.r23607/6193
K 9
console.c
V 24
file dd.5kv.r24896/15603
K 9
console.h
V 23
file de.5ck.r19183/7918
K 10
diplhand.c
V 23
file 4m.5kv.r26957/6469
K 10
diplhand.h
V 21
file 4n.0.r13421/6826
K 11
diplomats.c
V 21
file vz.5kv.r26752/86
K 11
diplomats.h
V 23
file w0.5ck.r19106/3619
K 10
edithand.c
V 25
file 3bk.5kv.r26889/10932
K 10
edithand.h
V 25
file 4ez.5kv.r26906/55734
K 6
fcdb.c
V 25
file 6l3.5kv.r26906/49486
K 6
fcdb.h
V 25
file 6l4.5kv.r26906/49786
K 10
gamehand.c
V 24
file 4o.5kv.r26191/17584
K 10
gamehand.h
V 24
file 4p.5ck.r15698/24111
K 9
generator
V 23
dir 2me.5kv.r26974/3513
K 11
ggzserver.c
V 25
file 39a.5ck.r20126/49744
K 11
ggzserver.h
V 23
file 39b.5ck.r20191/350
K 10
handchat.c
V 24
file 4q.5kv.r25916/11288
K 10
handchat.h
V 24
file dj.5ck.r18270/28229
K 9
maphand.c
V 23
file 13.5kv.r26736/8570
K 9
maphand.h
V 23
file 14.5kv.r24760/7587
K 6
meta.c
V 22
file 4s.5kv.r26486/191
K 6
meta.h
V 24
file 4t.5kv.r24201/11322
K 8
notify.c
V 25
file 4i2.5kv.r26906/50393
K 8
notify.h
V 25
file 4i3.5kv.r26906/51304
K 9
plrhand.c
V 23
file 4u.5kv.r26957/6726
K 9
plrhand.h
V 23
file 4v.5kv.r26957/6986
K 8
report.c
V 22
file vi.5kv.r26451/108
K 8
report.h
V 24
file vj.5ck.r18270/29203
K 10
rssanity.c
V 25
file hew.5kv.r26906/47641
K 10
rssanity.h
V 25
file hey.5kv.r26906/47945
K 9
ruleset.c
V 23
file 8w.5kv.r26971/6382
K 9
ruleset.h
V 24
file 8x.5kv.r24188/21310
K 13
sanitycheck.c
V 23
file wi.5kv.r26110/1695
K 13
sanitycheck.h
V 24
file wj.5ck.r20315/26296
K 10
savegame.c
V 22
file vl.5kv.r26925/415
K 10
savegame.h
V 24
file vm.5ck.r20758/19233
K 11
savegame2.c
V 23
file 4m0.5kv.r26927/110
K 11
savegame2.h
V 25
file 4m1.5kv.r26906/51604
K 7
score.c
V 24
file 2eg.5ck.r21929/5694
K 7
score.h
V 24
file 2eh.5ck.r21929/6179
K 9
scripting
V 24
dir 31x.5kv.r26906/55431
K 8
sernet.c
V 22
file 15.5kv.r26842/590
K 8
sernet.h
V 24
file 4y.5ck.r19197/31924
K 10
settings.c
V 23
file 2m0.5kv.r26891/525
K 10
settings.h
V 24
file 2m1.5kv.r23404/2389
K 11
spacerace.c
V 24
file 9a.5kv.r24606/23848
K 11
spacerace.h
V 21
file 9b.0.r11338/1129
K 9
srv_log.c
V 25
file 15t.5el.r22382/32625
K 9
srv_log.h
V 25
file 15u.5em.r20315/26035
K 10
srv_main.c
V 22
file vg.5kv.r26705/473
K 10
srv_main.h
V 24
file vh.5kv.r23883/21338
K 11
stdinhand.c
V 22
file 4z.5kv.r26810/216
K 11
stdinhand.h
V 24
file 50.5kv.r25916/11029
K 11
techtools.c
V 23
file 33n.5kv.r26548/161
K 11
techtools.h
V 25
file 33o.5ck.r21976/23870
K 10
unithand.c
V 23
file 18.5kv.r26736/7530
K 10
unithand.h
V 24
file 19.5ck.r21095/21648
K 11
unittools.c
V 23
file 1a.5kv.r26957/5950
K 11
unittools.h
V 23
file 1b.5kv.r26957/6210
K 8
voting.c
V 25
file 4ex.5kv.r26906/50088
K 8
voting.h
V 25
file 4ey.5kv.r26906/51006
END
ENDREP
id: z.5kv.r26974/7480
type: dir
pred: z.5kv.r26971/10350
count: 5345
text: 26974 3769 3698 3698 954de2c9c83e3de918d33386a51839d6
props: 23991 453 166 0 e5026e1cb18fe57b41417951bfac7b19
cpath: /branches/S2_5/server
copyroot: 22812 /branches/S2_5

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5kv.r23463/86338
K 7
AUTHORS
V 24
file 5u.5ck.r22143/14016
K 7
COPYING
V 19
file 1h.0.r9643/400
K 9
ChangeLog
V 26
file 6l.5kv.r25637/6537782
K 7
INSTALL
V 22
file 6.5kv.r25136/6183
K 11
Makefile.am
V 21
file 59.5kv.r26934/68
K 4
NEWS
V 24
file 6m.5kv.r25633/30575
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 23
dir 8.5kv.r26906/193644
K 10
autogen.sh
V 23
file 12o.5kv.r24092/228
K 9
bootstrap
V 23
dir 2p5.5kv.r25971/4686
K 6
client
V 22
dir d.5kv.r26910/28493
K 6
common
V 21
dir p.5kv.r26971/6139
K 12
configure.ac
V 23
file 149.5kv.r26602/711
K 4
data
V 22
dir w.5kv.r26942/23237
K 6
debian
V 22
dir 5w.5kv.r23304/4091
K 12
dependencies
V 25
dir 2yu.5kv.r26906/165544
K 11
diff_ignore
V 24
file qq.5ck.r21039/26581
K 3
doc
V 22
dir k7.5kv.r26885/3829
K 10
fc_version
V 25
file 2lo.5kw.r26230/63926
K 2
m4
V 23
dir 12p.5kv.r26898/3215
K 7
scripts
V 23
dir 2yo.5kv.r26113/1118
K 6
server
V 21
dir z.5kv.r26974/7480
K 5
tests
V 22
dir 2g9.5kv.r25380/686
K 5
tools
V 24
dir 4pj.5lo.r26906/32651
K 12
translations
V 23
dir t0n.5kv.r26808/7575
K 7
utility
V 22
dir 1c.5kv.r26960/3027
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5kv.r26865/3206
END
ENDREP
id: 3.5kv.r26974/8933
type: dir
pred: 3.5kv.r26971/11804
count: 17498
text: 26974 7726 1194 1194 519a9277ae3602f7ad383caad95bf838
props: 20140 3888 282 0 e4bb46e81629a60eef613b169b23a9ea
cpath: /branches/S2_5
copyroot: 22812 /branches/S2_5

PLAIN
K 5
S1_14
V 21
dir 3.21.r18109/18803
K 4
S2_0
V 21
dir 3.10x.r21862/4178
K 4
S2_1
V 22
dir 3.59e.r20026/11014
K 4
S2_2
V 21
dir 3.5cy.r21861/5036
K 4
S2_3
V 21
dir 3.5f2.r24391/5183
K 4
S2_4
V 22
dir 3.5ii.r26972/23113
K 4
S2_5
V 21
dir 3.5kv.r26974/8933
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r26974/9491
type: dir
pred: 1.0.r26972/23673
count: 8255
text: 26974 9174 304 304 78d877e2ff95960c35235fabc8ba69e9
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 19
dir 1.0.r26974/9491
K 4
tags
V 19
dir 2.0.r25885/6524
K 5
trunk
V 21
dir 3.5ck.r26973/9058
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r26974/9811
type: dir
pred: 0.0.r26973/9449
count: 26974
text: 26974 9646 152 152 0a514e689c1ea0f6f605b6b542002d6c
cpath: /
copyroot: 0 /

2mg.5kv.t26973-1 modify true false /branches/S2_5/server/generator/mapgen.c


9811 9958
