empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(getobj, setnum): Move override of cur_id from getobj() to setnum().

Browse source 
Remove the now unused parameters of getobj().  Callers changed.
This commit is contained in:
Markus Armbruster 2007-08-05 17:34:24 +00:00
parent 94324f7966
commit b8b231be42
1 changed files with 9 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

14
src/lib/common/xundump.c
View file

@ -402,14 +402,12 @@ fldval_must_match(int fldno)
} }
static void * static void *
getobj(struct castr *ca, int altid) getobj(void)
{ {
struct empfile *ep = &empfile[cur_type]; struct empfile *ep = &empfile[cur_type];
int need_sentinel = !EF_IS_GAME_STATE(cur_type); int need_sentinel = !EF_IS_GAME_STATE(cur_type);
if (!cur_obj) { if (!cur_obj) {
if (ca->ca_table == cur_type)
cur_id = altid;
cur_obj_is_blank = cur_id >= ep->fids; cur_obj_is_blank = cur_id >= ep->fids;
if (cur_obj_is_blank) { if (cur_obj_is_blank) {
/* TODO grow cache (and posssibly file) unless EFF_STATIC */ /* TODO grow cache (and posssibly file) unless EFF_STATIC */
@ -438,7 +436,13 @@ setnum(int fldno, double dbl)
if (!ca) if (!ca)
return -1; return -1;
memb_ptr = getobj(ca, (int)dbl); /*
* If this is the record index, put it into cur_id.
*/
if (fldno == 0 && ca->ca_table == cur_type)
cur_id = (int)dbl;
memb_ptr = getobj();
if (!memb_ptr) if (!memb_ptr)
return -1; return -1;
memb_ptr += ca->ca_off; memb_ptr += ca->ca_off;
@ -518,7 +522,7 @@ setstr(int fldno, char *str)
if (!ca) if (!ca)
return -1; return -1;
memb_ptr = getobj(ca, cur_id); memb_ptr = getobj();
if (!memb_ptr) if (!memb_ptr)
return -1; return -1;
memb_ptr += ca->ca_off; memb_ptr += ca->ca_off;