commands: Rename the command functions

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

diff --git a/src/lib/commands/fly.c b/src/lib/commands/fly.c
index 57d298a6d56bb06f376573db275a301d5892a03d..4df04bb2fc3640c5c7a368acdf362aa138a841c7 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-2012, 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
@@ -41,7 +41,7 @@
 #include "plane.h"
 
 int
-fly(void)
+c_fly(void)
 {
     coord tx, ty;
     coord ax, ay;
@@ -65,8 +65,7 @@ fly(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;
@@ -80,16 +79,19 @@ fly(void)
        return RET_SYN;
     cno = target.gen.ef_type == EF_SHIP ? target.gen.uid : -1;
 
-    if (ip && ip->i_uid == I_CIVIL
-       && target.gen.ef_type == EF_SECTOR
-       && target.sect.sct_own != target.sect.sct_oldown) {
-       pr("Can't fly civilians into occupied sectors.\n");
-       return RET_FAIL;
+    if (ip && ip->i_uid == I_CIVIL) {
+       if (target.gen.own != player->cnum) {
+           pr("Your civilians refuse to board a flight abroad!\n");
+           return RET_FAIL;
+       }
+       if (target.gen.ef_type == EF_SECTOR
+           && target.sect.sct_own != target.sect.sct_oldown) {
+           pr("Can't fly civilians into occupied sectors.\n");
+           return RET_FAIL;
+       }
     }
 
     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
@@ -98,7 +100,8 @@ fly(void)
            wantflags, 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;
     }