Update copyright notice

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

diff --git a/src/lib/commands/sinf.c b/src/lib/commands/sinf.c
index fdc6873046b55439c6b76d0ac6204144edf51176..d3cd0deef0c7634aefc9536baca17cdeb338e3aa 100644 (file)
--- a/src/lib/commands/sinf.c
+++ b/src/lib/commands/sinf.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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,34 +14,30 @@
  *  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/>.
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
  *  sinf.c: Do an infrastructure report
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1996
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "sect.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "commands.h"
+#include <config.h>
+
 #include "combat.h"
+#include "commands.h"
+#include "optlist.h"
+#include "path.h"
+
+static void prmobcost(struct sctstr *, int);
 
 int
 sinfra(void)
@@ -67,7 +63,7 @@ sinfra(void)
        }
        if (player->god)
            pr("%3d ", sect.sct_own);
-       prxy("%4d,%-4d", nstr.x, nstr.y, player->cnum);
+       prxy("%4d,%-4d", nstr.x, nstr.y);
        pr(" %c", dchr[sect.sct_type].d_mnem);
        if (sect.sct_newtype != sect.sct_type)
            pr("%c", dchr[sect.sct_newtype].d_mnem);
@@ -75,10 +71,13 @@ sinfra(void)
            pr(" ");
        pr("%4d%% ", sect.sct_effic);
        pr("%4d%% ", sect.sct_road);
-       pr("%4.3f ", sector_mcost(&sect, MOB_ROAD));
-       pr("%4d%% ", sect.sct_rail);
-       pr("%4.3f ", sector_mcost(&sect, MOB_RAIL));
-       pr("%4d%% ", sect.sct_defense);
+       prmobcost(&sect, MOB_MOVE);
+       if (opt_RAILWAYS)
+           pr(sct_rail_track(&sect) ? "  yes " : "   no ");
+       else
+           pr("%4d%% ", sect.sct_rail);
+       prmobcost(&sect, MOB_RAIL);
+       pr("%4d%% ", SCT_DEFENSE(&sect));
        pr("%5.2f\n", sector_strength(&sect));
     }
     if (nsect == 0) {
@@ -91,3 +90,14 @@ sinfra(void)
        pr("%d sector%s\n", nsect, splur(nsect));
     return 0;
 }
+
+static void
+prmobcost(struct sctstr *sp, int mobtype)
+{
+    double cost = sector_mcost(sp, mobtype);
+
+    if (cost < 0)
+       pr(" N/A  ");
+    else
+       pr("%5.3f ", cost);
+}