Update copyright notice

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

diff --git a/src/lib/subs/empobj.c b/src/lib/subs/empobj.c
index 2a1cca6b88b56da8a94c11fa0b0548c31ec2f0ea..0a3e84c9975caa7ee6cd8f47413eadf23f8580d4 100644 (file)
--- a/src/lib/subs/empobj.c
+++ b/src/lib/subs/empobj.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -27,10 +27,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,20 +57,6 @@ obj_nameof(struct empobj *gp)
     return "The Beast #666";
 }
 
-struct empobj *
-get_empobjp(int type, int id)
-{
-    if (CANT_HAPPEN(type == EF_SECTOR || type == EF_BAD))
-       return NULL;
-    return ef_ptr(type, id);
-}
-
-int
-put_empobj(int type, int id, struct empobj *gp)
-{
-    return ef_write(type, id, gp);
-}
-
 struct empobj_chr *
 get_empobj_chr(struct empobj *gp)
 {
@@ -91,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:
@@ -106,7 +92,7 @@ emp_obj_chr_name(struct empobj *gp)
        return dchr[(int)gp->type].d_name;
     }
     CANT_REACH();
-    return NULL;
+    return "The Beast";
 }
 
 int