Update copyright notice

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

diff --git a/src/lib/commands/boar.c b/src/lib/commands/boar.c
index 10cd856819df4e4fbe1ff86893a7670234f9ccdb..5d2d78be1328130390ac1b1be1a26440966a0d7b 100644 (file)
--- a/src/lib/commands/boar.c
+++ b/src/lib/commands/boar.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2005, 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
@@ -19,9 +19,9 @@
  *
  *  ---
  *
- *  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.
  *
  *  ---
  *
@@ -31,20 +31,15 @@
  *     Ken Stevens, 1995
  */
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
+#include <config.h>
+
+#include "combat.h"
+#include "commands.h"
 #include "land.h"
-#include "nsc.h"
 #include "mission.h"
-#include "ship.h"
-#include "combat.h"
+#include "path.h"
 #include "retreat.h"
-#include "commands.h"
+#include "ship.h"
 
 int
 boar(void)
@@ -61,8 +56,8 @@ boar(void)
     struct lndstr land;
     struct nstr_item ni;
     int foundland;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_SHIP);
     /*
@@ -107,7 +102,8 @@ boar(void)
                foundland = 1;
            }
            if (!foundland) {
-               pr("You don't have any mobility (sector or land units) in %s!\n", xyas(off->x, off->y, player->cnum));
+               pr("You don't have any mobility (sector or land units) in %s!\n",
+                  xyas(off->x, off->y, player->cnum));
                return RET_SYN;
            }
        }
@@ -144,11 +140,7 @@ boar(void)
        return att_free_lists(&olist, 0);
     }
 
-    /*
-     * Estimate the defense strength and give the player a chance to abort
-     */
-
-    ototal = att_estimate_defense(A_BOARD, off, &olist, def, a_spy);
+    ototal = att_get_offense(A_BOARD, off, &olist, def);
     if (att_abort(A_BOARD, off, def)) {
        pr("Board aborted\n");
        att_empty_attack(A_BOARD, 0, def);