Update copyright notice

[empserver] / src / lib / commands / ndump.c

diff --git a/src/lib/commands/ndump.c b/src/lib/commands/ndump.c
index 8bf9570e4c6624863d257ced6400cd9464c75e25..05953849bc3f380f661f78b6a1d45614264631e3 100644 (file)
--- a/src/lib/commands/ndump.c
+++ b/src/lib/commands/ndump.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2016, 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 @@
  *  ---
  *
  *  ndump.c: Dump nuke information
- * 
+ *
  *  Known contributors to this file:
  *     John Yockey, 1997
  *     Steve McClure, 1998
@@ -34,23 +33,18 @@
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "nuke.h"
-#include "nsc.h"
-#include "file.h"
 #include "commands.h"
+#include "nuke.h"
 
 int
 ndump(void)
 {
-    int i;
     struct nstr_item nstr;
     struct nukstr nuk;
     time_t now;
     int nnukes;
 
-    if (!snxtitem(&nstr, EF_NUKE, player->argp[1]))
+    if (!snxtitem(&nstr, EF_NUKE, player->argp[1], NULL))
        return RET_SYN;
     prdate();
     if (player->god)
@@ -67,17 +61,13 @@ ndump(void)
        if (nuk.nuk_own == 0)
            continue;
        nnukes++;
-       for (i = 0; i < N_MAXNUKE; i++) {
-           if (nuk.nuk_types[i] > 0) {
-               if (player->god)
-                   pr("%d ", nuk.nuk_own);
-               pr("%d ", nuk.nuk_uid);
-               prxy("%d %d", nuk.nuk_x, nuk.nuk_y, player->cnum);
-               pr(" %d", nuk.nuk_types[i]);
-               pr(" %.5s", nchr[i].n_name);
-               pr("\n");
-           }
-       }
+       if (player->god)
+           pr("%d ", nuk.nuk_own);
+       pr("%d ", nuk.nuk_uid);
+       prxy("%d %d", nuk.nuk_x, nuk.nuk_y);
+       pr(" %d", 1);
+       pr(" %.5s", nchr[(int)nuk.nuk_type].n_name);
+       pr("\n");
     }
     if (nnukes == 0) {
        if (player->argp[1])