Update copyright notice

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

diff --git a/src/lib/commands/sdump.c b/src/lib/commands/sdump.c
index d73017f382fc9eeb2535257c06e36fb3acf7371f..ceafe379bb71c03bbc6b91f80d613f47c282436d 100644 (file)
--- a/src/lib/commands/sdump.c
+++ b/src/lib/commands/sdump.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2006, 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
@@ -26,7 +26,7 @@
  *  ---
  *
  *  sdump.c: Dump ship information
- * 
+ *
  *  Known contributors to this file:
  *     John Yockey, 1997
  *     Steve McClure, 1998
@@ -47,10 +47,10 @@ sdump(void)
     struct shpstr ship;
     int field[128];
     struct natstr *np;
-    int n, i;
+    int n, i, npln, nch, nxl;
     time_t now;
 
-    if (!snxtitem(&ni, EF_SHIP, player->argp[1]))
+    if (!snxtitem(&ni, EF_SHIP, player->argp[1], NULL))
        return RET_SYN;
     prdate();
 
@@ -263,9 +263,8 @@ sdump(void)
     while (nxtitem(&ni, &ship)) {
        if (!player->owner || ship.shp_own == 0)
            continue;
-       count_planes(&ship);
-       count_units(&ship);
        nships++;
+       npln = shp_nplane(&ship, &nch, &nxl, NULL);
        if (player->god)
            pr("%d ", ship.shp_own);
        pr("%d", ni.cur);
@@ -300,25 +299,22 @@ sdump(void)
                pr(" %d", ship.shp_item[I_FOOD]);
                break;
            case 10:
-               pr(" %d", ship.shp_nplane);
+               pr(" %d", npln - nch - nxl);
                break;
            case 11:
-               pr(" %d", ship.shp_nchoppers);
+               pr(" %d", nch);
                break;
            case 12:
-               pr(" %d", ship.shp_nxlight);
+               pr(" %d", nxl);
                break;
            case 13:
-               pr(" %d", ship.shp_nland);
+               pr(" %d", shp_nland(&ship));
                break;
            case 14:
                pr(" %d", ship.shp_mobil);
                break;
            case 15:
-               if (opt_FUEL)
-                   pr(" %d", ship.shp_fuel);
-               else
-                   pr(" 0");
+               pr(" 0");
                break;
            case 16:
                pr(" %d", ship.shp_tech);
@@ -354,19 +350,19 @@ sdump(void)
                pr(" %d", ship.shp_item[I_RAD]);
                break;
            case 27:
-               pr(" %d", ship.shp_armor);
+               pr(" %d", shp_armor(&ship));
                break;
            case 28:
-               pr(" %d", ship.shp_speed);
+               pr(" %d", shp_speed(&ship));
                break;
            case 29:
-               pr(" %d", ship.shp_visib);
+               pr(" %d", shp_visib(&ship));
                break;
            case 30:
-               pr(" %d", ship.shp_frnge);
+               pr(" %d", shp_frnge(&ship));
                break;
            case 31:
-               pr(" %d", ship.shp_glim);
+               pr(" %d", shp_glim(&ship));
                break;
            case 32:
                /*