License upgrade to GPL version 3 or later

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

diff --git a/src/lib/commands/tend.c b/src/lib/commands/tend.c
index de0c2652dc543c3918041bc6f4b58726dd8d2ab2..a1e65ea6597f9441cb47a559cdc12fe90581d551 100644 (file)
--- a/src/lib/commands/tend.c
+++ b/src/lib/commands/tend.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-2011, 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/>.
  *
  *  ---
  *
@@ -26,11 +25,12 @@
  *  ---
  *
  *  tend.c: Transfer goodies from one ship to another.
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1986
  *     Thomas Ruschak, 1992
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2009
  */
 
 #include <config.h>
@@ -67,8 +67,9 @@ tend(void)
     char prompt[512];
     char buf[1024];
 
-    if (!(p = getstarg(player->argp[1],
-                      "Tend what commodity (or 'land')? ", buf)) || !*p)
+    p = getstarg(player->argp[1], "Tend what commodity (or 'land')? ",
+                buf);
+    if (!p || !*p)
        return RET_SYN;
 
     if (!strncmp(p, "land", 4))
@@ -80,8 +81,7 @@ tend(void)
        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)) {
@@ -92,7 +92,7 @@ tend(void)
                    prship(&tender));
            p = getstarg(player->argp[3], prompt, buf);
            if (!p)
-               return RET_SYN;
+               return RET_FAIL;
            if (!*p)
                continue;
            if (!check_ship_ok(&tender))
@@ -105,7 +105,7 @@ tend(void)
                ip->i_name, prship(&tender));
        p = getstarg(player->argp[3], prompt, buf);
        if (!p)
-           return RET_SYN;
+           return RET_FAIL;
        if (!*p)
            continue;
        if (!check_ship_ok(&tender))
@@ -127,15 +127,14 @@ tend(void)
            break;
        }
        if (!snxtitem(&targets, EF_SHIP,
-                     getstarg(player->argp[4], "Ships to be tended? ",
-                              buf)))
-           break;
+                     player->argp[4], "Ships to be tended? "))
+           return RET_FAIL;
        if (!check_ship_ok(&tender))
            return RET_SYN;
        total = 0;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tender.shp_uid)
                continue;
@@ -209,11 +208,9 @@ tend_land(struct shpstr *tenderp, char *units)
     struct nstr_item targets;
     struct shpstr target;
     struct lndstr land;
-    struct plnstr plane;
-    struct nstr_item pni;
     char buf[1024];
 
-    if (!snxtitem(&lni, EF_LAND, units))
+    if (!snxtitem(&lni, EF_LAND, units, NULL))
        return RET_SYN;
 
     while (nxtitem(&lni, &land)) {
@@ -229,14 +226,13 @@ tend_land(struct shpstr *tenderp, char *units)
            continue;
        }
        if (!snxtitem(&targets, EF_SHIP,
-                     getstarg(player->argp[4], "Ship to be tended? ",
-                              buf)))
-           break;
-       if (!check_land_ok(&land))
+                     player->argp[4], "Ship to be tended? "))
+           return RET_FAIL;
+       if (!check_ship_ok(tenderp) || !check_land_ok(&land))
            return RET_SYN;
        while (nxtitem(&targets, &target)) {
-           if (!player->owner &&
-               (getrel(getnatp(target.shp_own), player->cnum) < FRIENDLY))
+           if (!player->owner
+               && relations_with(target.shp_own, player->cnum) < FRIENDLY)
                continue;
            if (target.shp_uid == tenderp->shp_uid)
                continue;
@@ -245,7 +241,6 @@ tend_land(struct shpstr *tenderp, char *units)
                continue;
 
            /* Fit unit on ship */
-           count_units(&target);
            getship(target.shp_uid, &target);
 
            if ((!(lchr[(int)land.lnd_type].l_flags & L_LIGHT)) &&
@@ -260,12 +255,12 @@ tend_land(struct shpstr *tenderp, char *units)
            if ((mchr[(int)target.shp_type].m_flags & M_SUB) &&
                (lchr[(int)land.lnd_type].l_flags & L_SPY) &&
                !mchr[(int)target.shp_type].m_nland) {
-               if (target.shp_nland > 1) {
+               if (shp_nland(&target) > 1) {
                    pr("%s doesn't have room for more than two spy units!\n",
                       prship(&target));
                    continue;
                }
-           } else if (target.shp_nland >= mchr[(int)target.shp_type].m_nland) {
+           } else if (shp_nland(&target) >= mchr[target.shp_type].m_nland) {
                if (mchr[(int)target.shp_type].m_nland)
                    pr("%s doesn't have room for any more land units!\n",
                       prship(&target));
@@ -281,24 +276,10 @@ tend_land(struct shpstr *tenderp, char *units)
            gift(target.shp_own, player->cnum, &land, buf);
            land.lnd_ship = target.shp_uid;
            land.lnd_harden = 0;
-           land.lnd_mission = 0;
-           target.shp_nland++;
            putland(land.lnd_uid, &land);
            expose_ship(tenderp, &target);
            putship(target.shp_uid, &target);
-           count_units(tenderp);
            putship(tenderp->shp_uid, tenderp);
-           snxtitem_xy(&pni, EF_PLANE, land.lnd_x, land.lnd_y);
-           while (nxtitem(&pni, &plane)) {
-               if (plane.pln_flags & PLN_LAUNCHED)
-                   continue;
-               if (plane.pln_land != land.lnd_uid)
-                   continue;
-               sprintf(buf, "loaded on %s", prship(&target));
-               gift(target.shp_own, player->cnum, &plane, buf);
-               plane.pln_mission = 0;
-               putplane(plane.pln_uid, &plane);
-           }
        }
     }
     return 0;