Update copyright notice

[empserver] / src / lib / update / nxtitemp.c

diff --git a/src/lib/update/nxtitemp.c b/src/lib/update/nxtitemp.c
index ba8379f5590a1bdb5704f17e27f66f965d009432..21578bca608a6e163a4eb1207579c85708ec1ee3 100644 (file)
--- a/src/lib/update/nxtitemp.c
+++ b/src/lib/update/nxtitemp.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
@@ -31,22 +31,18 @@
  *     Dave Pare, 1989
  */
 
-#include "misc.h"
-#include "xy.h"
-#include "ship.h"
+#include <config.h>
+
+#include "empobj.h"
 #include "land.h"
 #include "nsc.h"
-#include "file.h"
-#include "genitem.h"
-#include "player.h"
+#include "ship.h"
 #include "update.h"
-#include "gen.h"
-#include "common.h"
 
-s_char *
-nxtitemp(struct nstr_item *np, int owner)
+void *
+nxtitemp(struct nstr_item *np)
 {
-    struct genitem *gp;
+    struct empobj *gp;
     int selected;
 
     if (np->sel == NS_UNDEF)
@@ -60,22 +56,15 @@ nxtitemp(struct nstr_item *np, int owner)
        } else {
            np->cur++;
        }
-       gp = (struct genitem *)ef_ptr(np->type, np->cur);
-       if (gp == (struct genitem *)0)
+       gp = ef_ptr(np->type, np->cur);
+       if (!gp)
            return 0;
 
        selected = 1;
        switch (np->sel) {
-           /*
-            * This one won't work unless you're running in emp_player
-            *
-            */
        case NS_LIST:
-           if ((np->flags & EFF_OWNER) && !owner)
-               selected = 0;
            break;
        case NS_ALL:
-           /* XXX maybe combine NS_LIST and NS_ALL later */
            break;
        case NS_DIST:
            if (!xyinrange(gp->x, gp->y, &np->range)) {
@@ -102,7 +91,7 @@ nxtitemp(struct nstr_item *np, int owner)
                selected = 0;
            break;
        default:
-           CANT_HAPPEN("bad np->sel");
+           CANT_REACH();
            return 0;
        }
        if (selected && np->ncond) {
@@ -111,5 +100,5 @@ nxtitemp(struct nstr_item *np, int owner)
                selected = 0;
        }
     } while (!selected);
-    return (s_char *)gp;
+    return gp;
 }