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

switch remaining flags from unsigned to int.

This commit is contained in:
Enno Rehling 2014-06-18 20:53:06 -07:00
parent e4fa797590
commit ceabbebc90
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/kernel/connection.c
View File

@ -625,7 +625,7 @@ void write_borders(struct storage *store)
int read_borders(struct storage *store) int read_borders(struct storage *store)
{ {
for (;;) { for (;;) {
unsigned int bid = 0; int bid = 0;
char zText[32]; char zText[32];
connection *b; connection *b;
region *from, *to; region *from, *to;
@ -634,7 +634,7 @@ int read_borders(struct storage *store)
READ_TOK(store, zText, sizeof(zText)); READ_TOK(store, zText, sizeof(zText));
if (!strcmp(zText, "end")) if (!strcmp(zText, "end"))
break; break;
READ_UINT(store, &bid); READ_INT(store, &bid);
if (global.data_version < UIDHASH_VERSION) { if (global.data_version < UIDHASH_VERSION) {
int fx, fy, tx, ty; int fx, fy, tx, ty;
READ_INT(store, &fx); READ_INT(store, &fx);
@ -644,9 +644,9 @@ int read_borders(struct storage *store)
from = findregion(fx, fy); from = findregion(fx, fy);
to = findregion(tx, ty); to = findregion(tx, ty);
} else { } else {
unsigned int fid, tid; int fid, tid;
READ_UINT(store, &fid); READ_INT(store, &fid);
READ_UINT(store, &tid); READ_INT(store, &tid);
from = findregionbyid(fid); from = findregionbyid(fid);
to = findregionbyid(tid); to = findregionbyid(tid);
} }

4
src/kernel/curse.c
View File

@ -187,13 +187,13 @@ int curse_read(attrib * a, void *owner, struct storage *store)
int ur; int ur;
char cursename[64]; char cursename[64];
int n; int n;
unsigned int flags; int flags;
float flt; float flt;
READ_INT(store, &c->no); READ_INT(store, &c->no);
chash(c); chash(c);
READ_TOK(store, cursename, sizeof(cursename)); READ_TOK(store, cursename, sizeof(cursename));
READ_UINT(store, &flags); READ_INT(store, &flags);
READ_INT(store, &c->duration); READ_INT(store, &c->duration);
if (global.data_version >= CURSEVIGOURISFLOAT_VERSION) { if (global.data_version >= CURSEVIGOURISFLOAT_VERSION) {
READ_FLT(store, &flt); READ_FLT(store, &flt);

4
src/spells/borders.c
View File

@ -46,7 +46,7 @@ void cw_write(const attrib * a, const void *target, storage * store)
} }
typedef struct bresolve { typedef struct bresolve {
unsigned int id; int id;
curse *self; curse *self;
} bresolve; } bresolve;
@ -61,7 +61,7 @@ static int cw_read(attrib * a, void *target, storage * store)
curse_read(a, store, target); curse_read(a, store, target);
br->self = c; br->self = c;
READ_UINT(store, &br->id); READ_INT(store, &br->id);
var.i = br->id; var.i = br->id;
ur_add(var, &wc->wall, resolve_borderid); ur_add(var, &wc->wall, resolve_borderid);