Update copyright notice

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

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 18a273d56b81f57292ec878afb39e6675925d47f..598fef08304270774d3c3bdedf718455db063f1a 100644 (file)
--- a/src/lib/commands/fly.c
+++ b/src/lib/commands/fly.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2000, 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.
  *
  *  ---
  *
@@ -32,46 +32,35 @@
  *     Steve McClure, 2000
  */
 
-#include "misc.h"
-#include "player.h"
-#include "var.h"
-#include "sect.h"
-#include "ship.h"
+#include <config.h>
+
+#include "commands.h"
 #include "item.h"
-#include "plane.h"
-#include "nuke.h"
-#include "xy.h"
-#include "nsc.h"
-#include "news.h"
-#include "file.h"
-#include "nat.h"
 #include "path.h"
-#include "commands.h"
+#include "plane.h"
+#include "ship.h"
 
 int
 fly(void)
 {
-    s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
     struct ichrstr *ip;
-    s_char flightpath[MAX_PATH_LEN];
+    char flightpath[MAX_PATH_LEN];
     struct shpstr ship;
     int cno;
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
-    coord x, y;
     struct sctstr target;
     struct emp_qelem bomb_list;
     struct emp_qelem esc_list;
     int wantflags;
     struct sctstr ap_sect;
     int dst_type;
-    s_char *dst_ptr;
-    s_char buf[1024];
+    void *dst_ptr;
+    char buf[1024];
 
     wantflags = 0;
     if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
@@ -79,46 +68,47 @@ fly(void)
     if (!snxtitem(&ni_esc, EF_PLANE,
                  getstarg(player->argp[2], "escort(s)? ", buf)))
        pr("No escorts...\n");
-    if ((p = getstarg(player->argp[3], "assembly point? ", buf)) == 0
-       || *p == 0)
-       return RET_SYN;
-    if (!sarg_xy(p, &x, &y) || !getsect(x, y, &ap_sect))
+    if (!get_assembly_point(player->argp[3], &ap_sect, buf))
        return RET_SYN;
-    if (ap_sect.sct_own && ap_sect.sct_own != player->cnum &&
-       getrel(getnatp(ap_sect.sct_own), player->cnum) != ALLIED) {
-       pr("Assembly point not owned by you or an ally!\n");
-       return RET_SYN;
-    }
-    ax = x;
-    ay = y;
-    if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, 0, P_FLYING) == 0
+    ax = ap_sect.sct_x;
+    ay = ap_sect.sct_y;
+    if (getpath(flightpath, player->argp[4], ax, ay, 0, 0, P_FLYING) == 0
        || *flightpath == 0)
        return RET_SYN;
     tx = ax;
     ty = ay;
     (void)pathtoxy(flightpath, &tx, &ty, fcost);
     pr("Ending sector is %s\n", xyas(tx, ty, player->cnum));
+    ip = whatitem(player->argp[5], "transport what? ");
+    if (player->aborted)
+       return RET_SYN;
     getsect(tx, ty, &target);
+
     cno = -1;
-    ip = whatitem(player->argp[5], "transport what? ");
-    mission_flags = 0;
     if (pln_onewaymission(&target, &cno, &wantflags) < 0)
        return RET_SYN;
     if (cno < 0) {
-       dst_ptr = (s_char *)&target;
+       dst_ptr = &target;
        dst_type = EF_SECTOR;
     } else {
        getship(cno, &ship);
-       dst_ptr = (s_char *)&ship;
+       dst_ptr = &ship;
        dst_type = EF_SHIP;
     }
+
+    if (ip && ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) {
+       pr("Can't fly civilians into occupied sectors.\n");
+       return RET_FAIL;
+    }
+
     ap_to_target = strlen(flightpath);
-    if (*(flightpath + strlen(flightpath) - 1) == 'h')
+    if (flightpath[ap_to_target - 1] == 'h')
        ap_to_target--;
     pr("range to target is %d\n", ap_to_target);
     /*
      * select planes within range
      */
+    mission_flags = 0;
     pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target,
            1, wantflags, P_M | P_O);
     if (QEMPTY(&bomb_list)) {
@@ -135,22 +125,17 @@ fly(void)
     }
     /*
      * now arm and equip the bombers, transports, whatever.
-     * tech is stored in high 16 bits of mission_flags.
-     * yuck.
      */
-    tech = 0;
     mission_flags |= P_X;      /* stealth (shhh) */
     mission_flags |= P_H;      /* gets turned off if not all choppers */
-    mission_flags =
-       pln_arm(&bomb_list, ap_to_target, 't', ip, 0, mission_flags,
-               &tech);
+    mission_flags = pln_arm(&bomb_list, ap_to_target, 't',
+                           ip, 0, mission_flags);
     if (QEMPTY(&bomb_list)) {
        pr("No planes could be equipped for the mission.\n");
        return RET_FAIL;
     }
-    mission_flags =
-       pln_arm(&esc_list, ap_to_target, 't', ip, P_ESC | P_F,
-               mission_flags, &tech);
+    mission_flags = pln_arm(&esc_list, ap_to_target, 't',
+                           ip, P_ESC | P_F, mission_flags);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
                 0, 0, 0);
     if (QEMPTY(&bomb_list)) {