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

Factor check_obj_ok() out of the check_*_ok()

Browse source
This commit is contained in:
Markus Armbruster 2012-07-01 12:06:37 +02:00
parent e25ff14f0c
commit 29f6d10a34
2 changed files with 26 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

1
include/prototypes.h
View file

@ -388,6 +388,7 @@ extern void bsanct(void);
/* caploss.c */ /* caploss.c */
extern void caploss(struct sctstr *, natid, char *); extern void caploss(struct sctstr *, natid, char *);
/* check.c */ /* check.c */
extern int check_obj_ok(struct empobj *);
extern int check_sect_ok(struct sctstr *); extern int check_sect_ok(struct sctstr *);
extern int check_ship_ok(struct shpstr *); extern int check_ship_ok(struct shpstr *);
extern int check_land_ok(struct lndstr *); extern int check_land_ok(struct lndstr *);

64
src/lib/subs/check.c
View file

@ -33,6 +33,7 @@
#include <config.h> #include <config.h>
#include <ctype.h>
#include "commodity.h" #include "commodity.h"
#include "empobj.h" #include "empobj.h"
#include "file.h" #include "file.h"
@ -64,82 +65,67 @@ obj_changed(struct empobj *obj)
} }
int int
check_sect_ok(struct sctstr *sectp) check_obj_ok(struct empobj *obj)
{ {
if (obj_changed((struct empobj *)sectp)) { char *s;
pr("Sector %s has changed!\n",
xyas(sectp->sct_x, sectp->sct_y, player->cnum)); if (obj_changed(obj)) {
if (obj->ef_type == EF_SECTOR)
pr("Sector %s has changed!\n",
xyas(obj->x, obj->y, player->cnum));
else {
s = ef_nameof_pretty(obj->ef_type);
pr("%c%s %d has changed!\n", toupper(*s), s + 1, obj->uid);
}
return 0; return 0;
} }
return 1; return 1;
} }
int
check_sect_ok(struct sctstr *sectp)
{
return check_obj_ok((struct empobj *)sectp);
}
int int
check_ship_ok(struct shpstr *shipp) check_ship_ok(struct shpstr *shipp)
{ {
if (obj_changed((struct empobj *)shipp)) { return check_obj_ok((struct empobj *)shipp);
pr("Ship #%d has changed!\n", shipp->shp_uid);
return 0;
}
return 1;
} }
int int
check_plane_ok(struct plnstr *planep) check_plane_ok(struct plnstr *planep)
{ {
if (obj_changed((struct empobj *)planep)) { return check_obj_ok((struct empobj *)planep);
pr("Plane #%d has changed!\n", planep->pln_uid);
return 0;
}
return 1;
} }
int int
check_land_ok(struct lndstr *landp) check_land_ok(struct lndstr *landp)
{ {
if (obj_changed((struct empobj *)landp)) { return check_obj_ok((struct empobj *)landp);
pr("Land unit #%d has changed!\n", landp->lnd_uid);
return 0;
}
return 1;
} }
int int
check_nuke_ok(struct nukstr *nukep) check_nuke_ok(struct nukstr *nukep)
{ {
if (obj_changed((struct empobj *)nukep)) { return check_obj_ok((struct empobj *)nukep);
pr("Nuke %d has changed!\n", nukep->nuk_uid);
return 0;
}
return 1;
} }
int int
check_loan_ok(struct lonstr *loanp) check_loan_ok(struct lonstr *loanp)
{ {
if (obj_changed((struct empobj *)loanp)) { return check_obj_ok((struct empobj *)loanp);
pr("Loan %d has changed!\n", loanp->l_uid);
return 0;
}
return 1;
} }
int int
check_comm_ok(struct comstr *commp) check_comm_ok(struct comstr *commp)
{ {
if (obj_changed((struct empobj *)commp)) { return check_obj_ok((struct empobj *)commp);
pr("Commodity %d has changed!\n", commp->com_uid);
return 0;
}
return 1;
} }
int int
check_trade_ok(struct trdstr *tp) check_trade_ok(struct trdstr *tp)
{ {
if (obj_changed((struct empobj *)tp)) { return check_obj_ok((struct empobj *)tp);
pr("Trade lot #%d has changed!\n", tp->trd_uid);
return 0;
}
return 1;
} }