Marc
/
server
forked from github/server
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove even more obsolete datafile version support.

This commit is contained in:
Enno Rehling 2014-12-12 23:00:30 +01:00
parent d492487a5b
commit 0967ccaac6
6 changed files with 251 additions and 316 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/building_action.c
View File

@ -113,7 +113,6 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store)
else {
data->fname = _strdup(name);
}
if (global.data_version >= BACTION_VERSION) {
READ_TOK(store, name, sizeof(name));
if (strcmp(name, "tnnL") == 0) {
/* tunnel_action was the old Weltentore, their code has changed. ignore this object */
@ -125,10 +124,6 @@ static int lc_read(struct attrib *a, void *owner, struct storage *store)
else {
data->param = _strdup(name);
}
}
else {
data->param = 0;
}
if (result == 0 && !data->b) {
return AT_READ_FAIL;
}

6
src/kernel/curse.c
View File

@ -195,14 +195,8 @@ int curse_read(attrib * a, void *owner, struct storage *store)
READ_TOK(store, cursename, sizeof(cursename));
READ_INT(store, &flags);
READ_INT(store, &c->duration);
if (global.data_version >= CURSEVIGOURISFLOAT_VERSION) {
READ_FLT(store, &flt);
c->vigour = flt;
}
else {
READ_INT(store, &n);
c->vigour = (float)n;
}
if (global.data_version < INTPAK_VERSION) {
ur = read_reference(&c->magician, store, read_int, resolve_unit);
}

35
src/kernel/save.c
View File

@ -428,10 +428,6 @@ static void read_alliances(struct storage *store)
{
char pbuf[8];
int id, terminator = 0;
if (global.data_version < SAVEALLIANCE_VERSION) {
if (!AllianceRestricted() && !AllianceAuto())
return;
}
if (global.data_version < ALLIANCELEADER_VERSION) {
terminator = atoi36("end");
READ_STR(store, pbuf, sizeof(pbuf));
@ -730,14 +726,6 @@ unit *read_unit(struct gamedata *data)
}
READ_STR(data->store, obuf, sizeof(obuf));
}
if (data->version < NOLASTORDER_VERSION) {
order *ord;
READ_STR(data->store, obuf, sizeof(obuf));
ord = parse_order(obuf, u->faction->locale);
if (ord != NULL) {
addlist(&u->orders, ord);
}
}
set_order(&u->thisorder, NULL);
assert(u_race(u));
@ -1257,9 +1245,7 @@ faction *readfaction(struct gamedata * data)
}
a_read(data->store, &f->attribs, f);
if (data->version >= CLAIM_VERSION) {
read_items(data->store, &f->items);
}
for (;;) {
READ_TOK(data->store, name, sizeof(name));
if (strcmp("end", name) == 0)
@ -1286,17 +1272,6 @@ faction *readfaction(struct gamedata * data)
}
sfp = &f->allies;
if (data->version < ALLIANCES_VERSION) {
int p;
READ_INT(data->store, &p);
while (--p >= 0) {
int aid, state;
READ_INT(data->store, &aid);
READ_INT(data->store, &state);
sfp = addally(f, sfp, aid, state);
}
}
else {
for (;;) {
int aid = 0;
READ_INT(data->store, &aid);
@ -1309,7 +1284,6 @@ faction *readfaction(struct gamedata * data)
break;
}
}
}
read_groups(data->store, f);
f->spellbook = 0;
if (data->version >= REGIONOWNER_VERSION) {
@ -1439,9 +1413,8 @@ int readgame(const char *filename, int backup)
getchar();
}
}
else if (gdata.version >= SAVEXMLNAME_VERSION) {
char basefile[32];
READ_STR(&store, basefile, sizeof(basefile));
else {
READ_STR(&store, NULL, 0);
}
a_read(&store, &global.attribs, NULL);
READ_INT(&store, &turn);
@ -1512,9 +1485,7 @@ int readgame(const char *filename, int backup)
}
/* Read factions */
if (gdata.version >= ALLIANCES_VERSION) {
read_alliances(&store);
}
READ_INT(&store, &nread);
log_printf(stdout, " - Einzulesende Parteien: %d\n", nread);
fp = &factions;
@ -1806,9 +1777,7 @@ int writegame(const char *filename)
}
/* Write factions */
#if RELEASE_VERSION>=ALLIANCES_VERSION
write_alliances(&gdata);
#endif
n = listlen(factions);
WRITE_INT(&store, n);
WRITE_SECTION(&store);

11
src/kernel/version.h
View File

