Clean up superfluous includes

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

diff --git a/src/lib/subs/nxtitem.c b/src/lib/subs/nxtitem.c
index 494f78cff5c4ed87a2314caed3677e4dfd771cc0..0480f563fcb989b7d81d4248c2e64d0b2a71ae7c 100644 (file)
--- a/src/lib/subs/nxtitem.c
+++ b/src/lib/subs/nxtitem.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/>.
  *
  *  ---
  *
@@ -26,7 +25,7 @@
  *  ---
  *
  *  nxtitem.c: Get the next item from a list
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
  */
@@ -38,9 +37,9 @@
 #include "land.h"
 #include "misc.h"
 #include "nsc.h"
-#include "player.h"
 #include "prototypes.h"
 #include "ship.h"
+#include "unit.h"
 #include "xy.h"
 
 int
@@ -58,6 +57,11 @@ nxtitem(struct nstr_item *np, void *ptr)
            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++;
        }
@@ -66,7 +70,7 @@ nxtitem(struct nstr_item *np, void *ptr)
        selected = 1;
        switch (np->sel) {
        case NS_LIST:
-           break;
+       case NS_CARGO:
        case NS_ALL:
            break;
        case NS_DIST: