commands: Rename the command functions

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

diff --git a/src/lib/commands/lten.c b/src/lib/commands/lten.c
index 3aaba7129bd1178cdc60864f9216d2df651ebb08..d0603d6e8391a1eee54c7b113a4fa193f488c50a 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2021, 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/>.
  *
  *  ---
  *
@@ -27,12 +26,13 @@
  *
  *  lten.c: Transfer commodity from a ship to a land unit the ship is
  *          carrying
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Thomas Ruschak
  *     Ken Stevens, 1995
  *     Steve McClure, 1998
+ *     Markus Armbruster, 2004-2017
  */
 
 #include <config.h>
@@ -41,13 +41,12 @@
 #include "item.h"
 #include "land.h"
 #include "plague.h"
-#include "plane.h"
 #include "ship.h"
 
 static void expose_land(struct shpstr *s1, struct lndstr *l1);
 
 int
-ltend(void)
+c_ltend(void)
 {
     struct nstr_item targets;
     struct nstr_item tenders;
@@ -64,53 +63,65 @@ ltend(void)
     int transfer;
     int total;
     char *p;
+    char prompt[512];
     char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
        return RET_SYN;
 
-    if (!snxtitem(&tenders, EF_SHIP,
-                 getstarg(player->argp[2], "Tender(s)? ", buf)))
+    if (!snxtitem(&tenders, EF_SHIP, player->argp[2], "Tender(s)? "))
        return RET_SYN;
     while (nxtitem(&tenders, &tender)) {
-       if (!player->owner)
+       if (!player->owner || !tender.shp_own) {
+           if (tenders.sel == NS_LIST)
+               pr("You don't own ship #%d!\n", tender.shp_uid);
+           continue;
+       }
+       sprintf(prompt, "Number of %s to tend from %s? ",
+               ip->i_name, prship(&tender));
+       if (!(p = getstarg(player->argp[3], prompt, buf)))
+           return RET_FAIL;
+       if (!*p)
            continue;
-       if ((p =
-            getstarg(player->argp[3], "Amount to transfer? ", buf)) == 0)
-           return RET_SYN;
        if (!check_ship_ok(&tender))
            return RET_FAIL;
-       if ((amt = atoi(p)) == 0)
-           break;
+       amt = atoi(p);
+       if (!amt) {
+           pr("Amount must be non-zero!\n");
+           return RET_SYN;
+       }
        ontender = tender.shp_item[ip->i_uid];
        if (ontender == 0 && amt > 0) {
            pr("No %s on %s\n", ip->i_name, prship(&tender));
-           return RET_FAIL;
+           continue;
        }
        vbase = &mchr[(int)tender.shp_type];
        maxtender = vbase->m_item[ip->i_uid];
        if (maxtender == 0) {
-           pr("A %s cannot hold any %s\n",
-              mchr[(int)tender.shp_type].m_name, ip->i_name);
-           return RET_FAIL;
+           pr("%s cannot hold any %s\n", prship(&tender), ip->i_name);
+           continue;
        }
        if (!snxtitem(&targets, EF_LAND,
-                     getstarg(player->argp[4], "Units to be tended? ",
-                              buf)))
-           return RET_SYN;
+                     player->argp[4], "Units to be tended? "))
+           return RET_FAIL;
        if (!check_ship_ok(&tender))
            return RET_FAIL;
        total = 0;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner)
+           if (!player->owner || !target.lnd_own) {
+               if (targets.sel == NS_LIST)
+                   pr("You don't own land unit #%d!\n", target.lnd_uid);
                continue;
-
-           if (target.lnd_ship != tender.shp_uid)
+           }
+           if (target.lnd_ship != tender.shp_uid) {
+               if (targets.sel == NS_LIST)
+                   pr("%s is not on %s!\n",
+                      prland(&target), prship(&tender));
                continue;
+           }
            ontarget = target.lnd_item[ip->i_uid];
            if (ontarget == 0 && amt < 0) {
-               pr("No %s on %s\n",
-                  ip->i_name, prland(&target));
+               pr("No %s on %s\n", ip->i_name, prland(&target));
                continue;
            }
            lbase = &lchr[(int)target.lnd_type];