Clean up superfluous includes

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

diff --git a/src/lib/commands/lboard.c b/src/lib/commands/lboard.c
index 12efbc56b3c979125ccbad79f617b74f906abc19..f250444a88a64e5fc05207636bcae51fe76a2dd0 100644 (file)
--- a/src/lib/commands/lboard.c
+++ b/src/lib/commands/lboard.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-2011, 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,26 +25,17 @@
  *  ---
  *
  *  lboard.c: Board an enemy land unit (heavily borrowing from boar.c)
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 1998
  */
 
 #include <config.h>
 
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "sect.h"
-#include "path.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
 #include "combat.h"
 #include "commands.h"
+#include "land.h"
+#include "ship.h"
 
 int
 lboa(void)
@@ -59,8 +49,8 @@ lboa(void)
     int a_spy = 0;             /* the best boarder scout */
     struct sctstr sect;
     struct lndstr land;
-    s_char *p;
-    s_char buf[1024];
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_LAND);
     /*
@@ -68,9 +58,8 @@ lboa(void)
      */
 
     /* What are we boarding? */
-
-    if (!(p = getstarg(player->argp[1], "Victim land unit #?  ", buf)) ||
-       (def->lnd_uid = atoi(p)) < 0)
+    p = getstarg(player->argp[1], "Victim land unit #?  ", buf);
+    if (!p || (def->lnd_uid = atoi(p)) < 0)
        return RET_SYN;
 
     /*
@@ -115,18 +104,14 @@ lboa(void)
     if (att_abort(A_LBOARD, off, def)) {
        pr("Land unit boarding aborted\n");
        att_empty_attack(A_LBOARD, 0, def);
-       return att_free_lists(&olist, 0);
+       return att_free_lists(&olist, NULL);
     }
 
-    /*
-     * Estimate the defense strength and give the player a chance to abort
-     */
-
-    ototal = att_estimate_defense(A_LBOARD, off, &olist, def, a_spy);
+    ototal = att_get_offense(A_LBOARD, off, &olist, def);
     if (att_abort(A_LBOARD, off, def)) {
        pr("Land unit boarding aborted\n");
        att_empty_attack(A_LBOARD, 0, def);
-       return att_free_lists(&olist, 0);
+       return att_free_lists(&olist, NULL);
     }
 
     /*