/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2009, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* 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 "optlist.h"
#include "path.h"
-#include "commands.h"
+#include "plague.h"
static int cmd_move_map(coord curx, coord cury, char *arg);
/*
* Now parse the path and return ending sector.
*/
- dam = (istest ? 0 : 1);
+ dam = !istest && !(opt_SUPER_BARS && vtype == I_BAR);
if (dam && !chance(weight / 200.0))
dam = 0;
mcost = move_ground(§, &endsect, weight, player->argp[4],
static int
cmd_move_map(coord curx, coord cury, char *arg)
{
- player->argp[0] = "map";
- player->argp[1] = arg;
- player->argp[2] = NULL;
- player->condarg = NULL;
- return map();
+ return display_region_map(0, EF_SHIP, curx, cury, arg);
}
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);
}