@ -10,16 +10,6 @@
without prior permission by the authors of Eressea.
*/
#define CURSETYPE_VERSION 312 /* turn 287 */
#define ALLIANCES_VERSION 313
#define DBLINK_VERSION 314
#define CURSEVIGOURISFLOAT_VERSION 315
#define SAVEXMLNAME_VERSION 316
#define SAVEALLIANCE_VERSION 317
#define CLAIM_VERSION 318
/* 319 is the HSE4 data version */
#define BACTION_VERSION 319 /* building action gets a param string */
#define NOLASTORDER_VERSION 320 /* do not use lastorder */
#define INTPAK_VERSION 329 /* in binary, ints can get packed */
#define NOZEROIDS_VERSION 330 /* 2008-05-16 zero is not a valid ID for anything (including factions) */
#define NOBORDERATTRIBS_VERSION 331 /* 2008-05-17 connection::attribs has been moved to userdata */
@ -38,6 +28,7 @@
#define SAVEGAMEID_VERSION 343 /* instead of XMLNAME, save the game.id parameter from the config */
#define BUILDNO_VERSION 344 /* storing the build number in the save */
#define AUTO_RACENAME_VERSION 345 /* NPC units with name==NULL will automatically get their race for a name */
#define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */
#define RELEASE_VERSION AUTO_RACENAME_VERSION /* current datafile */

33
src/spells/unitcurse.c
View File

