/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2016, 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,
* 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/>.
*
* ---
*
- * See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- * related information and legal notices. It is expected that any future
- * projects/authors will amend these files as needed.
+ * See files README, COPYING and CREDITS in the root of the source
+ * tree for related information and legal notices. It is expected
+ * that future projects/authors will amend these files as needed.
*
* ---
*
* 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
* Steve McClure, 1998
*/
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "file.h"
-#include "ship.h"
+#include <config.h>
+
+#include "commands.h"
#include "item.h"
-#include "nsc.h"
-#include "plane.h"
#include "land.h"
-#include "commands.h"
+#include "plague.h"
+#include "ship.h"
static void expose_land(struct shpstr *s1, struct lndstr *l1);
int maxtarget;
int transfer;
int total;
- s_char *p;
- s_char buf[1024];
+ char *p;
+ 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)
continue;
- if ((p =
- getstarg(player->argp[3], "Amount to transfer? ", buf)) == 0)
- break;
+ if (!(p = getstarg(player->argp[3], "Amount to transfer? ", buf)))
+ return RET_FAIL;
if (!check_ship_ok(&tender))
return RET_FAIL;
if ((amt = atoi(p)) == 0)
break;
- ontender = tender.shp_item[ip->i_vtype];
+ 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;
}
vbase = &mchr[(int)tender.shp_type];
- maxtender = vbase->m_item[ip->i_vtype];
+ 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);
- break;
+ return RET_FAIL;
}
if (!snxtitem(&targets, EF_LAND,
- getstarg(player->argp[4], "Units to be tended? ",
- buf)))
- break;
+ player->argp[4], "Units to be tended? "))
+ return RET_FAIL;
if (!check_ship_ok(&tender))
return RET_FAIL;
total = 0;
if (target.lnd_ship != tender.shp_uid)
continue;
- ontarget = target.lnd_item[ip->i_vtype];
+ ontarget = target.lnd_item[ip->i_uid];
if (ontarget == 0 && amt < 0) {
- pr("No %s on %s\n",
- ip->i_name, prship((struct shpstr *)&target));
+ pr("No %s on %s\n", ip->i_name, prland(&target));
continue;
}
lbase = &lchr[(int)target.lnd_type];
- maxtarget = lbase->l_item[ip->i_vtype];
+ maxtarget = lbase->l_item[ip->i_uid];
if (amt < 0) {
if (!player->owner)
amt = 0;
/* take from target and give to tender */
- transfer = min(ontarget, -amt);
- transfer = min(maxtender - ontender, transfer);
+ transfer = MIN(ontarget, -amt);
+ transfer = MIN(maxtender - ontender, transfer);
if (transfer == 0)
continue;
- target.lnd_item[ip->i_vtype] = ontarget - transfer;
+ target.lnd_item[ip->i_uid] = ontarget - transfer;
ontender += transfer;
total += transfer;
} else {
/* give to target from tender */
- transfer = min(ontender, amt);
- transfer = min(transfer, maxtarget - ontarget);
+ transfer = MIN(ontender, amt);
+ transfer = MIN(transfer, maxtarget - ontarget);
if (transfer == 0)
continue;
- target.lnd_item[ip->i_vtype] = ontarget + transfer;
+ target.lnd_item[ip->i_uid] = ontarget + transfer;
ontender -= transfer;
total += transfer;
}
pr("%d total %s transferred %s %s\n",
total, ip->i_name, (amt > 0) ? "off of" : "to",
prship(&tender));
- tender.shp_item[ip->i_vtype] = ontender;
+ tender.shp_item[ip->i_uid] = ontender;
tender.shp_mission = 0;
putship(tender.shp_uid, &tender);
}
projects / empserver / blobdiff