DELTA 27842 0 214
SVN      =     ๆธ|treaties(struct loaddata *loadtreaties] */
  sg_load_treaties      ii    } nation_hash_iterate_end;
      secfile_insert_str(saving->file, nation_names,
                       ภ ฿s๖#&(i s  nwJ cณ@ผ cณ@ต Tฎ< ย s = dir2char(punit->facing);
    secfile_insert_int(saving->file, punit->id, "%s.id", buf);

    index_to_Loadload_treaties(struct loaddata *loading)
{
  int tidx;
  const char *plr0;
  struct treaty_list *treaties = get_all_treaties();

  for (tidx = 0; (plr0 = secfile_lookup_str_default(loading->file, NULL,
                                                    "treaty%d.plr0", tidx)) != NULL ;
       tidx++) {
    const char *plr1;
    const char *ct;
    int cidx;
    struct player *p0, *p1;

    plr1 = secfile_lookup_str(loading->file, "treaty%d.plr1", tidx);

    p0 = player_by_name(plr0);
    p1 = player_by_name(plr1);

    if (p0 == NULL || p1 == NULL) {
      log_error("Treaty between unknown players %s and %s", plr0, plr1);
    } else {
      struct Treaty *ptreaty = fc_malloc(sizeof(*ptreaty));

      init_treaty(ptreaty, p0, p1);
      treaty_list_prepend(treaties, ptreaty);
      
      for (cidx = 0; (ct = secfile_lookup_str_default(loading->file, NULL,
                                                      "treaty%d.clause%d.type",
                                                      tidx, cidx)) != NULL ;
           cidx++ ) {
        enum clause_type type = clause_type_by_name(ct, fc_strcasecmp);
        const char *plrx;

        if (!clause_type_is_valid(type)) {
          log_error("Invalid clause type \"%s\"", ct);
        } else {
          struct player *pgiver = NULL;

          plrx = secfile_lookup_str(loading->file, "treaty%d.clause%d.from",
                                    tidx, cidx);

          if (!fc_strcasecmp(plrx, plr0)) {
            pgiver = p0;
          } else if (!fc_strcasecmp(plrx, plr1)) {
            pgiver = p1;
          } else {
            log_error("Clause giver %s is not participant of the treaty"
                      "between %s and %s", plrx, plr0, plr1);
          }

          if (pgiver != NULL) {
            int value;

            value = secfile_lookup_int_default(loading->file, 0,
                                               "treaty%d.clause%d.value",
                                               tidx, cidx);

            add_clause(ptreaty, pgiver, type, value);
          }
        }

        /* These must be after clauses have been added so that acceptance
         * does not get cleared by what seems like changes to the treaty. */
        ptreaty->accept0         "treaty%d.accept0", tidx);
        ptreaty->accept1         "treaty%d.accept1", tidx);
      }
    }
  }ENDREP
DELTA 28204 4335 1041
SVN       ๙t  ค{๙pif (!is_new_phase) {
    conn_list_iterate(game.est_connections, pconn) {
      send_diplomatic_meetings(pconn);
    } conn_list_iterate_end;
  }  cxI C @ C  ):le);
}

