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

Rename emp_obj_chr_name() to empobj_chr_name()

Browse source
This commit is contained in:
Markus Armbruster 2008-02-25 21:11:19 +01:00
parent 9b8683736b
commit f99adf4b3c
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
include/empobj.h
View file

@ -100,7 +100,7 @@ struct empobj_chr;
extern char *obj_nameof(struct empobj *gp); extern char *obj_nameof(struct empobj *gp);
extern struct empobj_chr *get_empobj_chr(struct empobj *gp); extern struct empobj_chr *get_empobj_chr(struct empobj *gp);
extern char *emp_obj_chr_name(struct empobj *gp); extern char *empobj_chr_name(struct empobj *gp);
extern int get_empobj_mob_max(int type); extern int get_empobj_mob_max(int type);
#endif #endif

2
src/lib/subs/empobj.c
View file

@ -77,7 +77,7 @@ get_empobj_chr(struct empobj *gp)
} }
char * char *
emp_obj_chr_name(struct empobj *gp) empobj_chr_name(struct empobj *gp)
{ {
switch (gp->ef_type) { switch (gp->ef_type) {
case EF_LAND: case EF_LAND:

4
src/lib/subs/maps.c
View file

@ -254,7 +254,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp)
if (ef_mappable[i] == EF_NUKE) if (ef_mappable[i] == EF_NUKE)
wmap[y][x] = 'N'; wmap[y][x] = 'N';
else { else {
if ((name = emp_obj_chr_name(&unit.gen)) == NULL) if ((name = empobj_chr_name(&unit.gen)) == NULL)
return RET_FAIL; return RET_FAIL;
wmap[y][x] = *name & ~0x20; wmap[y][x] = *name & ~0x20;
} }
@ -361,7 +361,7 @@ unit_map(int unit_type, int uid, struct nstr_sect *nsp, char *originp)
if (unit_type == EF_NUKE) if (unit_type == EF_NUKE)
*originp = 'n'; *originp = 'n';
else { else {
if ((name = emp_obj_chr_name(&unit.gen)) == NULL) if ((name = empobj_chr_name(&unit.gen)) == NULL)
return RET_FAIL; return RET_FAIL;
*originp = *name; *originp = *name;
} }

2
src/lib/subs/unitsub.c
View file

@ -72,7 +72,7 @@ unit_list(struct emp_qelem *unit_list)
if (CANT_HAPPEN(type != unit->ef_type)) if (CANT_HAPPEN(type != unit->ef_type))
continue; continue;
pr("%4d ", unit->uid); pr("%4d ", unit->uid);
pr("%-16.16s ", emp_obj_chr_name(unit)); pr("%-16.16s ", empobj_chr_name(unit));
prxy("%4d,%-4d ", unit->x, unit->y, unit->own); prxy("%4d,%-4d ", unit->x, unit->y, unit->own);
pr("%1.1s", &unit->group); pr("%1.1s", &unit->group);
pr("%4d%%", unit->effic); pr("%4d%%", unit->effic);