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

(get_empobjp): New. Returns a pointer an empobj.

Browse source 
(emp_obj_chr_name): New. Returns a pointer to the characteristics name
for an empobj.
(unit_map):  Simplify unit_map() by using get_empobjp() and
emp_obj_chr_name().
(map,  cmd_move_map):  Switch to EF_SHIP as unit_map does not default
to EF_SHIP for EF_BAD anymore.
This commit is contained in:
Ron Koenderink 2006-07-26 00:21:58 +00:00
parent b70653815c
commit fec9878ca4
5 changed files with 41 additions and 24 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/lib/common/maps.c
View file

@ -376,33 +376,20 @@ map_char(unsigned char type, natid own, int owner_or_god)
int
unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp)
{
struct shpstr origs;
struct lndstr origl;
struct plnstr origp;
struct nukstr orign;
struct empobj *gp;
struct range range;
char *name;
if (unit_type == EF_LAND) {
if (!getland(uid, &origl) || !player->owner || origl.lnd_own == 0)
return RET_FAIL;
gp = (struct empobj *)&origl;
*originp = *lchr[(int)origl.lnd_type].l_name;
} else if (unit_type == EF_PLANE) {
if (!getplane(uid, &origp) || !player->owner || origp.pln_own == 0)
return RET_FAIL;
gp = (struct empobj *)&origp;
*originp = *plchr[(int)origp.pln_type].pl_name;
} else if (unit_type == EF_NUKE) {
if (!getnuke(uid, &orign) || !player->owner || orign.nuk_own == 0)
return RET_FAIL;
gp = (struct empobj *)&orign;
gp = get_empobjp(unit_type, uid);
if (!gp || !player->owner || gp->own == 0)
return RET_FAIL;
if (unit_type == EF_NUKE)
*originp = 'n';
} else {
if (!getship(uid, &origs) || !player->owner || origs.shp_own == 0)
else {
if ((name = emp_obj_chr_name(gp)) == NULL)
return RET_FAIL;
gp = (struct empobj *)&origs;
*originp = *mchr[(int)origs.shp_type].m_name;
*originp = *name;
}
range.lx = xnorm(gp->x - 10);