/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, 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,
* 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/>.
*
* ---
*
* ---
*
* move.c: Move commodities around
- *
+ *
* Known contributors to this file:
- *
+ *
*/
#include <config.h>
-#include "misc.h"
-#include "player.h"
-#include "plague.h"
-#include "sect.h"
+#include "commands.h"
#include "item.h"
-#include "file.h"
-#include "xy.h"
-#include "nat.h"
-#include "nsc.h"
-#include "land.h"
-#include "path.h"
+#include "map.h"
#include "optlist.h"
-#include "commands.h"
+#include "path.h"
+#include "plague.h"
-static int cmd_move_map(coord curx, coord cury, char *arg);
+static int cmd_move_map(coord, coord, char *, char *);
int
move(void)
istest = *player->argp[0] == 't';
- if ((ip = whatitem(player->argp[1], "move what? ")) == 0)
+ if (!(ip = whatitem(player->argp[1], "move what? ")))
return RET_SYN;
vtype = ip->i_uid;
if (!(p = getstarg(player->argp[2], "from sector : ", buf)))
}
}
- if (!istest && !want_to_abandon(§, vtype, amount, 0)) {
+ if (!istest && !want_to_abandon(§, vtype, amount, NULL)) {
pr("Move cancelled.\n");
return RET_FAIL;
}
*/
/*ARGSUSED*/
static int
-cmd_move_map(coord curx, coord cury, char *arg)
+cmd_move_map(coord curx, coord cury, char *arg1, char *arg2)
{
- return display_region_map("map", curx, cury, arg);
+ return display_region_map(0, EF_SHIP, curx, cury, arg1, arg2);
}
int
int
would_abandon(struct sctstr *sp, i_type vtype, int amnt, struct lndstr *lp)
{
- int mil, civs, loyalcivs;
+ int mil, civs;
- if ((vtype != I_CIVIL) && (vtype != I_MILIT))
+ if (vtype != I_CIVIL && vtype != I_MILIT)
return 0;
mil = sp->sct_item[I_MILIT];
if (vtype == I_MILIT)
mil -= amnt;
-
if (vtype == I_CIVIL)
civs -= amnt;
- if (sp->sct_own == sp->sct_oldown)
- loyalcivs = civs;
- else
- loyalcivs = 0;
-
- /* If they have a military unit there, they still own it */
- if (sp->sct_own != 0
- && ((loyalcivs == 0) && (mil == 0)
- && (has_units(sp->sct_x, sp->sct_y, sp->sct_own, lp) == 0)))
- return 1;
-
- return 0;
+ return sp->sct_own != 0 && civs <= 0 && mil <= 0
+ && !has_units(sp->sct_x, sp->sct_y, sp->sct_own, lp);
}