/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
- * Ken Stevens, Steve McClure
+ * Copyright (C) 1986-2012, 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/>.
*
* ---
*
* David Sharnoff, 1987
* Ken Stevens, 1995 (rewritten)
* Steve McClure, 1998-2000
- * Markus Armbruster, 2004-2008
+ * Markus Armbruster, 2004-2011
*/
#include <config.h>
#include <ctype.h>
#include "commands.h"
-#include "empobj.h"
#include "item.h"
#include "land.h"
#include "optlist.h"
/*
* The values 1 and -1 are important below, don't change them.
*/
-#define LOAD 1
-#define UNLOAD -1
+#define LOAD 1
+#define UNLOAD -1
static int load_plane_ship(struct sctstr *sectp, struct shpstr *sp,
int noisy, int load_unload, int *nshipsp);
char *p;
char buf[1024];
- if (!(p = getstarg(player->argp[1],
- "What commodity (or 'plane' or 'land')? ", buf))
- || !*p)
+ p = getstarg(player->argp[1],
+ "What commodity (or 'plane' or 'land')? ", buf);
+ if (!p || !*p)
return RET_SYN;
if (!strncmp(p, "plane", 5))
return RET_SYN;
}
- if (!(p = getstarg(player->argp[2], "Ship(s): ", buf)) || !*p)
+ p = getstarg(player->argp[2], "Ship(s): ", buf);
+ if (!p || !*p)
return RET_SYN;
noisy = isdigit(*p);
if (!player->owner) {
if (load_unload == UNLOAD || !noisy)
continue;
- if (getrel(getnatp(ship.shp_own), player->cnum) < FRIENDLY)
+ if (relations_with(ship.shp_own, player->cnum) < FRIENDLY)
continue;
}
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
- if (!player->owner && load_unload == UNLOAD
- && getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY) {
+ if (load_unload == UNLOAD
+ && !player->owner
+ && relations_with(sect.sct_own, player->cnum) < FRIENDLY) {
if (noisy)
pr("You can't unload into an unfriendly %s\n",
dchr[sect.sct_type].d_name);
switch (type) {
case EF_PLANE:
- if (0 !=
- (retval =
- load_plane_ship(§, &ship, noisy, load_unload,
- &nships)))
+ retval = load_plane_ship(§, &ship, noisy, load_unload,
+ &nships);
+ if (retval != 0)
return retval;
break;
case EF_LAND:
- if (0 !=
- (retval =
- load_land_ship(§, &ship, noisy, load_unload,
- &nships)))
+ retval = load_land_ship(§, &ship, noisy, load_unload,
+ &nships);
+ if (retval != 0)
return retval;
break;
case EF_SECTOR:
- if (0 !=
- (retval =
- load_comm_ship(§, &ship, ich, load_unload, &nships)))
+ retval = load_comm_ship(§, &ship, ich, load_unload,
+ &nships);
+ if (retval != 0)
return retval;
}
/* load/unload plague */
char *p;
char buf[1024];
- if (!(p = getstarg(player->argp[1],
- "What commodity (or 'plane' or 'land')? ", buf))
- || !*p)
+ p = getstarg(player->argp[1],
+ "What commodity (or 'plane' or 'land')? ", buf);
+ if (!p || !*p)
return RET_SYN;
if (!strncmp(p, "plane", 5))
type = EF_PLANE;
return RET_SYN;
}
- if (!(p = getstarg(player->argp[2], "Unit(s): ", buf)) || !*p)
+ p = getstarg(player->argp[2], "Unit(s): ", buf);
+ if (!p || !*p)
return RET_SYN;
noisy = isdigit(*p);
if (!player->owner) {
if (load_unload == UNLOAD || !noisy)
continue;
- if (getrel(getnatp(land.lnd_own), player->cnum) != ALLIED)
+ if (relations_with(land.lnd_own, player->cnum) != ALLIED)
continue;
}
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
}
- if (getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
+ if (relations_with(sect.sct_own, player->cnum) != ALLIED) {
pr("Sector %s is not yours.\n",
xyas(sect.sct_x, sect.sct_y, player->cnum));
continue;
switch (type) {
case EF_LAND:
- if (0 !=
- (retval =
- load_land_land(§, &land, noisy, load_unload,
- &nunits)))
+ retval = load_land_land(§, &land, noisy, load_unload,
+ &nunits);
+ if (retval != 0)
return retval;
break;
case EF_PLANE:
- if (0 !=
- (retval =
- load_plane_land(§, &land, noisy, load_unload,
- &nunits)))
+ retval = load_plane_land(§, &land, noisy, load_unload,
+ &nunits);
+ if (retval != 0)
return retval;
break;
case EF_SECTOR:
- if (0 !=
- (retval =
- load_comm_land(§, &land, ich, load_unload, &nunits)))
+ retval = load_comm_land(§, &land, ich, load_unload,
+ &nunits);
+ if (retval != 0)
return retval;
}
/* load/unload plague */
static int
move_amount(int sect_amt, int unit_amt, int unit_max,
- int load_unload, int amount)
+ int load_unload, int amount)
{
int move_amt;
gift(natid givee, natid giver, void *ptr, char *mesg)
{
if (giver != givee)
- wu(0, givee, "%s %s %s\n", cname(giver), obj_nameof(ptr), mesg);
+ wu(0, givee, "%s %s %s\n", cname(giver), unit_nameof(ptr), mesg);
unit_give_away(ptr, givee, 0);
}
continue;
}
- /* Plane sanity done */
- /* Find the right ship */
if (load_unload == UNLOAD) {
if (pln.pln_ship != sp->shp_uid)
continue;
} else if (sp->shp_x != pln.pln_x || sp->shp_y != pln.pln_y)
continue;
- /* ship to (plane or missle) sanity */
if (!could_be_on_ship(&pln, sp, 0, 0, 0, 0)) {
- if (plchr[(int)pln.pln_type].pl_flags & P_L) {
- strcpy(buf, "planes");
- } else if (plchr[(int)pln.pln_type].pl_flags & P_K) {
- strcpy(buf, "choppers");
- } else if (plchr[(int)pln.pln_type].pl_flags & P_M) {
- strcpy(buf, "missiles");
- } else if (plchr[(int)pln.pln_type].pl_flags & P_E) {
- strcpy(buf, "extra light planes");
- } /* else impossible */
- if (noisy)
- pr("%s cannot carry %s.\n", prship(sp), buf);
+ if (noisy) {
+ if (plchr[(int)pln.pln_type].pl_flags & P_K)
+ p = "choppers";
+ else if (plchr[(int)pln.pln_type].pl_flags & P_E)
+ p = "extra light planes";
+ else if (plchr[(int)pln.pln_type].pl_flags & P_M)
+ p = "missiles";
+ else
+ p = "planes";
+ pr("%s cannot carry %s.\n", prship(sp), p);
+ }
continue;
}
/* Fit plane on ship */
int load_spy = 0;
if (load_unload == LOAD) {
- if (opt_LANDSPIES) {
- if ((mchr[(int)sp->shp_type].m_flags & M_SUB) &&
- (mchr[(int)sp->shp_type].m_nland == 0)) {
- if (shp_nland(sp) >= 2) {
- pr("Non-land unit carrying subs can only carry up to two spy units.\n");
- return 0;
- }
- /* Eh, let 'em load a spy only */
- load_spy = 1;
+ if ((mchr[(int)sp->shp_type].m_flags & M_SUB) &&
+ (mchr[(int)sp->shp_type].m_nland == 0)) {
+ if (shp_nland(sp) >= 2) {
+ pr("Non-land unit carrying subs can only carry up to two spy units.\n");
+ return 0;
}
+ /* Eh, let 'em load a spy only */
+ load_spy = 1;
}
if (!load_spy && shp_nland(sp) >= mchr[sp->shp_type].m_nland) {
if (noisy) {
/* Fit unit on ship */
if (load_unload == LOAD) {
/* We have to check again, since it may have changed */
- if (opt_LANDSPIES) {
- if ((mchr[(int)sp->shp_type].m_flags & M_SUB) &&
- (mchr[(int)sp->shp_type].m_nland == 0)) {
- if (shp_nland(sp) >= 2) {
- pr("Non-land unit carrying subs can only carry up to two spy units.\n");
- return 0;
- }
- /* Eh, let 'em load a spy only */
- load_spy = 1;
+ if ((mchr[(int)sp->shp_type].m_flags & M_SUB) &&
+ (mchr[(int)sp->shp_type].m_nland == 0)) {
+ if (shp_nland(sp) >= 2) {
+ pr("Non-land unit carrying subs can only carry up to two spy units.\n");
+ return 0;
}
+ /* Eh, let 'em load a spy only */
+ load_spy = 1;
}
if (!load_spy && shp_nland(sp) >= mchr[sp->shp_type].m_nland) {
if (noisy) {
land.lnd_harden = 0;
putland(land.lnd_uid, &land);
#if 0
- /*
- * FIXME if this supplies from the sector, the putsect in
- * load() / lload() duplicates those supplies, causing a
- * seqno mismatch
- */
+ /*
+ * FIXME if this supplies from the sector, the putsect in
+ * load() / lload() duplicates those supplies, causing a
+ * seqno mismatch
+ */
if (!lnd_supply_all(&land))
pr("WARNING: %s is out of supply!\n", prland(&land));
#else
(load_unload == UNLOAD) ?
"unload from" : "load onto",
prship(sp), xyas(sp->shp_x, sp->shp_y, player->cnum));
- if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
+ p = getstarg(player->argp[3], prompt, buf);
+ if (!p || !*p)
return RET_SYN;
if (!still_ok_ship(sectp, sp))
load_unload, atoi(p));
if (!load_comm_ok(sectp, sp->shp_own, item, move_amt))
return RET_OK;
- if (!want_to_abandon(sectp, item, move_amt, 0))
+ if (!want_to_abandon(sectp, item, move_amt, NULL))
return RET_FAIL;
if (!still_ok_ship(sectp, sp))
return RET_SYN;
(load_unload == UNLOAD) ?
"unload from" : "load onto",
prland(lp), xyas(lp->lnd_x, lp->lnd_y, player->cnum));
- if (!(p = getstarg(player->argp[3], prompt, buf)) || !*p)
+ p = getstarg(player->argp[3], prompt, buf);
+ if (!p || !*p)
return RET_SYN;
if (!still_ok_land(sectp, lp))
land.lnd_harden = 0;
putland(land.lnd_uid, &land);
#if 0
- /* FIXME same issue as in load_land_ship() */
+ /* FIXME same issue as in load_land_ship() */
if (!lnd_supply_all(&land))
pr("WARNING: %s is out of supply!\n", prland(&land));
#else
projects / empserver / blobdiff