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

The minimum data version has actually been 332 for a long time.

This commit is contained in:
Enno Rehling 2017-09-21 16:30:29 +02:00
parent 89e162c12a
commit cda17d5379
3 changed files with 3 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/kernel/connection.c
View File

@ -660,19 +660,6 @@ int read_borders(gamedata *data)
b->id = bid; b->id = bid;
assert(bid <= nextborder); assert(bid <= nextborder);
type->read(b, data); 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) { if (!type->write) {
log_warning("invalid border '%s' between '%s' and '%s'\n", zText, regionname(from, 0), regionname(to, 0)); log_warning("invalid border '%s' between '%s' and '%s'\n", zText, regionname(from, 0), regionname(to, 0));
} }

2
src/spells/borders.c
View File

@ -94,9 +94,7 @@ static void wall_read(connection * b, gamedata * data)
read_reference(&fd->mage, data, read_unit_reference, resolve_unit); read_reference(&fd->mage, data, read_unit_reference, resolve_unit);
READ_INT(data->store, &fd->force); 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; fd->active = true;
} }

7
src/util/gamedata.h
View File

@ -5,10 +5,7 @@
#include <stream.h> #include <stream.h>
#define INTPAK_VERSION 329 /* in binary, ints can get packed. starting with E2/572 */ #define UIDHASH_VERSION 332 /* 2008-05-22 = 572 borders use the region.uid to store */
#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 REGIONOWNER_VERSION 333 /* 2009-05-14 regions have owners and morale */ #define REGIONOWNER_VERSION 333 /* 2009-05-14 regions have owners and morale */
#define ALLIANCELEADER_VERSION 333 /* alliances have a leader */ #define ALLIANCELEADER_VERSION 333 /* alliances have a leader */
#define CURSEFLOAT_VERSION 334 /* all curse-effects are float */ #define CURSEFLOAT_VERSION 334 /* all curse-effects are float */
@ -43,7 +40,7 @@
#define CRYPT_VERSION 400 /* passwords are encrypted */ #define CRYPT_VERSION 400 /* passwords are encrypted */
#define RELEASE_VERSION SKILLSORT_VERSION /* current datafile */ #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 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 */ #define STREAM_VERSION 2 /* internal encoding of binary files */