/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, 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.
*
* ---
*
* orde.c: Turn on/off autonavigation
- *
+ *
* Known contributors to this file:
* Chad Zabel, 1994
* Steve McClure, 2000
*/
-#include <string.h>
-#include <ctype.h>
-#include "misc.h"
-#include "player.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 <config.h>
+
#include "commands.h"
+#include "item.h"
#include "optlist.h"
+#include "path.h"
+#include "ship.h"
/*
-** Command syntax:
-**
-** ORDER <ship> Show orders
-** ORDER <ship> c[ancel] Cancel orders
-** ORDER <ship> s[top] Suspend orders
-** ORDER <ship> r[esume] Resume orders
-** ORDER <ship> d[eclare] <dest1> Set destination
-** d[eclare] <dest1> <dest2>
-** ORDER <ship> l[evel] <field> <start/end> <comm> <level>
-**
-**
-** New syntax:
-** qorder <ship> display cargo levels
-** sorder <ship> display statistical info
+ * Command syntax:
+ *
+ * ORDER <ship> Show orders
+ * ORDER <ship> c[ancel] Cancel orders
+ * ORDER <ship> s[top] Suspend orders
+ * ORDER <ship> r[esume] Resume orders
+ * ORDER <ship> d[eclare] <dest1> Set destination
+ * d[eclare] <dest1> <dest2>
+ * ORDER <ship> l[evel] <field> <start/end> <comm> <level>
+ *
+ * New syntax:
+ * qorder <ship> display cargo levels
+ * sorder <ship> display statistical info
*/
int
struct ichrstr *i1;
coord p0x, p0y, p1x, p1y;
int i;
- s_char *p, *p1, *dest;
- s_char buf1[128];
- s_char buf[1024];
- s_char prompt[128];
+ char *p, *p1, *dest;
+ char buf1[128];
+ char buf[1024];
+ char prompt[128];
- if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+ if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
- while (!player->aborted && nxtitem(&nb, (s_char *)(&ship))) {
+ while (!player->aborted && nxtitem(&nb, (&ship))) {
if (!player->owner || ship.shp_own == 0)
continue;
- if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
- pr("bad ship type %d (#%d)\n", ship.shp_type, nb.cur);
- continue;
- }
if (opt_SAIL) {
if (*ship.shp_path) {
if (!diffeachship)
if (!orders) {
p = getstarg(player->argp[4], "Second dest? ", buf);
- if (!p || !*p || !strcmp(p, "-")) {
+ if (!p)
+ return RET_FAIL;
+ if (!*p || !strcmp(p, "-")) {
orders = 1;
pr("A one-way order has been accepted.\n");
} else if (!strncmp(p, "s", 1)) {
ship.shp_destx[0] = p0x;
ship.shp_desty[0] = p0y;
- ship.shp_autonav &= ~(AN_STANDBY + AN_SAILDIR + AN_LOADING);
+ ship.shp_autonav &= ~(AN_STANDBY | AN_LOADING);
ship.shp_autonav |= AN_AUTONAV;
if (scuttling)
break;
}
- /* to keep sub in range of our arrays
+ /* to keep sub in range of our arrays
subtract 1 so the new range is 0-(TMAX-1)
*/
sub = sub - 1;;
level = 0; /* prevent negatives. */
pr("You must use positive number! Level set to 0.\n");
}
- ship.shp_tstart[sub] = i1->i_vtype;
+ ship.shp_tstart[sub] = i1->i_uid;
ship.shp_lstart[sub] = level;
pr("Order Set \n");
break;
level = 0;
pr("You must use positive number! Level set to 0.\n");
}
- ship.shp_tend[sub] = i1->i_vtype;
+ ship.shp_tend[sub] = i1->i_uid;
ship.shp_lend[sub] = level;
pr("Order Set \n");
break;
ship.shp_autonav |= AN_LOADING;
- /* swap variables, this keeps
+ /* swap variables, this keeps
the load_it() procedure happy. CZ
*/
tcord = ship.shp_destx[0];
}
static void
-eta_calc(struct shpstr *sp, s_char *path, int *len, int *nupdates)
+eta_calc(struct shpstr *sp, char *path, int *len, int *nupdates)
{
double mobcost, mobil;
int i;
*len = i;
*nupdates = 1;
- mobcost = sp->shp_effic * 0.01 * sp->shp_speed;
- mobcost = 480.0 / (mobcost + techfact(sp->shp_tech, mobcost));
+ mobcost = shp_mobcost(sp);
mobil = sp->shp_mobil;
while (i) {
if (mobil > 0) {
struct nstr_item nb;
struct shpstr ship;
- if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+ if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
- while (nxtitem(&nb, (s_char *)(&ship))) {
+ while (nxtitem(&nb, (&ship))) {
if (!player->owner || ship.shp_own == 0)
continue;
- if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
- pr("bad ship type %d (#%d)\n", ship.shp_type, nb.cur);
+ if (!(ship.shp_autonav & AN_AUTONAV)
+ && (!opt_SAIL || !ship.shp_path[0]))
continue;
- }
- if ((ship.shp_autonav & AN_AUTONAV) ||
- (ship.shp_path[0] && opt_SAIL)) {
- if (!nships) { /* 1st ship, print banner */
- if (player->god)
- pr("own ");
- pr("shp# ship type ");
- pr("[Starting] (Ending) \n");
- }
- nships++;
+ if (!nships) { /* 1st ship, print banner */
if (player->god)
- pr("%3d ", ship.shp_own);
- pr("%4d", nb.cur);
- pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
+ pr("own ");
+ pr("shp# ship type ");
+ pr("[Starting] (Ending) \n");
}
- if (ship.shp_autonav & AN_AUTONAV) {
+ nships++;
+ if (player->god)
+ pr("%3d ", ship.shp_own);
+ pr("%4d", nb.cur);
+ pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
+ if (ship.shp_autonav & AN_AUTONAV) {
pr(" [");
for (i = 0; i < TMAX; i++)
prhold(i, ship.shp_tend[i], ship.shp_lend[i]);
if (ship.shp_autonav & AN_SCUTTLE)
pr(" scuttling");
pr("\n");
- }
+ } else
+ pr(" has a sail path\n");
- if (opt_SHIPNAMES) {
- if ((ship.shp_autonav & AN_AUTONAV) ||
- (ship.shp_path[0] && opt_SAIL)) {
- if (ship.shp_name[0] != 0) {
- if (player->god)
- pr(" ");
- pr(" %s\n", ship.shp_name);
- }
- }
+ if (ship.shp_name[0] != 0) {
+ if (player->god)
+ pr(" ");
+ pr(" %s\n", ship.shp_name);
}
}
if (!nships) {
return RET_OK;
}
-/* Chad Zabel 1-15-94
- * New command added to display autonav stats.
- */
-
int
sorde(void)
{
int nships = 0;
int len, updates;
- s_char *c;
+ char *c;
struct nstr_item nb;
struct shpstr ship;
- s_char buf[1024];
+ char buf[1024];
- if (!snxtitem(&nb, EF_SHIP, player->argp[1]))
+ if (!snxtitem(&nb, EF_SHIP, player->argp[1], NULL))
return RET_SYN;
- while (nxtitem(&nb, (s_char *)(&ship))) {
+ while (nxtitem(&nb, (&ship))) {
if (!player->owner || ship.shp_own == 0)
continue;
- if (ship.shp_type < 0 || ship.shp_type > shp_maxno) {
- pr("bad ship type %d (#%d)\n", ship.shp_type, nb.cur);
+ if (!(ship.shp_autonav & AN_AUTONAV)
+ && (!opt_SAIL || !ship.shp_path[0]))
continue;
- }
- if ((ship.shp_autonav & AN_AUTONAV) ||
- (ship.shp_path[0] && opt_SAIL)) {
- if (!nships) { /* 1st ship, print banner */
- if (player->god)
- pr("own ");
- pr("shp# ship type x,y ");
- pr("start end ");
- pr("len eta\n");
- }
- nships++;
+
+ if (!nships) { /* 1st ship, print banner */
if (player->god)
- pr("%3d ", ship.shp_own);
- pr("%4d", nb.cur);
- pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
- prxy(" %3d,%-3d", ship.shp_x, ship.shp_y, player->cnum);
+ pr("own ");
+ pr("shp# ship type x,y ");
+ pr("start end ");
+ pr("len eta\n");
}
+ nships++;
+ if (player->god)
+ pr("%3d ", ship.shp_own);
+ pr("%4d", nb.cur);
+ pr(" %-16.16s", mchr[(int)ship.shp_type].m_name);
+ prxy(" %3d,%-3d", ship.shp_x, ship.shp_y, player->cnum);
+
if (ship.shp_autonav & AN_AUTONAV) {
/* Destination 1 */
- prxy(" %3d,%-3d", ship.shp_destx[1],
- ship.shp_desty[1], player->cnum);
+ prxy(" %3d,%-3d",
+ ship.shp_destx[1], ship.shp_desty[1], player->cnum);
/* Destination 2 */
if ((ship.shp_destx[1] != ship.shp_destx[0])
|| (ship.shp_desty[1] != ship.shp_desty[0])) {
- prxy(" %3d,%-3d", ship.shp_destx[0],
- ship.shp_desty[0], player->cnum);
+ prxy(" %3d,%-3d",
+ ship.shp_destx[0], ship.shp_desty[0], player->cnum);
} else
pr(" ");
else {
/* ETA calculation */
- c = BestShipPath(buf, ship.shp_x,
- ship.shp_y, ship.shp_destx[0],
- ship.shp_desty[0], ship.shp_own);
- if (!c || !*c)
+ c = BestShipPath(buf, ship.shp_x, ship.shp_y,
+ ship.shp_destx[0], ship.shp_desty[0],
+ ship.shp_own);
+ if (!c)
pr(" no route possible");
else if (*c == 'h')
pr(" has arrived");
- else if (*c == '?')
- pr(" route too long");
else {
/* distance to destination */
eta_calc(&ship, c, &len, &updates);
if (ship.shp_autonav & AN_SCUTTLE)
pr(" (scuttling)");
pr("\n");
- }
- if (opt_SHIPNAMES) {
- if ((ship.shp_autonav & AN_AUTONAV) ||
- (ship.shp_path[0] && opt_SAIL)) {
- if (!(ship.shp_autonav & AN_AUTONAV))
- pr("\n");
- if (ship.shp_name[0] != 0) {
- if (player->god)
- pr(" ");
- pr(" %s\n", ship.shp_name);
- }
- }
+ } else
+ pr(" has a sail path\n");
+
+ if (ship.shp_name[0] != 0) {
+ if (player->god)
+ pr(" ");
+ pr(" %s\n", ship.shp_name);
}
}
if (!nships) {
projects / empserver / blobdiff