/*********
  Helper function for the mapimg module - city owner.
ENDREP
DELTA 27518 3894 197
SVN  |{  ๘  .๘ W๙@ d๛ENDREP
id: vg.5qi.r28336/3126
type: file
pred: vg.5qi.r28204/23213
count: 681
text: 28336 2764 269 104440 fbd76177399f1a90e3a50d13c4306027
props: 11057 12128 112 0 85dbe778568e34751643d476c23a0d7c
cpath: /branches/S2_6/server/srv_main.c
copyroot: 27474 /branches/S2_6

id: 4m0.5qi.r28336/3388
type: file
pred: 4m0.5qi.r27842/243
count: 263
text: 28336 0 2739 252707 e2daacd6c08907910e94f4f8d2f34d3f
props: 26905 58059 34 0 25e6c2f7558b7484000d4d090dea5b92
cpath: /branches/S2_6/server/savegame2.c
copyroot: 27474 /branches/S2_6

id: 4m.5qi.r28336/3648
type: file
pred: 4m.5qi.r27518/4869
count: 183
text: 28336 3062 36 33659 63ff9d3cf312dde41b1ec6822ee9296c
props: 10928 6706 112 0 b2683e5213f79af73eb9759948ba224b
cpath: /branches/S2_6/server/diplhand.c
copyroot: 27474 /branches/S2_6

PLAIN
K 11
Makefile.am
V 22
file 5q.5ck.r27256/390
K 8
advisors
V 24
dir 4n2.5qi.r28160/18627
K 9
aiiface.c
V 25
file 4gm.5ck.r26905/55786
K 9
aiiface.h
V 25
file 4gn.5ck.r26905/56374
K 9
animals.c
V 25
file vnk.5ck.r26905/62972
K 9
animals.h
V 25
file vnm.5ck.r26905/63257
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 22
file lw.5ck.r26434/594
K 11
barbarian.h
V 24
file lx.5ck.r22667/36940
K 14
citizenshand.c
V 25
file 6mz.5ck.r26905/56079
K 14
citizenshand.h
V 25
file 6n0.5ck.r26905/56662
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 24
file 4g.5qi.r28175/37563
K 11
citytools.h
V 24
file 4h.5qi.r28175/37820
K 10
cityturn.c
V 22
file 4i.5qi.r27974/146
K 10
cityturn.h
V 24
file 4j.5ck.r24742/16670
K 11
civserver.c
V 24
file 4k.5qi.r28076/13954
K 10
commands.c
V 24
file 2ly.5qi.r27913/1890
K 10
commands.h
V 25
file 2lz.5qi.r28013/36715
K 13
connecthand.c
V 25
file 2dw.5ck.r27336/16958
K 13
connecthand.h
V 24
file 2dx.5ck.r23606/2057
K 9
console.c
V 24
file dd.5ck.r24895/15492
K 9
console.h
V 23
file de.5ck.r19183/7918
K 10
diplhand.c
V 23
file 4m.5qi.r28336/3648
K 10
diplhand.h
V 23
file 4n.5qi.r27518/5128
K 11
diplomats.c
V 23
file vz.5qi.r27489/3902
K 11
diplomats.h
V 23
file w0.5ck.r27461/1674
K 10
edithand.c
V 25
file 3bk.5qi.r27612/42316
K 10
edithand.h
V 25
file 4ez.5ck.r26905/64705
K 6
fcdb.c
V 25
file 6l3.5ck.r26905/56956
K 6
fcdb.h
V 25
file 6l4.5ck.r26905/57239
K 10
gamehand.c
V 23
file 4o.5ck.r27042/1951
K 10
gamehand.h
V 24
file 4p.5ck.r26564/23149
K 9
generator
V 23
dir 2me.5ck.r27071/7433
K 10
handchat.c
V 23
file 4q.5ck.r25915/6654
K 10
handchat.h
V 24
file dj.5ck.r18270/28229
K 9
maphand.c
V 23
file 13.5qi.r27853/1225
K 9
maphand.h
V 23
file 14.5ck.r24759/3742
K 6
meta.c
V 23
file 4s.5ck.r27134/1241
K 6
meta.h
V 23
file 4t.5ck.r27204/3095
K 6
mood.c
V 26
file 112c.5ck.r26905/63547
K 6
mood.h
V 26
file 112e.5ck.r26905/64129
K 8
notify.c
V 25
file 4i2.5ck.r26905/57814
K 8
notify.h
V 25
file 4i3.5ck.r26905/58681
K 9
plrhand.c
V 24
file 4u.5ck.r27223/43157
K 9
plrhand.h
V 23
file 4v.5ck.r26956/6294
K 8
report.c
V 22
file vi.5qi.r28082/133
K 8
report.h
V 24
file vj.5ck.r24891/20006
K 10
rssanity.c
V 25
file hew.5ck.r26905/55205
K 10
rssanity.h
V 25
file hey.5ck.r26905/55500
K 9
ruleset.c
V 21
file 8w.5qi.r28087/86
K 9
ruleset.h
V 22
file 8x.5qi.r27725/899
K 13
sanitycheck.c
V 22
file wi.5ck.r27281/872
K 13
sanitycheck.h
V 24
file wj.5qi.r28076/13693
K 12
savecompat.c
V 24
file qva.5ck.r27311/1041
K 12
savecompat.h
V 25
file qvc.5ck.r27279/35421
K 10
savegame.c
V 23
file vl.5qi.r27749/2766
K 10
savegame.h
V 24
file vm.5ck.r20758/19233
K 11
savegame2.c
V 24
file 4m0.5qi.r28336/3388
K 11
savegame2.h
V 25
file 4m1.5ck.r26905/58971
K 7
score.c
V 25
file 2eg.5ck.r25535/51502
K 7
score.h
V 24
file 2eh.5ck.r21929/6179
K 9
scripting
V 24
dir 31x.5qi.r27544/11893
K 8
sernet.c
V 21
file 15.5qi.r28320/51
K 8
sernet.h
V 23
file 4y.5ck.r23685/5129
K 10
settings.c
V 23
file 2m0.5qi.r28316/492
K 10
settings.h
V 24
file 2m1.5qi.r27996/4061
K 11
spacerace.c
V 24
file 9a.5ck.r25063/30975
K 11
spacerace.h
V 21
file 9b.0.r11338/1129
K 9
srv_log.c
V 24
file 15t.5rh.r27915/1004
K 9
srv_log.h
V 25
file 15u.5ri.r28013/36974
K 10
srv_main.c
V 23
file vg.5qi.r28336/3126
K 10
srv_main.h
V 22
file vh.5ck.r27134/762
K 11
stdinhand.c
V 23
file 4z.5qi.r27996/3538
K 11
stdinhand.h
V 24
file 50.5ck.r26100/15471
K 11
techtools.c
V 25
file 33n.5qi.r28175/37034
K 11
techtools.h
V 24
file 33o.5ck.r27058/2134
K 10
unithand.c
V 23
file 18.5qi.r28323/1125
K 10
unithand.h
V 24
file 19.5ck.r23027/66151
K 11
unittools.c
V 23
file 1a.5qi.r27632/8170
K 11
unittools.h
V 23
file 1b.5ck.r26956/5564
K 8
voting.c
V 25
file 4ex.5ck.r26905/57525
K 8
voting.h
V 25
file 4ey.5ck.r26905/58399
END
ENDREP
id: z.5qi.r28336/7752
type: dir
pred: z.5qi.r28323/5228
count: 5877
text: 28336 3906 3833 3833 cbc4cf703bb62826d434beda26c8c12e
props: 23990 448 166 0 e5026e1cb18fe57b41417951bfac7b19
cpath: /branches/S2_6/server
copyroot: 27474 /branches/S2_6

PLAIN
K 9
ABOUT-NLS
V 24
file fu.5ck.r27270/69307
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.5ck.r27473/7455495
K 7
INSTALL
V 21
file 6.5qi.r27778/886
K 11
Makefile.am
V 22
file 59.5ck.r27213/499
K 4
NEWS
V 24
file 6m.5ck.r25634/30702
K 6
README
V 20
file 7.0.r4421/96382
K 2
ai
V 22
dir 8.5qi.r28285/55509
K 10
autogen.sh
V 24
file 12o.5ck.r25794/4003
K 9
bootstrap
V 23
dir 2p5.5ck.r27114/4172
K 6
client
V 22
dir d.5qi.r28333/10313
K 6
common
V 22
dir p.5qi.r28204/16175
K 12
configure.ac
V 24
file 149.5qi.r28269/4502
K 4
data
V 21
dir w.5qi.r28316/8760
K 12
dependencies
V 23
dir 2yu.5qi.r28186/7602
K 3
doc
V 23
dir k7.5qi.r28285/16037
K 10
fc_version
V 25
file 2lo.5qj.r28285/13694
K 11
gen_headers
V 24
dir 1hsw.5qi.r28269/5092
K 2
m4
V 23
dir 12p.5qi.r28227/3547
K 7
scripts
V 23
dir 2yo.5ck.r27213/1366
K 6
server
V 21
dir z.5qi.r28336/7752
K 5
tests
V 22
dir 2g9.5ck.r27023/734
K 5
tools
V 24
dir 4pj.5qp.r28204/19388
K 12
translations
V 25
dir t0a.5qi.r28257/984773
K 7
utility
V 22
dir 1c.5qi.r28299/3132
K 3
vms
V 25
dir u9.5ck.r21528/1396085
K 5
win32
V 23
dir 2eu.5qi.r28318/1915
END
ENDREP
id: 3.5qi.r28336/9167
type: dir
pred: 3.5qi.r28333/11732
count: 19198
text: 28336 7997 1157 1157 a062a6e812bc2f5a8377e056a3ac4e7a
props: 28037 14463 292 0 9e1d5de0253c723466868990c52c129f
cpath: /branches/S2_6
copyroot: 27474 /branches/S2_6

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.r28328/10270
K 4
S2_5
V 23
dir 3.5kv.r28331/163323
K 4
S2_6
V 21
dir 3.5qi.r28336/9167
K 11
freeciv-web
V 22
dir 3.5bl.r13594/14918
END
ENDREP
id: 1.0.r28336/9764
type: dir
pred: 1.0.r28333/12332
count: 8958
text: 28336 9409 342 342 9d7b9bc50c9b9bb0f95b0005cf648cc6
cpath: /branches
copyroot: 0 /

PLAIN
K 8
branches
V 19
dir 1.0.r28336/9764
K 4
tags
V 19
dir 2.0.r28267/6358
K 5
trunk
V 22
dir 3.5ck.r28335/13595
K 7
website
V 21
dir 3ge.0.r22980/2263
END
ENDREP
id: 0.0.r28336/10085
type: dir
pred: 0.0.r28335/13989
count: 28336
text: 28336 9919 153 153 0c45ec73b7a6525b5cc84cb775f1a404
cpath: /
copyroot: 0 /

vg.5qi.t28335-1 modify true false /branches/S2_6/server/srv_main.c

4m.5qi.t28335-1 modify true false /branches/S2_6/server/diplhand.c

4m0.5qi.t28335-1 modify true false /branches/S2_6/server/savegame2.c


10085 10234
