/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2006, 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 <config.h>
+
#include "misc.h"
#include <ctype.h>
-#include "var.h"
#include "ship.h"
#include "sect.h"
-#include "news.h"
#include "xy.h"
#include "nsc.h"
#include "nat.h"
#include "path.h"
-#include "deity.h"
#include "file.h"
#include "item.h"
#include "optlist.h"
#include "common.h"
#include <stdlib.h>
-extern int check_nav(struct sctstr *sect);
-static void swap(register struct shpstr *);
+static void swap(struct shpstr *);
static void
-scuttle_it(register struct shpstr *sp)
+scuttle_it(struct shpstr *sp)
{
struct sctstr *sectp;
}
static void
-nav_check_atdest(register struct shpstr *sp, struct mchrstr *mcp)
+nav_check_atdest(struct shpstr *sp)
{
if ((sp->shp_x == sp->shp_destx[0]) && (sp->shp_y == sp->shp_desty[0])) {
if ((sp->shp_destx[0] == sp->shp_destx[1]) &&
/* CZ 6/1/94 */
static void
-swap(register struct shpstr *sp)
+swap(struct shpstr *sp)
{
coord tcord;
- s_char tcomm[TMAX];
+ i_type tcomm[TMAX];
short lev[TMAX];
int i;
*/
static int
-nav_loadship(register struct shpstr *sp, natid cnum)
+nav_loadship(struct shpstr *sp, natid cnum)
{
struct sctstr *sectp;
- s_char item;
- int i, landown, shipown, level, didsomething[TMAX], rel;
+ int i, landown, shipown, didsomething[TMAX], rel;
for (i = 0; i < TMAX; i++)
didsomething[i] = 0;
/* loop through each field for that ship */
for (i = 0; i < TMAX; ++i) {
- item = sp->shp_tend[i]; /* commodity */
- level = sp->shp_lend[i]; /* amount */
-
/* check and see if the data fields have been set. */
- if (item == ' ' || level == 0) {
+ if (sp->shp_tend[i] == I_NONE || sp->shp_lend[i] == 0) {
/* nothing to do move on. */
didsomething[i] = 1;
continue;
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;
* Modified to use shp_nav by Ken Stevens 1995
*/
int
-nav_ship(register struct shpstr *sp)
+nav_ship(struct shpstr *sp)
{
- extern double techfact(int, double);
struct sctstr *sectp;
- s_char *cp, item;
+ char *cp;
int stopping;
int quit;
int didsomething = 0;
- int max_amt, food_amt, comm;
- s_char buf[1024];
+ int max_amt, food_amt;
+ char buf[1024];
struct emp_qelem ship_list;
struct emp_qelem *qp, *newqp;
struct mlist *mlp;
/* 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 = malloc(sizeof(struct mlist));
mlp->mcp = mchr + sp->shp_type;
mlp->ship = *sp;
mlp->mobil = (double)sp->shp_mobil;
wu(0, cnum,
"%s bad path, ship put on standby\n", prship(sp));
sp->shp_autonav |= AN_STANDBY;
- putship(sp->shp_uid, (s_char *)sp);
+ putship(sp->shp_uid, sp);
/* 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((s_char *)qp);
+ free(qp);
qp = newqp;
}
return RET_SYN;
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, mcp);
+ nav_check_atdest(sp);
}
quit = 0; /* stop loop */
}
/* special case for fishing boats */
if ((mchr[(int)sp->shp_type].m_flags & M_FOOD) == 1) {
- item = (s_char)'f';
- comm = com_num(&item);
- food_amt = getvar(comm, (s_char *)sp, EF_SHIP);
- max_amt = (vl_find(comm, vship->m_vtype,
- vship->m_vamt, (int)vship->m_nv));
+ 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))
/* 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((s_char *)qp);
+ free(qp);
qp = newqp;
}
return RET_OK;
projects / empserver / blobdiff