commands: Rename the command functions

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

diff --git a/src/lib/commands/atta.c b/src/lib/commands/atta.c
index 8b51f0773e9503a1f8fd492d60eec5d3c027671a..cd2c84a2a33fdd1139a1cd0d5ae7d1f0bc293856 100644 (file)
--- a/src/lib/commands/atta.c
+++ b/src/lib/commands/atta.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-2021, 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,45 +14,33 @@
  *  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.
  *
  *  ---
  *
  *  atta.c: Attack another sector
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare
  *     Ken Stevens, 1995
  *     Steve McClure, 1996
  */
 
-#include <math.h>
-#include "misc.h"
-#include "player.h"
-#include "file.h"
-#include "var.h"
-#include "sect.h"
-#include "path.h"
-#include "news.h"
-#include "treaty.h"
-#include "nat.h"
-#include "xy.h"
-#include "land.h"
-#include "nsc.h"
-#include "mission.h"
-#include "ship.h"
+#include <config.h>
+
 #include "combat.h"
 #include "commands.h"
+#include "path.h"
+#include "ship.h"
 
 int
-atta(void)
+c_attack(void)
 {
     struct combat off[6];      /* attacking sectors */
     struct combat def[1];      /* defending sector */
@@ -67,9 +55,8 @@ atta(void)
     double osupport = 1.0;     /* attack support */
     double dsupport = 1.0;     /* defense support */
     int last, n;
-    s_char *p;
-    s_char buf[1024];
-    int rel;
+    char *p;
+    char buf[1024];
 
     att_combat_init(def, EF_SECTOR);
     /*
@@ -82,18 +69,16 @@ atta(void)
        return RET_SYN;
     if (!sarg_xy(p, &def->x, &def->y))
        return RET_SYN;
-    if (att_abort(A_ATTACK, 0, def))
+    if (att_abort(A_ATTACK, NULL, def))
        return RET_FAIL;
 
-    /* Show what we're attacking, and check treaties */
-
-    if (att_show(def))
-       return RET_FAIL;
+    /* Show what we're attacking */
+    att_show(def);
 
     /* Ask about offensive support */
 
     att_ask_support(2, &fort_sup, &ship_sup, &land_sup, &plane_sup);
-    if (att_abort(A_ATTACK, 0, def)) {
+    if (att_abort(A_ATTACK, NULL, def)) {
        att_empty_attack(A_ATTACK, 0, def);
        return RET_OK;
     }
@@ -104,8 +89,8 @@ atta(void)
        newx = def->x + diroff[n + 1][0];
        newy = def->y + diroff[n + 1][1];
        getsect(newx, newy, &sect);     /* incase cross world boundary */
-       rel = getrel(getnatp(sect.sct_own), player->cnum);
-       if (!player->owner && rel != ALLIED)
+       if (!player->owner
+           && relations_with(sect.sct_own, player->cnum) != ALLIED)
            continue;
        att_combat_init(&off[++last], EF_SECTOR);
        off[last].x = sect.sct_x;
@@ -119,18 +104,14 @@ atta(void)
     if (att_abort(A_ATTACK, off, def)) {
        pr("Attack aborted\n");
        att_empty_attack(A_ATTACK, 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_ATTACK, off, &olist, def, a_spy);
+    ototal = att_get_offense(A_ATTACK, off, &olist, def);
     if (att_abort(A_ATTACK, off, def)) {
        pr("Attack aborted\n");
        att_empty_attack(A_ATTACK, 0, def);
-       return att_free_lists(&olist, 0);
+       return att_free_lists(&olist, NULL);
     }
 
     /*