DELTA 21095 15471 1320
SVN  Y”-ƒ3 †N – ˆ †E€~ WŠq€Z /Ž€E&3dv_settlers_free(void)int settler_evaluate_city_requests(struct unit *punit,
                                   enum unit_activity *best_act,
            struct tile **best_tile,
                                   struct pf_path **path,
 bool adv_settler_safe_tile(const struct player *pplayer, struct unit *punit,
                           struct tile *ptile);

int adv_settlers_road_bonus(struct tile *ptile, struct road_type *proadENDREP
DELTA 25557 0 10673
SVN  …ùc†Ž2W ” † ™”	° ‚u­
ˆ …h°	€_ ÚTµp€e š_‚‘€n N¼  š‚®,µ –‚È9‹ ‚‚ÞH€ Šq‚á,š N¼  ‚£ ‚í€V ‚t…€„e …r…“€…1 ƒd…˜|€„
 K‚Ö €‚T u…œ_ …~…žR€„9 ‘#…ª€ ¾#…»@rv_logWe want this before any AI stuff */
  timing_logidentity#ifdef ENABLE_NLS
  bind_textdomain_codeset("freeciv-nations", get_internal_encoding());
#endiftech_upkeep(pplayer), TRUE);
    flush_packets();
  } phase_players_iterate_end;

  /* Some player/global effect may have changed cities' vision range */
  phase_players_iterate(pplayer) {
    refresh_player_cities_vision(pplayer  Unconditionally save the game, with specified filename.
  Always prints a message: either save ok, or failed  log_error("Game saving failed: %s", secfile_error()dv_settlersulesets_deinit();
  timing_log_free();
  registry_module_close();
  fc_destroy_mutex(&game.server.mutexes.city_list);
  free_libfreeciv( identity number allocatedstruct {
      const char *name;
      char value[MAX_LEN_NAME * 2];
      char pretty[MAX_LEN_NAME * 2];
    } mapgen_settings[] = {
      { "generator", },
      { "startpos", },
      { "teamplacement", }
    };    fc_assert(utype != NULL);

    /* Register map generator setting main values. */
    for (i = 0; i < ARRAY_SIZE(mapgen_settings); i++) {
      const struct setting *pset = setting_by_name(mapgen_settings[i].name);

      fc_assert_action(pset != NULL, continue);
      (void) setting_value_name(pset, FALSE,
                                mapgen_settings[i].value,
                                sizeof(mapgen_settings[i].value));
      (void) setting_value_name(pset, TRUE,
                                mapgen_settings[i].pretty,
                                sizeof(mapgen_settings[i].pretty));
    }/* Restore the settings. */
        for (i = 0; i < ARRAY_SIZE(mapgen_settings); i++) {
          struct setting *pset = setting_by_name(mapgen_settings[i].name);
#ifdef NDEBUG
          setting_enum_set(pset, mapgen_settings[i].value, NULL, NULL, 0);
#else
          char error[128];
          bool success;

          fc_assert_action(pset != NULL, continue);
          success = setting_enum_set(pset, mapgen_settings[i].value,
                                     NULL, error, sizeof(error));
          fc_assert_msg(success == TRUE,
                        "Failed to restore '%s': %s",
                        mapgen_settings[i].name,
                        error);
#endif
        }
    /* Test if main map generator settings have changed. */
    for (i = 0; i < ARRAY_SIZE(mapgen_settings); i++) {
      const struct setting *pset = setting_by_name(mapgen_settings[i].name);
      char pretty[sizeof(mapgen_settings[i].pretty)];

      fc_assert_action(pset != NULL, continue);
      if (0 == strcmp(setting_value_name(pset, TRUE, pretty,
                                         sizeof(pretty)),
                      mapgen_settings[i].pretty)) {
        continue; /* Setting didn't change. */
      }Setting '%s' has been adjusted from %s to %s."),
                  setting_name(pset),
                  mapgen_settings[i].pretty,
                  pretty);
      log_normal(_("Setting '%s' has been adjusted from %s to %s."),
                 setting_name(pset),
                 mapgen_settings[i].pretty,
                 pretty);
    }_researches_iterate(presearch) {
      players_iterate(pplayer) {
        if (player_research_get(pplayer) == presearch) {
          int i;

          /* Give global technologies, as specified in the ruleset. */
          give_global_initial_techs(pplayer);
          /* Give random free technologies thanks to the techlevel setting. */
          for (i = 0; i < game.info.tech; i++) {
            give_random_initial_tech(pplayer);
          }
          break; /* Do it only for one player per research. */
        }
      } players_iterate_end;
    } player_researchegame_init();
  /* game_init() set game.server.plr_colors to NULL. So we need to
   * initialize the colors after. */
  playercolorENDREP
DELTA 25482 0 12773
SVN  ‚™g‚›_Q‚G R § G ¸ F’ €Q Pø> ˜J Z¨nž c©t™ ]ª~ 'Òw Íf­	 Qû2€P –jü>ˆ >‚“)ˆ „‚”hstatic struct timer *as_timer = NULL;

****
  Free resources allocated for autosettlers system
****/
void adv_settlers_free(void)
{
  timer_destroy(as_timer);
  as_timer = NULLenum unit_activity *best_act,
struct tile **best_tile,
as_timer = timer_renew(as_timer, TIMER_CPU, TIMER_DEBUG);
  timer_start(as_timeras_timeras_timerENDREP
id: vg.5kv.r28628/4949
type: file
pred: vg.5kv.r28565/3409
count: 624
text: 28628 506 3967 100146 328f5309976a400925c11e09ebd713bb
props: 11057 12128 112 0 85dbe778568e34751643d476c23a0d7c
cpath: /branches/S2_5/server/srv_main.c
copyroot: 22812 /branches/S2_5

id: 7t.5q5.r28628/5210
type: file
pred: 7t.5q5.r27351/7967
count: 44
text: 28628 0 476 2605 fdc8062d3b2197d2a7dd0f0ff3bf2dc4
props: 9484 813 111 0 23629f8214b2309975780a037517e920
cpath: /branches/S2_5/server/advisors/autosettlers.h
copyroot: 17592 /trunk/server/advisors/autosettlers.h

id: 7s.5oj.r28628/5498
type: file
pred: 7s.5oj.r27351/7670
count: 338
text: 28628 4500 422 36319 2a2f0b2e5e16491e40345562c9f2d89d
props: 10755 35320 112 0 af1f871c1c0b4609250c3dc553658fcc
cpath: /branches/S2_5/server/advisors/autosettlers.c
copyroot: 17592 /trunk/server/advisors/autosettlers.c

PLAIN
K 11
Makefile.am
V 25
file 4n3.5ck.r20033/10450
K 13
advbuilding.c
V 23
file 50r.5kv.r27952/211
K 13
advbuilding.h
V 25
file 50s.5kv.r26906/44571
K 9
advcity.c
V 25
file 6po.5kv.r26906/45203
K 9
advcity.h
V 25
file 6pp.5kv.r26906/45828
K 9
advdata.c
V 23
file 15o.5mv.r25228/594
K 9
advdata.h
V 25
file 15p.5my.r24532/27222
K 9
advgoto.c
V 25
file 4p5.5kv.r26906/45516
K 9
advgoto.h
V 25
file 4p6.5kv.r26906/46142
K 12
advruleset.c
V 25
file 73l.5kv.r26906/42665
K 12
advruleset.h
V 25
file 73m.5kv.r26906/43299
K 10
advtools.c
V 25
file 4of.5kv.r26906/44253
K 10
advtools.h
V 25
file 4og.5kv.r26906/44889
K 14
autoexplorer.c
V 26
file 2lj.5eo.r21517/100024
K 14
autoexplorer.h
V 24
file 2lk.5ep.r17685/7079
K 14
autosettlers.c
V 23
file 7s.5oj.r28628/5498
K 14
autosettlers.h
V 23
file 7t.5q5.r28628/5210
K 12
infracache.c
V 25
file 4pw.5kv.r26906/42980
K 12
infracache.h
V 25
file 4px.5kv.r26906/43938
END
ENDREP
id: 4n2.5kv.r28628/6715
type: dir
pred: 4n2.5kv.r27952/1401
count: 133
text: 28628 5794 908 908 b5fda27c1e002d797968d5dac6cb9f13
props: 17871 2121 53 0 a527b216afb99426b763a1e313c531be
cpath: /branches/S2_5/server/advisors
copyroot: 22812 /branches/S2_5

PLAIN
K 11
Makefile.am
V 22
file 5q.5kv.r26602/963
K 8
advisors
V 23
dir 4n2.5kv.r28628/6715
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.r28181/1375
K 11
citytools.h
V 23
file 4h.5kv.r28181/1632
K 10
cityturn.c
V 23
file 4i.5kv.r27979/2064
K 10
cityturn.h
V 24
file 4j.5ck.r22267/13479
K 11
civserver.c
V 22
file 4k.5kv.r27135/699
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.r28573/9278
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.r27207/1055
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 22
file 13.5kv.r28417/598
K 9
maphand.h
V 23
file 14.5kv.r24760/7587
K 6
meta.c
V 22
file 4s.5kv.r27135/448
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.r28573/9022
K 9
plrhand.h
V 23
file 4v.5kv.r26957/6986
K 8
report.c
V 22
file vi.5kv.r28083/128
K 8
report.h
V 24
file vj.5ck.r18270/29203
K 10
rssanity.c
V 24
file hew.5kv.r28623/1395
K 10
rssanity.h
V 25
file hey.5kv.r26906/47945
K 9
ruleset.c
V 23
file 8w.5kv.r27726/7969
K 9
ruleset.h
V 23
file 8x.5kv.r27726/8225
K 13
sanitycheck.c
V 22
file wi.5kv.r27282/978
K 13
sanitycheck.h
V 24
file wj.5ck.r20315/26296
K 10
savegame.c
V 22
file vl.5kv.r26980/817
K 10
savegame.h
V 24
file vm.5ck.r20758/19233
K 11
savegame2.c
V 24
file 4m0.5kv.r27380/3465
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 23
dir 31x.5kv.r28154/1270
K 8
sernet.c
V 21
file 15.5kv.r28321/51
K 8
sernet.h
V 24
file 4y.5ck.r19197/31924
K 10
settings.c
V 23
file 2m0.5kv.r28560/236
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 24
file 15t.5rj.r27916/1203
K 9
srv_log.h
V 24
file 15u.5rk.r27916/1727
K 10
srv_main.c
V 23
file vg.5kv.r28628/4949
K 10
srv_main.h
V 23
file vh.5kv.r27135/1208
K 11
stdinhand.c
V 22
file 4z.5kv.r27810/264
K 11
stdinhand.h
V 24
file 50.5kv.r25916/11029
K 11
techtools.c
V 23
file 33n.5kv.r28181/856
K 11
techtools.h
V 24
file 33o.5kv.r27063/3156
K 10
unithand.c
V 21
file 18.5kv.r28178/57
K 10
unithand.h
V 24
file 19.5ck.r21095/21648
K 11
unittools.c
V 24
file 1a.5kv.r27633/13155
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.r28628/10669
type: dir
pred: z.5kv.r28623/5352
count: 5396
text: 28628 6970 3686 3686 20b0655d89e18b6cd6b0db4ebfcf4800
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.r28526/1139931
K 7
INSTALL
V 21
file 6.5kv.r27779/472
K 11
Makefile.am
V 22
file 59.5kv.r27141/100
K 4
NEWS
V 22
file 6m.5kv.r28524/894
K 8
NEWS-2.5
V 25
file 1h59.5kv.r28524/1138
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 21
dir 8.5kv.r28094/2842
K 10
autogen.sh
V 23
file 12o.5kv.r24092/228
K 9
bootstrap
V 23
dir 2p5.5kv.r28599/3351
K 6
client
V 22
dir d.5kv.r28607/46736
K 6
common
V 21
dir p.5kv.r28573/8778
K 12
configure.ac
V 23
file 149.5kv.r27511/141
K 4
data
V 21
dir w.5kv.r28576/2947
K 6
debian
V 22
dir 5w.5kv.r23304/4091
K 12
dependencies
V 24
dir 2yu.5kv.r28595/10551
K 11
diff_ignore
V 24
file qq.5ck.r21039/26581
K 3
doc
V 23
dir k7.5kv.r28523/27629
K 10
fc_version
V 22
file 2lo.5kw.r28525/44
K 2
m4
V 23
dir 12p.5kv.r28588/3729
K 7
scripts
V 23
dir 2yo.5kv.r26113/1118
K 6
server
V 22
dir z.5kv.r28628/10669
K 5
tests
V 22
dir 2g9.5kv.r27024/930
K 5
tools
V 24
dir 4pj.5lo.r28565/18792
K 12
translations
V 25
dir t0n.5kv.r28610/124353
K 7
utility
V 23
dir 1c.5kv.r28565/22262
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5kv.r28344/1663
END
ENDREP
id: 3.5kv.r28628/12162
type: dir
pred: 3.5kv.r28623/6843
count: 17863
text: 28628 10915 1234 1234 f18736be87a8e644a44a81ae6c3f0404
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 21
dir 3.5ii.r28551/7974
K 4
S2_5
V 22
dir 3.5kv.r28628/12162
K 4
S2_6
V 22
dir 3.5qi.r28627/10350
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r28628/12758
type: dir
pred: 1.0.r28627/10945
count: 9125
text: 28628 12404 341 341 932e51623cb1319a459f80090f3ae16f
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 20
dir 1.0.r28628/12758
K 4
tags
V 19
dir 2.0.r28528/6475
K 5
trunk
V 22
dir 3.5ck.r28626/11635
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r28628/13082
type: dir
pred: 0.0.r28627/11268
count: 28628
text: 28628 12915 154 154 17d588b4b92007a7157d4fbb9c1831ba
cpath: /
copyroot: 0 /

7s.5oj.t28627-1 modify true false /branches/S2_5/server/advisors/autosettlers.c

7t.5q5.t28627-1 modify true false /branches/S2_5/server/advisors/autosettlers.h

vg.5kv.t28627-1 modify true false /branches/S2_5/server/srv_main.c


13082 13232
