Update copyright notice

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

diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index ebcf597f96ab5f4c052cf44f83a7e204a1795f64..32f590c5cd758a8ab5cfccb70865291d077488a2 100644 (file)
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2015, 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,22 +25,23 @@
  *  ---
  *
  *  reco.c: Fly a recon mission
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
 #include "commands.h"
+#include "empobj.h"
 #include "path.h"
 #include "plane.h"
-#include "ship.h"
 
 int
 reco(void)
 {
-    int mission_flags;
+    int mission_flags = player->argp[0][0] == 's' ? PM_R | PM_S : PM_R;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -49,7 +49,7 @@ reco(void)
     int cno;
     struct nstr_item ni_bomb;
     struct nstr_item ni_esc;
-    struct sctstr target;
+    union empobj_storage target;
     struct emp_qelem bomb_list;
     struct emp_qelem esc_list;
     int wantflags;
@@ -57,27 +57,23 @@ reco(void)
     char buf[1024];
 
     wantflags = 0;
-    if (!snxtitem(&ni_bomb, EF_PLANE, player->argp[1]))
+    if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
        return RET_SYN;
-    if (!snxtitem(&ni_esc, EF_PLANE,
-                 getstarg(player->argp[2], "escort(s)? ", buf)))
-       pr("No escorts...\n");
     if (!get_assembly_point(player->argp[3], &ap_sect, buf))
        return RET_SYN;
     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)
+    if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY))
        return RET_SYN;
     tx = ax;
     ty = ay;
     (void)pathtoxy(flightpath, &tx, &ty, fcost);
     pr("target is %s\n", xyas(tx, ty, player->cnum));
-    getsect(tx, ty, &target);
-    cno = -1;
-    mission_flags = 0;
-    if (pln_onewaymission(&target, &cno, &wantflags) < 0)
+
+    if (pln_where_to_land(tx, ty, &target, &wantflags) < 0)
        return RET_SYN;
+    cno = target.gen.ef_type == EF_SHIP ? target.gen.uid : -1;
+
     ap_to_target = strlen(flightpath);
     if (flightpath[ap_to_target - 1] == 'h')
        ap_to_target--;
@@ -85,41 +81,26 @@ reco(void)
     /*
      * select planes within range
      */
-    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target,
-           1, wantflags, P_M | P_O);
-    if (QEMPTY(&bomb_list)) {
-       pr("No planes could be equipped for the mission.\n");
-       return RET_FAIL;
-    }
-    wantflags |= P_F;
-    wantflags |= P_ESC;
-    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target,
-           1, wantflags, P_M | P_O);
-    if (cno >= 0 && !pln_oneway_to_carrier_ok(&bomb_list, &esc_list, cno)) {
+    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target, 1,
+           wantflags | (mission_flags & PM_S ? P_SWEEP : 0),
+           P_M | P_O);
+    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target, 1,
+           wantflags | P_ESC | P_F, P_M | P_O);
+    if (cno >= 0
+       && !pln_can_land_on_carrier(&bomb_list, &esc_list, &target.ship)) {
        pr("Not enough room on ship #%d!\n", cno);
        return RET_FAIL;
     }
     /*
      * now arm and equip the bombers, transports, whatever.
      */
-    mission_flags |= P_X;      /* stealth (shhh) */
-    mission_flags |= P_H;      /* gets turned off if not all choppers */
-    mission_flags |= P_A;
-    mission_flags = pln_arm(&bomb_list, ap_to_target, 'r',
-                           0, P_S | P_I, mission_flags);
+    pln_arm(&bomb_list, ap_to_target, 'r', NULL);
     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, 'r',
-                           0, P_F | P_ESC, mission_flags);
-    mission_flags |= PM_R;
-
-    if (*player->argp[0] == 's')
-       mission_flags |= PM_S;
-
-    ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags,
-                0, 0, 0);
+    pln_arm(&esc_list, ap_to_target, 'e', NULL);
+    ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, mission_flags);
     if (QEMPTY(&bomb_list)) {
        pr("No planes got through fighter defenses\n");
     } else {