From f99adf4b3cd7e0373b5db22c5e1abaec54a6f16d Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Mon, 25 Feb 2008 21:11:19 +0100 Subject: [PATCH] Rename emp_obj_chr_name() to empobj_chr_name() --- include/empobj.h | 2 +- src/lib/subs/empobj.c | 2 +- src/lib/subs/maps.c | 4 ++-- src/lib/subs/unitsub.c | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/include/empobj.h b/include/empobj.h index 514154a95..57c517eb0 100644 --- a/include/empobj.h +++ b/include/empobj.h @@ -100,7 +100,7 @@ struct empobj_chr; extern char *obj_nameof(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); #endif diff --git a/src/lib/subs/empobj.c b/src/lib/subs/empobj.c index 3fb59adf6..c69eccbee 100644 --- a/src/lib/subs/empobj.c +++ b/src/lib/subs/empobj.c @@ -77,7 +77,7 @@ get_empobj_chr(struct empobj *gp) } char * -emp_obj_chr_name(struct empobj *gp) +empobj_chr_name(struct empobj *gp) { switch (gp->ef_type) { case EF_LAND: diff --git a/src/lib/subs/maps.c b/src/lib/subs/maps.c index ca9eaa0b2..e3a7cac62 100644 --- a/src/lib/subs/maps.c +++ b/src/lib/subs/maps.c @@ -254,7 +254,7 @@ draw_map(int bmap, char origin, int map_flags, struct nstr_sect *nsp) if (ef_mappable[i] == EF_NUKE) wmap[y][x] = 'N'; else { - if ((name = emp_obj_chr_name(&unit.gen)) == NULL) + if ((name = empobj_chr_name(&unit.gen)) == NULL) return RET_FAIL; 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) *originp = 'n'; else { - if ((name = emp_obj_chr_name(&unit.gen)) == NULL) + if ((name = empobj_chr_name(&unit.gen)) == NULL) return RET_FAIL; *originp = *name; } diff --git a/src/lib/subs/unitsub.c b/src/lib/subs/unitsub.c index 9b5aacded..ed09b3777 100644 --- a/src/lib/subs/unitsub.c +++ b/src/lib/subs/unitsub.c @@ -72,7 +72,7 @@ unit_list(struct emp_qelem *unit_list) if (CANT_HAPPEN(type != unit->ef_type)) continue; 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); pr("%1.1s", &unit->group); pr("%4d%%", unit->effic); -- 2.43.0