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 1dbe216cbdbc23a690559c61049fb1da47b89729..d0603d6e8391a1eee54c7b113a4fa193f488c50a 100644 (file)
--- a/src/lib/commands/lten.c
+++ b/src/lib/commands/lten.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2018, 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
@@ -46,7 +46,7 @@
 static void expose_land(struct shpstr *s1, struct lndstr *l1);
 
 int
-ltend(void)
+c_ltend(void)
 {
     struct nstr_item targets;
     struct nstr_item tenders;
@@ -63,6 +63,7 @@ ltend(void)
     int transfer;
     int total;
     char *p;
+    char prompt[512];
     char buf[1024];
 
     if (!(ip = whatitem(player->argp[1], "Transfer what commodity? ")))
@@ -71,17 +72,24 @@ ltend(void)
     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;
        }
-       if (!(p = getstarg(player->argp[3], "Amount to transfer? ", buf)))
+       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 (!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));
@@ -90,8 +98,7 @@ ltend(void)
        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);
+           pr("%s cannot hold any %s\n", prship(&tender), ip->i_name);
            continue;
        }
        if (!snxtitem(&targets, EF_LAND,
@@ -101,7 +108,7 @@ ltend(void)
            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;