Update copyright notice

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

diff --git a/src/lib/commands/reco.c b/src/lib/commands/reco.c
index ed4ad6bf0c18fc1749f21fdf639415219a0be319..ac9632fdf6f4c5e3b8664757878ef9d0835c295f 100644 (file)
--- a/src/lib/commands/reco.c
+++ b/src/lib/commands/reco.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2016, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,15 +28,15 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1986
- *     Markus Armbruster, 2004-2009
+ *     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)
@@ -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;
@@ -63,20 +63,18 @@ reco(void)
        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)
-       || *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;
-    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--;
     pr("range to target is %d\n", ap_to_target);
     /*
      * select planes within range
@@ -86,7 +84,8 @@ reco(void)
            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_oneway_to_carrier_ok(&bomb_list, &esc_list, cno)) {
+    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;
     }