Update copyright notice

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

diff --git a/src/lib/commands/orde.c b/src/lib/commands/orde.c
index f087ea6af35b3b46f4c30850a6e39f27e09653c4..716460485d408294610ce382425779b29a27be39 100644 (file)
--- a/src/lib/commands/orde.c
+++ b/src/lib/commands/orde.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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -34,20 +34,11 @@
 
 #include <config.h>
 
-#include <string.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
-#include "nsc.h"
-#include "nat.h"
-#include "path.h"
-#include "file.h"
-#include "item.h"
 #include "commands.h"
+#include "item.h"
 #include "optlist.h"
+#include "path.h"
+#include "ship.h"
 
 /*
  *  Command syntax:
@@ -330,8 +321,7 @@ eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
     *len = i;
     *nupdates = 1;
 
-    mobcost = sp->shp_effic * 0.01 * sp->shp_speed;
-    mobcost = 480.0 / (mobcost + techfact(sp->shp_tech, mobcost));
+    mobcost = shp_mobcost(sp);
     mobil = sp->shp_mobil;
     while (i) {
        if (mobil > 0) {
@@ -452,14 +442,14 @@ sorde(void)
 
        if (ship.shp_autonav & AN_AUTONAV) {
            /* Destination 1 */
-           prxy(" %3d,%-3d", ship.shp_destx[1],
-                ship.shp_desty[1], player->cnum);
+           prxy(" %3d,%-3d",
+                ship.shp_destx[1], ship.shp_desty[1], player->cnum);
 
            /* Destination 2 */
            if ((ship.shp_destx[1] != ship.shp_destx[0])
                || (ship.shp_desty[1] != ship.shp_desty[0])) {
-               prxy(" %3d,%-3d", ship.shp_destx[0],
-                    ship.shp_desty[0], player->cnum);
+               prxy(" %3d,%-3d",
+                    ship.shp_destx[0], ship.shp_desty[0], player->cnum);
            } else
                pr("        ");