commands: Rename the command functions

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

diff --git a/src/lib/commands/sate.c b/src/lib/commands/sate.c
index a289607381dfc9f949749b28fcce47d39d92d674..f4bd9dfc64d0a663a341e6e0dddfe62d6fb6942a 100644 (file)
--- a/src/lib/commands/sate.c
+++ b/src/lib/commands/sate.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,96 +14,78 @@
  *  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.
  *
  *  ---
  *
  *  sate.c: Do satellite maps/reports.
- * 
+ *
  *  Known contributors to this file:
  *     Edward M. Rynes Esq, 1988
  *     Ken Stevens, 1995
  *     Steve McClure, 1998-2000
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "xy.h"
-#include "plane.h"
-#include "sect.h"
-#include "nsc.h"
-#include "file.h"
-#include "nat.h"
+#include <config.h>
+
+#include <ctype.h>
 #include "commands.h"
+#include "optlist.h"
+#include "plane.h"
 
 int
-sate(void)
+c_satellite(void)
 {
-       extern  int plane_mob_max;
-       double  tech;
-       int     pln_uid;
-       struct  plnstr plane;
-       int     type = EF_BAD;
+    static int sct_shp_or_lnd[] = { EF_SECTOR, EF_SHIP, EF_LAND, EF_BAD };
+    double tech;
+    int pln_uid;
+    struct plnstr plane;
+    int type = EF_BAD;
 
-       if (!player->argp[1] ||
-           !*player->argp[1] ||
-           !isdigit(*player->argp[1]) ||
-           (pln_uid = atoi(player->argp[1])) < 0)
-               return RET_SYN;
+    if (!player->argp[1] ||
+       !*player->argp[1] ||
+       !isdigit(*player->argp[1]) ||
+       (pln_uid = atoi(player->argp[1])) < 0)
+       return RET_SYN;
 
-       if (!getplane(pln_uid, &plane)) {
-               pr("No such plane\n");
-               return RET_FAIL;
-       }
+    if (!getplane(pln_uid, &plane)) {
+       pr("No such plane\n");
+       return RET_FAIL;
+    }
 
-       if (plane.pln_own != player->cnum && !player->god) {
-               pr("You don't own plane #%d\n", pln_uid);
-               return RET_FAIL;
-       }
-               
-       if (!(plane.pln_flags & PLN_LAUNCHED)) {
-               pr("%s isn't in orbit\n",
-                  prplane(&plane));
-               return RET_FAIL;
-       }
-       if (plane.pln_mobil < plane_mob_max) {
-               pr("%s doesn't have enough mobility (needs %d)\n",
-                  prplane(&plane),
-                  plane_mob_max);
-               return RET_FAIL;
-       }
-       if (player->argp[2]) {
-               switch (*player->argp[2]) {
-               case 'l':
-                       type = EF_LAND;
-                       break;
-               case 's':
-                       if (*(player->argp[2] + 1) == 'e')
-                           type = EF_SECTOR;
-                       else
-                           type = EF_SHIP;
-                       break;
-               default:
-                       return RET_SYN;
-               }
+    if (plane.pln_own != player->cnum && !player->god) {
+       pr("You don't own plane #%d\n", pln_uid);
+       return RET_FAIL;
+    }
+
+    if (!pln_is_in_orbit(&plane)) {
+       pr("%s isn't in orbit\n", prplane(&plane));
+       return RET_FAIL;
+    }
+    if (plane.pln_mobil < plane_mob_max) {
+       pr("%s doesn't have enough mobility (needs %d)\n",
+          prplane(&plane), plane_mob_max);
+       return RET_FAIL;
+    }
+    if (player->argp[2]) {
+       type = ef_byname_from(player->argp[2], sct_shp_or_lnd);
+       if (type < 0) {
+           return RET_SYN;
        }
-               
-       if (plchr[(int)plane.pln_type].pl_flags & P_S)
-               pr("Satellite Spy Report:\n");
-       else
-               pr("Satellite Map Report:\n");
-       pr("%s at ", prplane(&plane));
-       tech = techfact(plane.pln_tech, 20.0);
-       satmap(plane.pln_x, plane.pln_y, plane.pln_effic,
-              (int)tech, plchr[(int)plane.pln_type].pl_flags, type);
+    }
 
-       return RET_OK;
+    if (plchr[(int)plane.pln_type].pl_flags & P_S)
+       pr("Satellite Spy Report:\n");
+    else
+       pr("Satellite Map Report:\n");
+    pr("%s at ", prplane(&plane));
+    tech = techfact(plane.pln_tech, 20.0);
+    return satmap(plane.pln_x, plane.pln_y, plane.pln_effic,
+                 (int)tech, plchr[(int)plane.pln_type].pl_flags, type);
 }