/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, 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
* ---
*
* navi.c: Navigate ships and such
- *
+ *
* Known contributors to this file:
* Ken Stevens, 1995 (rewritten)
+ * Ron Koenderink, 2006-2007
*/
#include <config.h>
-#include <ctype.h>
#include "commands.h"
#include "map.h"
#include "optlist.h"
#include "empobj.h"
#include "unit.h"
+static void pr_leader_change(struct empobj *leader);
+static struct empobj *get_leader(struct emp_qelem *list);
+static void switch_leader(struct emp_qelem *list, int uid);
+
int
navi(void)
{
struct emp_qelem ship_list;
double minmob, maxmob;
int together;
+
+ if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1], NULL))
+ return RET_SYN;
+ shp_sel(&ni_ship, &ship_list);
+ shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
+ if (QEMPTY(&ship_list)) {
+ pr("No ships\n");
+ return RET_FAIL;
+ }
+
+ return do_unit_move(&ship_list, &together, &minmob, &maxmob);
+}
+
+int
+do_unit_move(struct emp_qelem *ulist, int *together,
+ double *minmob, double *maxmob)
+{
char *cp = NULL;
int leader_uid;
- struct shpstr *shp; /* flagship */
+ struct empobj *leader;
int dir;
int stopping = 0;
int skip = 0;
char buf[1024];
char prompt[128];
char scanspace[1024];
- char pathtaken[1024]; /* Doubtful we'll have a path longer than this */
+ char pathtaken[1024]; /* Doubtful we'll have a path longer than this */
char *pt = pathtaken;
char bmap_flag;
int ac;
+ int type;
+
+ leader = get_leader(ulist);
+ leader_uid = leader->uid;
+ type = leader->ef_type;
+ pr("%s is %s\n",
+ type == EF_SHIP ? "Flagship" : "Leader",
+ obj_nameof(leader));
- if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1]))
- return RET_SYN;
- shp_sel(&ni_ship, &ship_list);
- shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
- if (QEMPTY(&ship_list)) {
- pr("No ships\n");
- return RET_FAIL;
- }
- shp = (struct shpstr *)get_leader(&ship_list);
- leader_uid = shp->shp_uid;
- pr("Flagship is %s\n", prship(shp));
if (player->argp[2]) {
strcpy(buf, player->argp[2]);
- if (!(cp = shp_path(together, shp, buf)))
+ if (!(cp = unit_path(*together, leader, buf)))
cp = player->argp[2];
}
*pt = '\0';
- while (!QEMPTY(&ship_list)) {
+ while (!QEMPTY(ulist)) {
char dp[80];
if (cp == NULL || *cp == '\0' || stopping) {
stopping = 0;
- shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
- if (QEMPTY(&ship_list)) {
- pr("No ships left\n");
- if (strlen(pathtaken) > 0) {
+ if (type == EF_SHIP)
+ shp_nav(ulist, minmob, maxmob, together, player->cnum);
+ else
+ lnd_mar(ulist, minmob, maxmob, together, player->cnum);
+ if (QEMPTY(ulist)) {
+ pr("No %s left\n",
+ type == EF_SHIP ? "ships" : "lands");
+ if (type == EF_SHIP && strlen(pathtaken) > 1) {
pathtaken[strlen(pathtaken) - 1] = '\0';
- if (strlen(pathtaken) > 0)
- pr("Path taken: %s\n", pathtaken);
+ pr("Path taken: %s\n", pathtaken);
}
return RET_OK;
}
- shp = (struct shpstr *)get_leader(&ship_list);
- if (shp->shp_uid != leader_uid) {
- leader_uid = shp->shp_uid;
- pr_leader_change((struct empobj *)shp);
+ leader = get_leader(ulist);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
stopping = 1;
continue;
}
if (!skip)
- nav_map(shp->shp_x, shp->shp_y,
- !(mchr[(int)shp->shp_type].m_flags & M_SUB));
+ nav_map(leader->x, leader->y,
+ type == EF_SHIP ?
+ !(mchr[(int)leader->type].m_flags & M_SUB) : 1);
else
skip = 0;
- sprintf(prompt, "<%.1f:%.1f: %s> ", maxmob,
- minmob, xyas(shp->shp_x, shp->shp_y, player->cnum));
+ sprintf(prompt, "<%.1f:%.1f: %s> ", *maxmob,
+ *minmob, xyas(leader->x, leader->y, player->cnum));
cp = getstring(prompt, buf);
- /* Just in case any of our ships were shelled while we were
- * at the prompt, we call shp_nav() again.
+ /* Just in case any of our units were shelled while we were
+ * at the prompt, we call shp_nav() or lnd_mar() again.
*/
- shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
- if (QEMPTY(&ship_list)) {
- pr("No ships left\n");
- if (strlen(pathtaken) > 0) {
+ if (type == EF_SHIP)
+ shp_nav(ulist, minmob, maxmob, together, player->cnum);
+ else
+ lnd_mar(ulist, minmob, maxmob, together, player->cnum);
+ if (QEMPTY(ulist)) {
+ pr("No %s left\n",
+ type == EF_SHIP ? "ships" : "lands");
+ if (type == EF_SHIP && strlen(pathtaken) > 1) {
pathtaken[strlen(pathtaken) - 1] = '\0';
- if (strlen(pathtaken) > 0)
- pr("Path taken: %s\n", pathtaken);
+ pr("Path taken: %s\n", pathtaken);
}
return RET_OK;
}
- shp = (struct shpstr *)get_leader(&ship_list);
- if (shp->shp_uid != leader_uid) {
- leader_uid = shp->shp_uid;
- pr_leader_change((struct empobj *)shp);
+ leader = get_leader(ulist);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
stopping = 1;
continue;
}
- if (cp && !(cp = shp_path(together, shp, buf)))
+ if (!(cp = unit_path(*together, leader, buf)))
cp = buf;
}
- radmapnopr(shp->shp_x, shp->shp_y, (int)shp->shp_effic,
- (int)techfact(shp->shp_tech,
- mchr[(int)shp->shp_type].m_vrnge),
- (mchr[(int)shp->shp_type].m_flags & M_SONAR)
- ? techfact(shp->shp_tech, 1.0) : 0.0);
+ if (type == EF_SHIP) {
+ radmapnopr(leader->x, leader->y, (int)leader->effic,
+ (int)techfact(leader->tech,
+ mchr[(int)leader->type].m_vrnge),
+ (mchr[(int)leader->type].m_flags & M_SONAR)
+ ? techfact(leader->tech, 1.0) : 0.0);
+ }
if (cp == NULL || *cp == '\0')
cp = &dirch[DIR_STOP];
- dir = chkdir(*cp, DIR_STOP, DIR_VIEW);
+ dir = chkdir(*cp, DIR_STOP, DIR_LAST);
if (dir >= 0) {
- if (dir == DIR_VIEW)
- shp_view(&ship_list);
- else {
- stopping |= shp_nav_one_sector(&ship_list, dir, player->cnum, together);
+ if (type == EF_SHIP) {
+ stopping |= shp_nav_one_sector(ulist, dir,
+ player->cnum, *together);
if (stopping != 2) {
*pt++ = dirch[dir];
*pt = '\0';
}
- }
+ } else
+ stopping |=
+ lnd_mar_one_sector(ulist, dir, player->cnum,
+ *together);
cp++;
continue;
}
- ac = parse(cp, player->argp, NULL, scanspace, NULL);
+ ac = parse(cp, scanspace, player->argp, NULL, NULL, NULL);
if (ac <= 1) {
- sprintf(dp, "%d", shp->shp_uid);
+ sprintf(dp, "%d", leader->uid);
player->argp[1] = dp;
cp++;
} else
* fall through
*/
case 'M':
- do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]);
+ do_map(bmap_flag, leader->ef_type, player->argp[1],
+ player->argp[2]);
skip = 1;
- break;
+ continue;
case 'f':
- if (ac <= 1)
- switch_leader(&ship_list, -1);
+ if (ac <= 1)
+ switch_leader(ulist, -1);
else
- switch_leader(&ship_list, atoi(player->argp[1]));
- shp = (struct shpstr *)get_leader(&ship_list);
- if (shp->shp_uid != leader_uid) {
- leader_uid = shp->shp_uid;
- pr_leader_change((struct empobj *)shp);
+ switch_leader(ulist, atoi(player->argp[1]));
+ leader = get_leader(ulist);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
}
- break;
+ continue;
case 'i':
- shp_list(&ship_list);
- break;
+ unit_list(ulist);
+ continue;
case 'm':
- stopping |= shp_sweep(&ship_list, 1, 1, player->cnum);
- break;
+ if (type == EF_SHIP)
+ stopping |= shp_sweep(ulist, 1, 1, player->cnum);
+ else {
+ lnd_sweep(ulist, 1, 1, player->cnum);
+ stopping |= lnd_check_mines(ulist);
+ }
+ continue;
case 'r':
- radar(EF_SHIP);
+ radar(leader->ef_type);
skip = 1;
player->btused++;
- break;
+ continue;
case 'l':
- look();
+ do_look(type);
player->btused++;
- break;
+ continue;
case 's':
+ if (leader->ef_type != EF_SHIP)
+ break;
sona();
player->btused++;
skip = 1;
- break;
+ continue;
case 'd':
if (ac == 2) {
player->argp[2] = player->argp[1];
- sprintf(dp, "%d", shp->shp_uid);
+ sprintf(dp, "%d", leader->uid);
player->argp[1] = dp;
}
- mine();
+ if (type == EF_SHIP)
+ mine();
+ else
+ landmine();
skip = 1;
player->btused++;
- break;
- default:
- direrr("`%c' to stop", ", `%c' to view, ", 0);
- pr("`i' to list ships, `f' to change flagship,\n");
- pr("`r' to radar, `s' to sonar, `l' to look, `M' to map, `B' to bmap,\n");
- pr("`d' to drop mines, and `m' to minesweep\n");
- stopping = 1;
+ continue;
+ case 'v':
+ unit_view(ulist);
+ continue;
}
+ direrr("`%c' to stop", ", `%c' to view", NULL);
+ pr(", `i' to list %s, `f' to change %s,\n",
+ type == EF_SHIP ? "ships" : "units",
+ type == EF_SHIP ? "flagship" : "leader");
+ pr("`r' to radar, %s`l' to look, `M' to map, `B' to bmap,\n",
+ type == EF_SHIP ? "`s' to sonar, " : "");
+ pr("`d' to drop mines, and `m' to minesweep\n");
+ stopping = 1;
}
- if (strlen(pathtaken) > 0) {
+ if (type == EF_SHIP && strlen(pathtaken) > 1) {
pathtaken[strlen(pathtaken) - 1] = '\0';
- if (strlen(pathtaken) > 0)
- pr("Path taken: %s\n", pathtaken);
+ pr("Path taken: %s\n", pathtaken);
}
return RET_OK;
}
struct nstr_sect ns;
struct natstr *np;
struct sctstr sect;
- struct range range;
int i;
/* Note this is not re-entrant anyway, so we keep the buffers
around */
- static unsigned char *bitmap = NULL;
static char *wmapbuf = NULL;
static char **wmap = NULL;
int changed = 0;
wmap = NULL;
}
}
- if (!bitmap)
- bitmap = malloc((WORLD_X * WORLD_Y) / 8);
- if (!wmapbuf || !wmap || !bitmap) {
+ if (!wmapbuf || !wmap) {
pr("Memory error, tell the deity.\n");
logerror("malloc failed in navi\n");
return RET_FAIL;
}
- memset(bitmap, 0, (WORLD_X * WORLD_Y) / 8);
snxtsct_dist(&ns, x, y, 1);
np = getnatp(player->cnum);
- xyrelrange(np, &ns.range, &range);
blankfill(wmapbuf, &ns.range, 1);
while (nxtsct(&ns, §)) {
ptr = &wmap[ns.dy][ns.dx];
* in which case they'll see that.
* --ts
*/
- *ptr = player->bmap[sctoff(sect.sct_x, sect.sct_y)];
+ *ptr = player->bmap[sect.sct_uid];
}
if (changed)
writemap(player->cnum);
pr("%s\n", wmap[i]);
return RET_OK;
}
+
+static void
+pr_leader_change(struct empobj *leader)
+{
+ pr("Changing %s to %s\n",
+ leader->ef_type == EF_SHIP ? "flagship" : "leader",
+ obj_nameof(leader));
+}
+
+static struct empobj *
+get_leader(struct emp_qelem *list)
+{
+ return &((struct ulist *)(list->q_back))->unit.gen;
+}
+
+static void
+switch_leader(struct emp_qelem *list, int uid)
+{
+ struct emp_qelem *qp, *save;
+ struct ulist *ulp;
+
+ if (QEMPTY(list))
+ return;
+
+ save = qp = list->q_back;
+ do {
+ emp_remque(qp);
+ emp_insque(qp, list);
+ qp = list->q_back;
+ ulp = (struct ulist *)qp;
+ if (ulp->unit.gen.uid == uid || uid == -1)
+ break;
+ } while (list->q_back != save);
+}