Fix trailing whitespace

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

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 93c7b093e16f60faa1103a8e51acd4a4c0d97bda..cfcf777600a49978e30288cfdc10c7ac08a45328 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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,93 +19,93 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  nxtitem.c: Get the next item from a list
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "plane.h"
-#include "ship.h"
-#include "nuke.h"
+#include <config.h>
+
+#include "empobj.h"
+#include "file.h"
 #include "land.h"
+#include "misc.h"
 #include "nsc.h"
-#include "nat.h"
-#include "file.h"
-#include "genitem.h"
+#include "player.h"
 #include "prototypes.h"
+#include "ship.h"
+#include "unit.h"
+#include "xy.h"
 
 int
-nxtitem(struct nstr_item *np, caddr_t ptr)
+nxtitem(struct nstr_item *np, void *ptr)
 {
-    struct genitem *gp;
+    struct empobj *gp;
     int selected;
 
     if (np->sel == NS_UNDEF)
        return 0;
-    gp = (struct genitem *)ptr;
+    gp = (struct empobj *)ptr;
     do {
        if (np->sel == NS_LIST) {
            np->index++;
            if (np->index >= np->size)
                return 0;
            np->cur = np->list[np->index];
+       } else if (np->sel == NS_CARGO) {
+           if (np->next < 0)
+               return 0;
+           np->cur = np->next;
+           np->next = unit_cargo_next(np->type, np->next);
        } else {
            np->cur++;
        }
-       if (!np->read(np->type, np->cur, ptr)) {
-           /* if read fails, fatal */
+       if (!ef_read(np->type, np->cur, ptr))
            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) && !player->owner)
-               selected = 0;
-           break;
+       case NS_CARGO:
        case NS_ALL:
-           /* XXX maybe combine NS_LIST and NS_ALL later */
            break;
        case NS_DIST:
+           if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
+               return 0;
            if (!xyinrange(gp->x, gp->y, &np->range)) {
                selected = 0;
                break;
            }
-           np->curdist = mapdist((int)gp->x, (int)gp->y,
-                                 (int)np->cx, (int)np->cy);
+           np->curdist = mapdist(gp->x, gp->y, np->cx, np->cy);
            if (np->curdist > np->dist)
                selected = 0;
            break;
        case NS_AREA:
+           if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
+               return 0;
            if (!xyinrange(gp->x, gp->y, &np->range))
                selected = 0;
-           if (gp->x == np->range.hx || gp->y == np->range.hy)
-               selected = 0;
            break;
        case NS_XY:
+           if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_XY)))
+               return 0;
            if (xnorm(gp->x) != np->cx || ynorm(gp->y) != np->cy)
                selected = 0;
            break;
        case NS_GROUP:
+           if (CANT_HAPPEN(!(ef_flags(np->type) & EFF_GROUP)))
+               return 0;
            if (np->group != gp->group)
                selected = 0;
            break;
        default:
-           logerror("nxtitem: bad selector %d\n", np->sel);
+           CANT_REACH();
            return 0;
        }
        if (selected && np->ncond) {