Rename emp_obj_chr_name() to empobj_chr_name()

diff --git a/include/empobj.h b/include/empobj.h
index 514154a959fbcaf2636aff1812be15aacb34fb3c..57c517eb0532f0a817be128df678f8d9f78153cd 100644 (file)
--- 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 3fb59adf6b341a469120f79a249a6d523dbd81ab..c69eccbee48cc8d05e35b1ff471bb34a04e8c2cf 100644 (file)
--- 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 ca9eaa0b2d5454f3c64c905741fe2a8727a8ec8d..e3a7cac6256a2291d0c272800a4f9b998e78cfc0 100644 (file)
--- 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 9b5aacded16f412f7f9dac06914f48590223841e..ed09b37770bbee4c9101d86c309faeb9e3209109 100644 (file)
--- 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);