Indented with src/scripts/indent-emp.
This commit is contained in:
parent
5f263a7753
commit
9b7adfbecc
437 changed files with 52211 additions and 51052 deletions
|
|
@ -61,7 +61,7 @@ scuttle_it(register struct shpstr *sp)
|
|||
struct sctstr *sectp;
|
||||
|
||||
sp->shp_autonav &= ~AN_SCUTTLE;
|
||||
if (!(sectp = getsectp(sp->shp_x,sp->shp_y))) {
|
||||
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);
|
||||
return;
|
||||
|
|
@ -74,14 +74,12 @@ scuttle_it(register struct shpstr *sp)
|
|||
}
|
||||
if (opt_TRADESHIPS) {
|
||||
if (!(mchr[(int)sp->shp_type].m_flags & M_TRADE)) {
|
||||
wu(0, sp->shp_own,
|
||||
"You can only autoscuttle trade ships!\n");
|
||||
wu(0, sp->shp_own, "You can only autoscuttle trade ships!\n");
|
||||
return;
|
||||
}
|
||||
}
|
||||
wu(0, sp->shp_own, "Scuttling %s in sector %s\n",
|
||||
prship(sp),
|
||||
xyas(sp->shp_x, sp->shp_y, sp->shp_own));
|
||||
prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
|
||||
if (opt_TRADESHIPS) {
|
||||
scuttle_tradeship(sp, 0);
|
||||
}
|
||||
|
|
@ -91,17 +89,15 @@ scuttle_it(register struct shpstr *sp)
|
|||
static void
|
||||
nav_check_atdest(register struct shpstr *sp, struct mchrstr *mcp)
|
||||
{
|
||||
if ((sp->shp_x == sp->shp_destx[0]) &&
|
||||
(sp->shp_y == sp->shp_desty[0])) {
|
||||
if ((sp->shp_x == sp->shp_destx[0]) && (sp->shp_y == sp->shp_desty[0])) {
|
||||
if ((sp->shp_destx[0] == sp->shp_destx[1]) &&
|
||||
(sp->shp_desty[0] == sp->shp_desty[1])) {
|
||||
|
||||
|
||||
/* End of road */
|
||||
|
||||
|
||||
sp->shp_autonav &= ~AN_AUTONAV;
|
||||
wu(0, sp->shp_own, "%s arrived at %s, finished\n",
|
||||
prship(sp),
|
||||
xyas(sp->shp_x,sp->shp_y,sp->shp_own));
|
||||
prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
|
||||
if (sp->shp_autonav & AN_SCUTTLE) {
|
||||
scuttle_it(sp);
|
||||
}
|
||||
|
|
@ -109,10 +105,9 @@ nav_check_atdest(register struct shpstr *sp, struct mchrstr *mcp)
|
|||
/* unload all cargo */
|
||||
unload_it(sp);
|
||||
wu(0, sp->shp_own, "%s arrived at %s\n",
|
||||
prship(sp),
|
||||
xyas(sp->shp_x,sp->shp_y,sp->shp_own));
|
||||
prship(sp), xyas(sp->shp_x, sp->shp_y, sp->shp_own));
|
||||
/* Swap */
|
||||
swap(sp);
|
||||
swap(sp);
|
||||
}
|
||||
} else
|
||||
sp->shp_autonav &= ~AN_LOADING;
|
||||
|
|
@ -124,32 +119,35 @@ nav_check_atdest(register struct shpstr *sp, struct mchrstr *mcp)
|
|||
void
|
||||
swap(register struct shpstr *sp)
|
||||
{
|
||||
coord tcord;
|
||||
s_char tcomm[TMAX];
|
||||
short lev[TMAX];
|
||||
int i;
|
||||
coord tcord;
|
||||
s_char tcomm[TMAX];
|
||||
short lev[TMAX];
|
||||
int i;
|
||||
|
||||
tcord = sp->shp_destx[0];
|
||||
sp->shp_destx[0] = sp->shp_destx[1];
|
||||
sp->shp_destx[1] = tcord;
|
||||
tcord = sp->shp_desty[0];
|
||||
sp->shp_desty[0] = sp->shp_desty[1];
|
||||
sp->shp_desty[1] = tcord;
|
||||
tcord = sp->shp_destx[0];
|
||||
sp->shp_destx[0] = sp->shp_destx[1];
|
||||
sp->shp_destx[1] = tcord;
|
||||
tcord = sp->shp_desty[0];
|
||||
sp->shp_desty[0] = sp->shp_desty[1];
|
||||
sp->shp_desty[1] = tcord;
|
||||
|
||||
for (i=0;i<TMAX;++i){
|
||||
lev[i] = sp->shp_lstart[i];
|
||||
tcomm[i] = sp->shp_tstart[i]; }
|
||||
for (i = 0; i < TMAX; ++i) {
|
||||
lev[i] = sp->shp_lstart[i];
|
||||
tcomm[i] = sp->shp_tstart[i];
|
||||
}
|
||||
|
||||
for (i=0;i<TMAX;++i) {
|
||||
for (i = 0; i < TMAX; ++i) {
|
||||
sp->shp_lstart[i] = sp->shp_lend[i];
|
||||
sp->shp_tstart[i] = sp->shp_tend[i]; }
|
||||
sp->shp_tstart[i] = sp->shp_tend[i];
|
||||
}
|
||||
|
||||
for (i=0;i<TMAX;++i) {
|
||||
sp->shp_lend[i] = lev[i];
|
||||
sp->shp_tend[i] = tcomm[i]; }
|
||||
for (i = 0; i < TMAX; ++i) {
|
||||
sp->shp_lend[i] = lev[i];
|
||||
sp->shp_tend[i] = tcomm[i];
|
||||
}
|
||||
|
||||
/* set load bit */
|
||||
sp->shp_autonav |= AN_LOADING;
|
||||
/* set load bit */
|
||||
sp->shp_autonav |= AN_LOADING;
|
||||
}
|
||||
|
||||
/* New Autonav code.
|
||||
|
|
@ -157,75 +155,70 @@ swap(register struct shpstr *sp)
|
|||
* 6-1-94
|
||||
*/
|
||||
|
||||
static int
|
||||
static int
|
||||
nav_loadship(register struct shpstr *sp, natid cnum)
|
||||
{
|
||||
struct sctstr *sectp;
|
||||
s_char item;
|
||||
int i,
|
||||
landown,
|
||||
shipown,
|
||||
level,
|
||||
didsomething[TMAX],
|
||||
rel;
|
||||
struct sctstr *sectp;
|
||||
s_char item;
|
||||
int i, landown, shipown, level, didsomething[TMAX], rel;
|
||||
|
||||
for (i=0;i<TMAX;i++)
|
||||
didsomething[i]=0;
|
||||
for (i = 0; i < TMAX; i++)
|
||||
didsomething[i] = 0;
|
||||
|
||||
/* Turn off the loading flag.
|
||||
* if any of the loads fail on the ship
|
||||
* it will be turned back on.
|
||||
*/
|
||||
/* Turn off the loading flag.
|
||||
* if any of the loads fail on the ship
|
||||
* it will be turned back on.
|
||||
*/
|
||||
|
||||
sp->shp_autonav &= ~AN_LOADING;
|
||||
sp->shp_autonav &= ~AN_LOADING;
|
||||
|
||||
if (!(sectp = getsectp(sp->shp_x,sp->shp_y)))
|
||||
return RET_SYS; /* safety */
|
||||
/* I suspect RET_SYS isn't really what you want here --dfp */
|
||||
if (!(sectp = getsectp(sp->shp_x, sp->shp_y)))
|
||||
return RET_SYS; /* safety */
|
||||
/* I suspect RET_SYS isn't really what you want here --dfp */
|
||||
|
||||
|
||||
landown = sectp->sct_own;
|
||||
shipown = sp->shp_own;
|
||||
rel = getrel(getnatp(sectp->sct_own),cnum);
|
||||
landown = sectp->sct_own;
|
||||
shipown = sp->shp_own;
|
||||
rel = getrel(getnatp(sectp->sct_own), cnum);
|
||||
|
||||
/* 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 */
|
||||
/* 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. */
|
||||
/* check and see if the data fields have been set. */
|
||||
|
||||
if (item == ' ' || level == 0) {
|
||||
/* nothing to do move on. */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (landown == 0) {
|
||||
/* either sea or deity harbor */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (sectp->sct_type != SCT_HARBR &&
|
||||
(!opt_BIG_CITY || sectp->sct_type != SCT_CAPIT)) {
|
||||
/* we can only load in harbors */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (landown == shipown || rel >= FRIENDLY)
|
||||
didsomething[i] = load_it(sp,sectp,i);
|
||||
if (item == ' ' || level == 0) {
|
||||
/* nothing to do move on. */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (landown == 0) {
|
||||
/* either sea or deity harbor */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (sectp->sct_type != SCT_HARBR &&
|
||||
(!opt_BIG_CITY || sectp->sct_type != SCT_CAPIT)) {
|
||||
/* we can only load in harbors */
|
||||
didsomething[i] = 1;
|
||||
continue;
|
||||
}
|
||||
if (landown == shipown || rel >= FRIENDLY)
|
||||
didsomething[i] = load_it(sp, sectp, i);
|
||||
}
|
||||
|
||||
/* check for any unsucessful loads */
|
||||
/* if we have any return 0 to stop */
|
||||
/* the nav_ship loop. */
|
||||
/* check for any unsucessful loads */
|
||||
/* if we have any return 0 to stop */
|
||||
/* the nav_ship loop. */
|
||||
|
||||
for (i=0;i<TMAX;i++) {
|
||||
if(didsomething[i] == 0)
|
||||
return 0;
|
||||
}
|
||||
/* All loads were succesful */
|
||||
return 1;
|
||||
}
|
||||
for (i = 0; i < TMAX; i++) {
|
||||
if (didsomething[i] == 0)
|
||||
return 0;
|
||||
}
|
||||
/* All loads were succesful */
|
||||
return 1;
|
||||
}
|
||||
|
||||
/* new autonav code.
|
||||
*
|
||||
|
|
@ -243,131 +236,127 @@ nav_loadship(register struct shpstr *sp, natid cnum)
|
|||
* Chad Zabel.
|
||||
* 6-1-94
|
||||
* Modified to use shp_nav by Ken Stevens 1995
|
||||
*/
|
||||
*/
|
||||
int
|
||||
nav_ship(register struct shpstr *sp)
|
||||
{
|
||||
extern double techfact(int, double);
|
||||
struct sctstr *sectp;
|
||||
s_char *cp,item;
|
||||
int stopping;
|
||||
int quit;
|
||||
int didsomething = 0;
|
||||
int max_amt, food_amt, comm;
|
||||
s_char buf[1024];
|
||||
struct emp_qelem ship_list;
|
||||
struct emp_qelem *qp, *newqp;
|
||||
struct mlist *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];
|
||||
extern double techfact(int, double);
|
||||
struct sctstr *sectp;
|
||||
s_char *cp, item;
|
||||
int stopping;
|
||||
int quit;
|
||||
int didsomething = 0;
|
||||
int max_amt, food_amt, comm;
|
||||
s_char buf[1024];
|
||||
struct emp_qelem ship_list;
|
||||
struct emp_qelem *qp, *newqp;
|
||||
struct mlist *mlp;
|
||||
int dummyint;
|
||||
double dummydouble;
|
||||
int dir;
|
||||
natid cnum;
|
||||
struct mchrstr *mcp, *vship;
|
||||
|
||||
/* 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;
|
||||
bcopy((s_char *)sp, (s_char *)&mlp->ship, sizeof(struct shpstr));
|
||||
mlp->mobil = (double)sp->shp_mobil;
|
||||
emp_insque(&mlp->queue, &ship_list);
|
||||
|
||||
quit = 1; /* setup loop, we want to check it 1 time. */
|
||||
|
||||
do {
|
||||
if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
|
||||
(!(sp->shp_autonav & AN_STANDBY))) {
|
||||
shp_nav(&ship_list, &dummydouble, &dummydouble, &dummyint,
|
||||
sp->shp_own);
|
||||
if (QEMPTY(&ship_list))
|
||||
return RET_OK;
|
||||
/* before we move check to see if ship needs fuel. */
|
||||
sectp = getsectp(sp->shp_x,sp->shp_y);
|
||||
if (opt_FUEL &&
|
||||
sectp->sct_own != 0 &&
|
||||
sp->shp_fuel <= 0 &&
|
||||
mlp->mcp->m_fuelu != 0)
|
||||
auto_fuel_ship(sp);
|
||||
mlp->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 == '?')) {
|
||||
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);
|
||||
/* just return if no autonaving to do for this ship */
|
||||
if (!(sp->shp_autonav & AN_AUTONAV) || (sp->shp_autonav & AN_STANDBY))
|
||||
return RET_OK;
|
||||
|
||||
/* We need to free the ship list */
|
||||
qp = ship_list.q_forw;
|
||||
while (qp != &(ship_list)) {
|
||||
newqp = qp->q_forw;
|
||||
emp_remque(qp);
|
||||
free((s_char *)qp);
|
||||
qp = newqp;
|
||||
}
|
||||
return RET_SYN;
|
||||
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;
|
||||
bcopy((s_char *)sp, (s_char *)&mlp->ship, sizeof(struct shpstr));
|
||||
mlp->mobil = (double)sp->shp_mobil;
|
||||
emp_insque(&mlp->queue, &ship_list);
|
||||
|
||||
quit = 1; /* setup loop, we want to check it 1 time. */
|
||||
|
||||
do {
|
||||
if ((sp->shp_mobil > 0) && (!(sp->shp_autonav & AN_LOADING)) &&
|
||||
(!(sp->shp_autonav & AN_STANDBY))) {
|
||||
shp_nav(&ship_list, &dummydouble, &dummydouble, &dummyint,
|
||||
sp->shp_own);
|
||||
if (QEMPTY(&ship_list))
|
||||
return RET_OK;
|
||||
/* before we move check to see if ship needs fuel. */
|
||||
sectp = getsectp(sp->shp_x, sp->shp_y);
|
||||
if (opt_FUEL &&
|
||||
sectp->sct_own != 0 &&
|
||||
sp->shp_fuel <= 0 && mlp->mcp->m_fuelu != 0)
|
||||
auto_fuel_ship(sp);
|
||||
mlp->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 == '?')) {
|
||||
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);
|
||||
|
||||
/* We need to free the ship list */
|
||||
qp = ship_list.q_forw;
|
||||
while (qp != &(ship_list)) {
|
||||
newqp = qp->q_forw;
|
||||
emp_remque(qp);
|
||||
free((s_char *)qp);
|
||||
qp = newqp;
|
||||
}
|
||||
stopping = 0;
|
||||
|
||||
while (*cp && !stopping && sp->shp_own &&
|
||||
mlp->mobil > 0.0) {
|
||||
dir = chkdir(*cp++, DIR_STOP, DIR_LAST);
|
||||
|
||||
stopping |= shp_nav_one_sector(&ship_list, dir,
|
||||
sp->shp_own, 0);
|
||||
}
|
||||
|
||||
return RET_SYN;
|
||||
}
|
||||
stopping = 0;
|
||||
|
||||
while (*cp && !stopping && sp->shp_own && mlp->mobil > 0.0) {
|
||||
dir = chkdir(*cp++, DIR_STOP, DIR_LAST);
|
||||
|
||||
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);
|
||||
}
|
||||
|
||||
quit = 0; /* stop loop */
|
||||
|
||||
/* Try to load the ship */
|
||||
if (sp->shp_autonav & AN_LOADING) {
|
||||
didsomething = nav_loadship(sp, cnum);
|
||||
if (didsomething)
|
||||
quit = 1;
|
||||
}
|
||||
/* 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));
|
||||
sectp=getsectp(sp->shp_x,sp->shp_y);
|
||||
|
||||
if (food_amt<max_amt && (sectp->sct_own==0))
|
||||
quit=0;
|
||||
}
|
||||
/* reset flag and check if we can move. */
|
||||
|
||||
} while (quit); /* end loop */
|
||||
|
||||
putship(sp->shp_uid, sp);
|
||||
|
||||
/* We need to free the ship list (just in case) */
|
||||
qp = ship_list.q_forw;
|
||||
while (qp != &(ship_list)) {
|
||||
newqp = qp->q_forw;
|
||||
emp_remque(qp);
|
||||
free((s_char *)qp);
|
||||
qp = newqp;
|
||||
/* Ship not sunk */
|
||||
if (sp->shp_own)
|
||||
nav_check_atdest(sp, mcp);
|
||||
}
|
||||
return RET_OK;
|
||||
}
|
||||
|
||||
quit = 0; /* stop loop */
|
||||
|
||||
/* Try to load the ship */
|
||||
if (sp->shp_autonav & AN_LOADING) {
|
||||
didsomething = nav_loadship(sp, cnum);
|
||||
if (didsomething)
|
||||
quit = 1;
|
||||
}
|
||||
/* 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));
|
||||
sectp = getsectp(sp->shp_x, sp->shp_y);
|
||||
|
||||
if (food_amt < max_amt && (sectp->sct_own == 0))
|
||||
quit = 0;
|
||||
}
|
||||
/* reset flag and check if we can move. */
|
||||
|
||||
} while (quit); /* end loop */
|
||||
|
||||
putship(sp->shp_uid, sp);
|
||||
|
||||
/* We need to free the ship list (just in case) */
|
||||
qp = ship_list.q_forw;
|
||||
while (qp != &(ship_list)) {
|
||||
newqp = qp->q_forw;
|
||||
emp_remque(qp);
|
||||
free((s_char *)qp);
|
||||
qp = newqp;
|
||||
}
|
||||
return RET_OK;
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue