forked from github/server
switch remaining flags from unsigned to int.
This commit is contained in:
parent
e4fa797590
commit
ceabbebc90
|
@ -625,7 +625,7 @@ void write_borders(struct storage *store)
|
|||
int read_borders(struct storage *store)
|
||||
{
|
||||
for (;;) {
|
||||
unsigned int bid = 0;
|
||||
int bid = 0;
|
||||
char zText[32];
|
||||
connection *b;
|
||||
region *from, *to;
|
||||
|
@ -634,7 +634,7 @@ int read_borders(struct storage *store)
|
|||
READ_TOK(store, zText, sizeof(zText));
|
||||
if (!strcmp(zText, "end"))
|
||||
break;
|
||||
READ_UINT(store, &bid);
|
||||
READ_INT(store, &bid);
|
||||
if (global.data_version < UIDHASH_VERSION) {
|
||||
int fx, fy, tx, ty;
|
||||
READ_INT(store, &fx);
|
||||
|
@ -644,9 +644,9 @@ int read_borders(struct storage *store)
|
|||
from = findregion(fx, fy);
|
||||
to = findregion(tx, ty);
|
||||
} else {
|
||||
unsigned int fid, tid;
|
||||
READ_UINT(store, &fid);
|
||||
READ_UINT(store, &tid);
|
||||
int fid, tid;
|
||||
READ_INT(store, &fid);
|
||||
READ_INT(store, &tid);
|
||||
from = findregionbyid(fid);
|
||||
to = findregionbyid(tid);
|
||||
}
|
||||
|
|
|
@ -187,13 +187,13 @@ int curse_read(attrib * a, void *owner, struct storage *store)
|
|||
int ur;
|
||||
char cursename[64];
|
||||
int n;
|
||||
unsigned int flags;
|
||||
int flags;
|
||||
float flt;
|
||||
|
||||
READ_INT(store, &c->no);
|
||||
chash(c);
|
||||
READ_TOK(store, cursename, sizeof(cursename));
|
||||
READ_UINT(store, &flags);
|
||||
READ_INT(store, &flags);
|
||||
READ_INT(store, &c->duration);
|
||||
if (global.data_version >= CURSEVIGOURISFLOAT_VERSION) {
|
||||
READ_FLT(store, &flt);
|
||||
|
|
|
@ -46,7 +46,7 @@ void cw_write(const attrib * a, const void *target, storage * store)
|
|||
}
|
||||
|
||||
typedef struct bresolve {
|
||||
unsigned int id;
|
||||
int id;
|
||||
curse *self;
|
||||
} bresolve;
|
||||
|
||||
|
@ -61,7 +61,7 @@ static int cw_read(attrib * a, void *target, storage * store)
|
|||
|
||||
curse_read(a, store, target);
|
||||
br->self = c;
|
||||
READ_UINT(store, &br->id);
|
||||
READ_INT(store, &br->id);
|
||||
|
||||
var.i = br->id;
|
||||
ur_add(var, &wc->wall, resolve_borderid);
|
||||
|
|
Loading…
Reference in New Issue