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 c993fd636c5951d14a7fe2d2a50de3c23dbea4a9..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-2010, 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,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/>.
  *
  *  ---
  *
@@ -37,13 +36,11 @@
 
 #include "combat.h"
 #include "commands.h"
-#include "land.h"
-#include "mission.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 */
@@ -75,10 +72,8 @@ atta(void)
     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 */
 
@@ -95,7 +90,7 @@ atta(void)
        newy = def->y + diroff[n + 1][1];
        getsect(newx, newy, &sect);     /* incase cross world boundary */
        if (!player->owner
-           && getrel(getnatp(sect.sct_own), player->cnum) != ALLIED)
+           && relations_with(sect.sct_own, player->cnum) != ALLIED)
            continue;
        att_combat_init(&off[++last], EF_SECTOR);
        off[last].x = sect.sct_x;