/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, 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
*
* ---
*
- * 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.
*
* ---
*
* deliver.c: Deliver commodities to neighboring sector
- *
+ *
* Known contributors to this file:
- *
+ *
*/
-#include "misc.h"
-#include "plague.h"
-#include "sect.h"
+#include <config.h>
+
#include "item.h"
#include "path.h"
-#include "file.h"
-#include "xy.h"
+#include "plague.h"
#include "update.h"
-#include "subs.h"
-#include "common.h"
#define DELIVER_BONUS 4.0
static int
deliver(struct sctstr *from, struct ichrstr *ip, int dir,
- int thresh, int amt_src, int plague, i_packing packing)
+ int thresh, int amt_src, int plague, enum i_packing packing)
{
struct sctstr *to;
i_type vtype; /* item vartype */
int amt_moved;
int amt_dst;
int mobility;
- float mcost;
+ double mcost;
struct dchrstr *dp;
int n;
return 0;
}
dp = &dchr[from->sct_type];
- vtype = ip->i_vtype;
+ vtype = ip->i_uid;
mobility = from->sct_mobil / 2;
- if (vtype == I_CIVIL && from->sct_own != from->sct_oldown) {
- wu(0, from->sct_own,
- "The conquered populace in %s refuses to relocate!\n",
- ownxy(from));
- return 0;
+ if (vtype == I_CIVIL) {
+ if (from->sct_own != from->sct_oldown) {
+ wu(0, from->sct_own,
+ "The conquered populace in %s refuses to relocate!\n",
+ ownxy(from));
+ return 0;
+ }
+ if (to->sct_own != to->sct_oldown) {
+ wu(0, from->sct_own,
+ "Citizens in %s refuse to relocate!\n", ownxy(from));
+ return 0;
+ }
}
/*
* disallow delivery into prohibited sectors.
* calculate unit movement cost; decrease amount if
* there isn't enough mobility.
*/
- mcost = sector_mcost(to, MOB_ROAD) * ip->i_lbs / ip->i_pkg[packing];
+ mcost = sector_mcost(to, MOB_MOVE) * ip->i_lbs / ip->i_pkg[packing];
mcost /= DELIVER_BONUS;
if (mobility < mcost * amt_moved) {
int thresh;
int dir;
int plague;
- i_packing packing;
+ enum i_packing packing;
int n;
if (sp->sct_mobil <= 0)