Update copyright notice

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

diff --git a/src/lib/commands/drop.c b/src/lib/commands/drop.c
index 1f1242c568d5c03fa5cb726b1aeb97780b20c3fc..6e7eb4cbbb64b3fe83dd20d51921469963a16066 100644 (file)
--- a/src/lib/commands/drop.c
+++ b/src/lib/commands/drop.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-2021, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -28,7 +28,7 @@
  *
  *  Known contributors to this file:
  *     Dave Pare, 1986
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
@@ -61,8 +61,7 @@ drop(void)
        return RET_SYN;
     ax = ap_sect.sct_x;
     ay = ap_sect.sct_y;
-    if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY)
-       || *flightpath == 0)
+    if (!getpath(flightpath, player->argp[4], ax, ay, 0, 0, MOB_FLY))
        return RET_SYN;
     tx = ax;
     ty = ay;
@@ -74,9 +73,15 @@ drop(void)
 
     if (relations_with(target.sct_own, player->cnum) == ALLIED) {
        /* own or allied sector: cargo drop */
-       if (ip->i_uid == I_CIVIL && target.sct_own != target.sct_oldown) {
-           pr("Can't drop civilians into occupied sectors.\n");
-           return RET_FAIL;
+       if (ip->i_uid == I_CIVIL) {
+           if (target.sct_own != player->cnum) {
+               pr("Your civilians refuse to board a flight abroad!\n");
+               return RET_FAIL;
+           }
+           if (target.sct_own != target.sct_oldown) {
+               pr("Can't drop civilians into occupied sectors.\n");
+               return RET_FAIL;
+           }
        }
        wantflags = P_C;
     } else {
@@ -90,8 +95,6 @@ drop(void)
     }
 
     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