Update copyright notice.

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

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 706a31bd04a9d997efdd2070fc9d322211ccc2cd..c82dd2867c5584c93aa0a57ff901b3dfb6c4b694 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-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                           Ken Stevens, Steve McClure
  *
  *  This program is free software; you can redistribute it and/or modify
@@ -53,7 +53,6 @@ fly(void)
 {
     s_char *p;
     int mission_flags;
-    int tech;
     coord tx, ty;
     coord ax, ay;
     int ap_to_target;
@@ -113,14 +112,9 @@ fly(void)
        dst_type = EF_SHIP;
     }
 
-    if (ip && ip->i_vtype == V_CIVIL) {
-       if (target.sct_own != player->cnum) {
-           pr("Your civilians refuse to emigrate!\n");
-           return RET_FAIL;
-       } else if (target.sct_own != target.sct_oldown) {
-           pr("Can't drop civilians into occupied sectors.\n");
-           return RET_FAIL;
-       }
+    if (ip && ip->i_vtype == 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);
@@ -147,20 +141,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);
+                           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);
+                           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)) {