/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, 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.
*
* ---
*
* Ken Stevens, 1995
*/
-#include "misc.h"
+#include <config.h>
-#include <ctype.h>
-#include "ship.h"
-#include "sect.h"
-#include "xy.h"
#include "nsc.h"
-#include "nat.h"
#include "path.h"
-#include "file.h"
-#include "item.h"
-#include "optlist.h"
-#include "player.h"
#include "update.h"
-#include "subs.h"
-#include "common.h"
-#include <stdlib.h>
+#include "empobj.h"
+#include "unit.h"
static void swap(struct shpstr *);
sp->shp_autonav &= ~AN_SCUTTLE;
if (!(sectp = getsectp(sp->shp_x, sp->shp_y))) {
- wu(0, 0, "bad sector (%d,%d) ship %d\n", sp->shp_x, sp->shp_y,
- sp->shp_uid);
+ wu(0, 0, "bad sector (%d,%d) ship %d\n",
+ sp->shp_x, sp->shp_y, sp->shp_uid);
return;
}
if (sectp->sct_type != SCT_HARBR || sectp->sct_effic < 2) {
didsomething[i] = 1;
continue;
}
- if (sectp->sct_type != SCT_HARBR &&
- (!opt_BIG_CITY || sectp->sct_type != SCT_CAPIT)) {
+ if (!sect_has_dock(sectp)) {
/* we can only load in harbors */
didsomething[i] = 1;
continue;
return 1;
}
+static int
+nav_load_ship_at_sea(struct shpstr *sp)
+{
+ int i;
+ int n_items;
+ int max_amt, item_amt;
+ struct mchrstr *mcp;
+ struct sctstr *sectp;
+ struct check_list_st {
+ long cap;
+ i_type item;
+ } check_list[] = {{M_FOOD, I_FOOD}, {M_OIL, I_OIL}};
+
+ n_items = sizeof(check_list) / sizeof(check_list[0]);
+
+ mcp = &mchr[(int)sp->shp_type];
+ sectp = getsectp(sp->shp_x, sp->shp_y);
+ for (i = 0; i < n_items; i++) {
+ if (mcp->m_flags & check_list[i].cap) {
+ item_amt = sp->shp_item[check_list[i].item];
+ max_amt = mcp->m_item[check_list[i].item];
+ if (item_amt < max_amt && sectp->sct_type == SCT_WATER)
+ return 1;
+ }
+ }
+ return 0;
+}
+
/* new autonav code.
*
* 1. Try and move to the next sector/harbor given by the player.
int stopping;
int quit;
int didsomething = 0;
- int max_amt, food_amt;
char buf[1024];
struct emp_qelem ship_list;
struct emp_qelem *qp, *newqp;
- struct mlist *mlp;
+ struct ulist *mlp;
int dummyint;
double dummydouble;
int dir;
natid cnum;
- struct mchrstr *mcp, *vship;
/* just return if no autonaving to do for this ship */
if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
return RET_OK;
cnum = sp->shp_own;
- vship = mcp = &mchr[(int)sp->shp_type];
/* Make a list of one ships so we can use the navi.c code */
emp_initque(&ship_list);
- mlp = (struct mlist *)malloc(sizeof(struct mlist));
- mlp->mcp = mchr + sp->shp_type;
- mlp->ship = *sp;
- mlp->mobil = (double)sp->shp_mobil;
+ mlp = malloc(sizeof(struct ulist));
+ mlp->chrp = (struct empobj_chr *)(mchr + sp->shp_type);
+ mlp->unit.ship = *sp;
+ mlp->mobil = sp->shp_mobil;
emp_insque(&mlp->queue, &ship_list);
quit = 1; /* setup loop, we want to check it 1 time. */
sectp = getsectp(sp->shp_x, sp->shp_y);
if (opt_FUEL &&
sectp->sct_own != 0 &&
- sp->shp_fuel <= 0 && mlp->mcp->m_fuelu != 0)
+ sp->shp_fuel <= 0 &&
+ ((struct mchrstr *)mlp->chrp)->m_fuelu != 0)
auto_fuel_ship(sp);
- mlp->ship.shp_fuel = sp->shp_fuel;
+ mlp->unit.ship.shp_fuel = sp->shp_fuel;
cp = BestShipPath(buf, sp->shp_x, sp->shp_y,
sp->shp_destx[0], sp->shp_desty[0],
sp->shp_own);
- if (cp == 0 || (*cp == '\0') || (*cp == '?')) {
+ if (cp == 0) {
wu(0, cnum,
"%s bad path, ship put on standby\n", prship(sp));
sp->shp_autonav |= AN_STANDBY;
/* We need to free the ship list */
qp = ship_list.q_forw;
- while (qp != &(ship_list)) {
+ while (qp != &ship_list) {
newqp = qp->q_forw;
emp_remque(qp);
free(qp);
stopping = 0;
while (*cp && !stopping && sp->shp_own && mlp->mobil > 0.0) {
- dir = chkdir(*cp++, DIR_STOP, DIR_LAST);
-
+ dir = diridx(*cp++);
stopping |= shp_nav_one_sector(&ship_list, dir,
sp->shp_own, 0);
}
-/* sp->shp_mobil = (int) mobil;
- */
/* Ship not sunk */
if (sp->shp_own)
nav_check_atdest(sp);
if (didsomething)
quit = 1;
}
- /* special case for fishing boats */
- if ((mchr[(int)sp->shp_type].m_flags & M_FOOD) == 1) {
- food_amt = sp->shp_item[I_FOOD];
- max_amt = vship->m_item[I_FOOD];
- sectp = getsectp(sp->shp_x, sp->shp_y);
-
- if (food_amt < max_amt && (sectp->sct_own == 0))
- quit = 0;
- }
+ /* special case for fishing boats and oil derricks */
+ if (nav_load_ship_at_sea(sp))
+ quit = 0;
/* reset flag and check if we can move. */
} while (quit); /* end loop */
/* We need to free the ship list (just in case) */
qp = ship_list.q_forw;
- while (qp != &(ship_list)) {
+ while (qp != &ship_list) {
newqp = qp->q_forw;
emp_remque(qp);
free(qp);
projects / empserver / blobdiff