diff --git a/src/kernel/connection.c b/src/kernel/connection.c index 43caee729..428ee5136 100644 --- a/src/kernel/connection.c +++ b/src/kernel/connection.c @@ -660,19 +660,6 @@ int read_borders(gamedata *data) b->id = bid; assert(bid <= nextborder); type->read(b, data); - if (data->version < NOBORDERATTRIBS_VERSION) { - attrib *a = NULL; - int result = read_attribs(data, &a, b); - if (border_convert_cb) { - border_convert_cb(b, a); - } - while (a) { - a_remove(&a, a); - } - if (result < 0) { - return result; - } - } if (!type->write) { log_warning("invalid border '%s' between '%s' and '%s'\n", zText, regionname(from, 0), regionname(to, 0)); } diff --git a/src/spells/borders.c b/src/spells/borders.c index 331e7380f..548e1532b 100644 --- a/src/spells/borders.c +++ b/src/spells/borders.c @@ -94,9 +94,7 @@ static void wall_read(connection * b, gamedata * data) read_reference(&fd->mage, data, read_unit_reference, resolve_unit); READ_INT(data->store, &fd->force); - if (data->version >= NOBORDERATTRIBS_VERSION) { - READ_INT(data->store, &fd->countdown); - } + READ_INT(data->store, &fd->countdown); fd->active = true; } diff --git a/src/util/gamedata.h b/src/util/gamedata.h index 7d355f86b..82df55cc3 100644 --- a/src/util/gamedata.h +++ b/src/util/gamedata.h @@ -5,10 +5,7 @@ #include -#define INTPAK_VERSION 329 /* in binary, ints can get packed. starting with E2/572 */ -#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 */ -#define UIDHASH_VERSION 332 /* 2008-05-22 borders use the region.uid to store */ +#define UIDHASH_VERSION 332 /* 2008-05-22 = 572 borders use the region.uid to store */ #define REGIONOWNER_VERSION 333 /* 2009-05-14 regions have owners and morale */ #define ALLIANCELEADER_VERSION 333 /* alliances have a leader */ #define CURSEFLOAT_VERSION 334 /* all curse-effects are float */ @@ -43,7 +40,7 @@ #define CRYPT_VERSION 400 /* passwords are encrypted */ #define RELEASE_VERSION SKILLSORT_VERSION /* current datafile */ -#define MIN_VERSION INTPAK_VERSION /* minimal datafile we support */ +#define MIN_VERSION UIDHASH_VERSION /* minimal datafile we support */ #define MAX_VERSION RELEASE_VERSION /* change this if we can need to read the future datafile, and we can do so */ #define STREAM_VERSION 2 /* internal encoding of binary files */