Update copyright notice

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

diff --git a/src/lib/commands/para.c b/src/lib/commands/para.c
index ef41218ee9092cc20257318330c8cbed8a03f8c4..da5ac9acdc29698605d46b28f7b05969486093a7 100644 (file)
--- a/src/lib/commands/para.c
+++ b/src/lib/commands/para.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, 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/>.
  *
  *  ---
  *
@@ -30,6 +29,7 @@
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Ken Stevens, 1995
+ *     Markus Armbruster, 2004-2011
  */
 
 #include <config.h>
@@ -37,8 +37,6 @@
 #include "combat.h"
 #include "commands.h"
 #include "item.h"
-#include "land.h"
-#include "mission.h"
 #include "path.h"
 #include "plane.h"
 #include "ship.h"
@@ -57,18 +55,16 @@ para(void)
     struct sctstr target;
     struct emp_qelem bomb_list;
     struct emp_qelem esc_list;
-    int wantflags;
     struct sctstr ap_sect;
     char buf[1024];
 
-    wantflags = P_P;
     if (get_planes(&ni_bomb, &ni_esc, player->argp[1], player->argp[2]) < 0)
        return RET_SYN;
     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
+    if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
        || *flightpath == 0)
        return RET_SYN;
     tx = ax;
@@ -80,22 +76,26 @@ para(void)
     if (flightpath[ap_to_target - 1] == 'h')
        ap_to_target--;
     pr("range to target is %d\n", ap_to_target);
+    if (target.sct_own == player->cnum) {
+       pr("You can't air-assault your own sector!\n");
+       return RET_FAIL;
+    }
     /*
      * select planes within range
      */
-    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target,
-           2, P_C | wantflags, P_M | P_O);
-    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target,
-           2, P_ESC | P_F, P_M | P_O);
+    pln_sel(&ni_bomb, &bomb_list, &ap_sect, ap_to_target, 2,
+           P_P | P_C, P_M | P_O);
+    pln_sel(&ni_esc, &esc_list, &ap_sect, ap_to_target, 2,
+           P_ESC | P_F, P_M | P_O);
     /*
      * now arm and equip the bombers, transports, whatever.
      */
-    pln_arm(&bomb_list, 2 * ap_to_target, 'a', &ichr[I_MILIT], 0);
+    pln_arm(&bomb_list, 2 * ap_to_target, 'a', NULL);
     if (QEMPTY(&bomb_list)) {
        pr("No planes could be equipped for the mission.\n");
        return RET_FAIL;
     }
-    pln_arm(&esc_list, 2 * ap_to_target, 'a', &ichr[I_MILIT], P_ESC | P_F);
+    pln_arm(&esc_list, 2 * ap_to_target, 'e', NULL);
     ac_encounter(&bomb_list, &esc_list, ax, ay, flightpath, 0);
     if (QEMPTY(&bomb_list)) {
        pr("No planes got through fighter defenses\n");
@@ -128,7 +128,7 @@ paradrop(struct emp_qelem *list, coord x, coord y)
     att_combat_init(def, EF_SECTOR);
     def->x = x;
     def->y = y;
-    if (att_abort(A_PARA, 0, def))
+    if (att_abort(A_PARA, NULL, def))
        return RET_FAIL;
 
     /* Show what we're air-assaulting, and check treaties */
@@ -142,8 +142,7 @@ paradrop(struct emp_qelem *list, coord x, coord y)
     att_combat_init(off, EF_PLANE);
     for (qp = list->q_forw; qp != list; qp = qp->q_forw) {
        plp = (struct plist *)qp;
-       if (plp->pcp->pl_flags & (P_V | P_C))
-           off->troops += plp->misc;
+       off->troops += plp->load;
     }
     off->mil = off->troops;
     if (att_abort(A_PARA, off, def)) {