@ -53,7 +53,8 @@ static message *cinfo_auraboost(const void *obj, objtype_t typ, const curse * c,
if (self != 0) {
if (curse_geteffect(c) > 100) {
return msg_message("curseinfo::auraboost_0", "unit id", u, c->no);
} else {
}
else {
return msg_message("curseinfo::auraboost_1", "unit id", u, c->no);
}
}
@ -83,7 +84,7 @@ static message *cinfo_slave(const void *obj, objtype_t typ, const curse * c,
unused_arg(typ);
assert(typ == TYP_UNIT);
u = (unit *) obj;
u = (unit *)obj;
if (self != 0) {
return msg_message("curseinfo::slave_1", "unit duration id", u, c->duration,
@ -93,8 +94,8 @@ static message *cinfo_slave(const void *obj, objtype_t typ, const curse * c,
}
static struct curse_type ct_slavery = { "slavery",
CURSETYP_NORM, 0, NO_MERGE,
cinfo_slave
CURSETYP_NORM, 0, NO_MERGE,
cinfo_slave
};
/* ------------------------------------------------------------- */
@ -109,7 +110,7 @@ static message *cinfo_calm(const void *obj, objtype_t typ, const curse * c,
if (c->magician && c->magician->faction) {
faction *f = c->magician->faction;
unit *u = (unit *) obj;
unit *u = (unit *)obj;
if (f == NULL || self == 0) {
const struct race *rc = u_irace(c->magician);
@ -137,7 +138,7 @@ static message *cinfo_speed(const void *obj, objtype_t typ, const curse * c,
assert(typ == TYP_UNIT);
if (self != 0) {
unit *u = (unit *) obj;
unit *u = (unit *)obj;
return msg_message("curseinfo::speed_1", "unit number duration id", u,
c->data.i, c->duration, c->no);
}
@ -160,7 +161,7 @@ message *cinfo_unit(const void *obj, objtype_t typ, const curse * c, int self)
assert(typ == TYP_UNIT);
if (self != 0) {
unit *u = (unit *) obj;
unit *u = (unit *)obj;
return msg_message(mkname("curseinfo", c->type->cname), "unit id", u,
c->no);
}
@ -184,7 +185,7 @@ static message *cinfo_kaelteschutz(const void *obj, objtype_t typ, const curse *
assert(typ == TYP_UNIT);
if (self != 0) {
unit *u = (unit *) obj;
unit *u = (unit *)obj;
return msg_message("curseinfo::warmth_1", "unit number id", u,
get_cursedmen(u, c), c->no);
}
@ -235,7 +236,7 @@ static message *cinfo_sparkle(const void *obj, objtype_t typ, const curse * c,
unused_arg(typ);
assert(typ == TYP_UNIT);
u = (unit *) obj;
u = (unit *)obj;
if (!c->magician || !c->magician->faction)
return NULL;
@ -259,7 +260,7 @@ static message *cinfo_sparkle(const void *obj, objtype_t typ, const curse * c,
}
static struct curse_type ct_sparkle = { "sparkle",
CURSETYP_UNIT, CURSE_SPREADMODULO, (M_MEN | M_DURATION), cinfo_sparkle
CURSETYP_UNIT, CURSE_SPREADMODULO, (M_MEN | M_DURATION), cinfo_sparkle
};
/* ------------------------------------------------------------- */
@ -267,7 +268,7 @@ static struct curse_type ct_sparkle = { "sparkle",
* C_STRENGTH
*/
static struct curse_type ct_strength = { "strength",
CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, cinfo_simple
CURSETYP_UNIT, CURSE_SPREADMODULO, M_MEN, cinfo_simple
};
/* ------------------------------------------------------------- */
@ -312,12 +313,7 @@ static struct curse_type ct_magicresistance = {
static int read_skill(struct storage *store, curse * c, void *target)
{
int skill;
if (global.data_version < CURSETYPE_VERSION) {
READ_INT(store, &skill);
READ_INT(store, 0); /* men, ignored */
} else {
READ_INT(store, &skill);
}
c->data.i = skill;
return 0;
}
@ -335,11 +331,12 @@ static message *cinfo_skillmod(const void *obj, objtype_t typ, const curse * c,
unused_arg(typ);
if (self != 0) {
unit *u = (unit *) obj;
unit *u = (unit *)obj;
int sk = c->data.i;
if (c->effect > 0) {
return msg_message("curseinfo::skill_1", "unit skill id", u, sk, c->no);
} else if (c->effect < 0) {
}
else if (c->effect < 0) {
return msg_message("curseinfo::skill_2", "unit skill id", u, sk, c->no);
}
}

31
src/triggers/createcurse.c
View File

@ -1,7 +1,7 @@
/*
Copyright (c) 1998-2010, Enno Rehling <enno@eressea.de>
Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de>
Katja Zedel <katze@felidae.kn-bremen.de
Christian Schlittchen <corwin@amber.kn-bremen.de>
Permission to use, copy, modify, and/or distribute this software for any
purpose with or without fee is hereby granted, provided that the above
@ -69,11 +69,12 @@ static int createcurse_handle(trigger * t, void *data)
/* call an event handler on createcurse.
* data.v -> ( variant event, int timer )
*/
createcurse_data *td = (createcurse_data *) t->data.v;
createcurse_data *td = (createcurse_data *)t->data.v;
if (td->mage && td->target && td->mage->number && td->target->number) {
create_curse(td->mage, &td->target->attribs,
td->type, td->vigour, td->duration, td->effect, td->men);
} else {
}
else {
log_error("could not perform createcurse::handle()\n");
}
unused_arg(data);
@ -82,7 +83,7 @@ static int createcurse_handle(trigger * t, void *data)
static void createcurse_write(const trigger * t, struct storage *store)
{
createcurse_data *td = (createcurse_data *) t->data.v;
createcurse_data *td = (createcurse_data *)t->data.v;
write_unit_reference(td->mage, store);
write_unit_reference(td->target, store);
WRITE_TOK(store, td->type->cname);
@ -94,24 +95,12 @@ static void createcurse_write(const trigger * t, struct storage *store)
static int createcurse_read(trigger * t, struct storage *store)
{
createcurse_data *td = (createcurse_data *) t->data.v;
createcurse_data *td = (createcurse_data *)t->data.v;
char zText[128];
read_reference(&td->mage, store, read_unit_reference, resolve_unit);
read_reference(&td->target, store, read_unit_reference, resolve_unit);
if (global.data_version < CURSETYPE_VERSION) {
int id1, id2, n;
READ_INT(store, &id1);
READ_INT(store, &id2);
assert(id2 == 0);
READ_FLT(store, &td->vigour);
READ_INT(store, &td->duration);
READ_INT(store, &n);
td->effect = (float)n;
READ_INT(store, &td->men);
td->type = ct_find(oldcursename(id1));
} else {
READ_TOK(store, zText, sizeof(zText));
td->type = ct_find(zText);
READ_FLT(store, &td->vigour);
@ -120,11 +109,11 @@ static int createcurse_read(trigger * t, struct storage *store)
int n;
READ_INT(store, &n);
td->effect = (float)n;
} else {
}
else {
READ_FLT(store, &td->effect);
}
READ_INT(store, &td->men);
}
return AT_READ_OK;
}
@ -141,7 +130,7 @@ trigger *trigger_createcurse(struct unit * mage, struct unit * target,
const curse_type * ct, float vigour, int duration, float effect, int men)
{
trigger *t = t_new(&tt_createcurse);
createcurse_data *td = (createcurse_data *) t->data.v;
createcurse_data *td = (createcurse_data *)t->data.v;
td->mage = mage;
td->target = target;
td->type = ct;