Remove unused get_empobj_chr()

[empserver] / src / lib / subs / empobj.c

diff --git a/src/lib/subs/empobj.c b/src/lib/subs/empobj.c
index 3fb59adf6b341a469120f79a249a6d523dbd81ab..fb38f739c98735b082eb8a8405d476cfc742a605 100644 (file)
--- a/src/lib/subs/empobj.c
+++ b/src/lib/subs/empobj.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -27,10 +26,10 @@
  *
  *  empobj.c: Common functions on struct empobj and
  *            union empobj_storage
- * 
+ *
  *  Known contributors to this file:
  *     Ron Koenderink, 2006
- *     Markus Armbruster, 2006
+ *     Markus Armbruster, 2006-2008
  */
 
 #include <config.h>
@@ -57,27 +56,8 @@ obj_nameof(struct empobj *gp)
     return "The Beast #666";
 }
 
-struct empobj_chr *
-get_empobj_chr(struct empobj *gp)
-{
-    switch (gp->ef_type) {
-    case EF_LAND:
-       return (struct empobj_chr *)&lchr[(int)gp->type];
-    case EF_SHIP:
-       return (struct empobj_chr *)&mchr[(int)gp->type];
-    case EF_PLANE:
-       return (struct empobj_chr *)&plchr[(int)gp->type];
-    case EF_NUKE:
-       return (struct empobj_chr *)&nchr[(int)gp->type];
-    case EF_SECTOR:
-       return (struct empobj_chr *)&dchr[(int)gp->type];
-    }
-    CANT_REACH();
-    return NULL;
-}
-
 char *
-emp_obj_chr_name(struct empobj *gp)
+empobj_chr_name(struct empobj *gp)
 {
     switch (gp->ef_type) {
     case EF_LAND:
@@ -92,7 +72,7 @@ emp_obj_chr_name(struct empobj *gp)
        return dchr[(int)gp->type].d_name;
     }
     CANT_REACH();
-    return NULL;
+    return "The Beast";
 }
 
 int