/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2005, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, 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 (rewrite)
*/
+#include <config.h>
+
#include <ctype.h>
-#include "misc.h"
-#include "player.h"
-#include "land.h"
-#include "xy.h"
-#include "nsc.h"
-#include "path.h"
+#include "commands.h"
#include "file.h"
#include "map.h"
-#include "commands.h"
-
-static int set_leader(struct emp_qelem *list, struct lndstr **leaderp);
+#include "path.h"
+#include "empobj.h"
+#include "unit.h"
int
march(void)
struct emp_qelem land_list;
double minmob, maxmob;
int together;
- s_char *cp = 0;
- struct lndstr *lnd = 0; /* leader */
- struct nstr_sect ns;
- s_char origin;
+ char *cp = NULL;
+ int leader_uid;
+ struct empobj *leader;
int dir;
int stopping = 0;
int skip = 0;
- s_char buf[1024];
- s_char prompt[128];
+ char buf[1024];
+ char prompt[128];
+ char scanspace[1024];
+ char bmap_flag;
+ int ac;
if (!snxtitem(&ni_land, EF_LAND, player->argp[1]))
return RET_SYN;
pr("No lands\n");
return RET_FAIL;
}
- set_leader(&land_list, &lnd);
+ leader = get_leader(&land_list);
+ leader_uid = leader->uid;
+ pr("Leader is %s\n", obj_nameof(leader));
if (player->argp[2]) {
strcpy(buf, player->argp[2]);
- if (!(cp = lnd_path(together, lnd, buf)))
+ if (!(cp = lnd_path(together, (struct lndstr *)leader, buf)))
cp = player->argp[2];
}
while (!QEMPTY(&land_list)) {
- s_char *bp, dp[80];
+ char dp[80];
- if (cp == 0 || *cp == '\0' || stopping) {
+ if (cp == NULL || *cp == '\0' || stopping) {
stopping = 0;
lnd_mar(&land_list, &minmob, &maxmob, &together, player->cnum);
if (QEMPTY(&land_list)) {
pr("No lands left\n");
return RET_OK;
}
- if (set_leader(&land_list, &lnd)) {
+ leader = get_leader(&land_list);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
stopping = 1;
continue;
}
if (!skip)
- nav_map(lnd->lnd_x, lnd->lnd_y, 1);
+ nav_map(leader->x, leader->y, 1);
else
skip = 0;
sprintf(prompt, "<%.1f:%.1f: %s> ", maxmob,
- minmob, xyas(lnd->lnd_x, lnd->lnd_y, player->cnum));
+ minmob, xyas(leader->x, leader->y, player->cnum));
cp = getstring(prompt, buf);
/* Just in case any of our lands were shelled while we were at the
* prompt, we call lnd_mar() again.
pr("No lands left\n");
return RET_OK;
}
- if (set_leader(&land_list, &lnd)) {
+ leader = get_leader(&land_list);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
stopping = 1;
continue;
}
+ if (cp && !(cp = lnd_path(together, (struct lndstr *)leader, buf)))
+ cp = buf;
}
- if (cp == 0 || *cp == '\0')
+ if (cp == NULL || *cp == '\0')
cp = &dirch[DIR_STOP];
- if (*cp == 'M' ||
- *cp == 'B' || *cp == 'f' || *cp == 'i' || *cp == 'm') {
- ++cp;
- if (cp[-1] == 'M') {
- unit_map(EF_LAND, lnd->lnd_uid, &ns, &origin);
- draw_map(0, origin, 0, &ns, player->cnum);
- skip = 1;
- } else if (cp[-1] == 'B') {
- unit_map(EF_LAND, lnd->lnd_uid, &ns, &origin);
- draw_map(EF_BMAP, origin, 0, &ns, player->cnum);
- skip = 1;
- } else if (cp[-1] == 'f') {
- struct emp_qelem *qp;
- qp = land_list.q_back;
- emp_remque(land_list.q_back);
- emp_insque(qp, &land_list);
- set_leader(&land_list, &lnd);
- } else if (cp[-1] == 'i') {
- lnd_list(&land_list);
- } else {
- lnd_sweep(&land_list, 1, 1, player->cnum);
- stopping |= lnd_check_mines(&land_list);
+ dir = chkdir(*cp, DIR_STOP, DIR_LAST);
+ if (dir >= 0) {
+ stopping |=
+ lnd_mar_one_sector(&land_list, dir, player->cnum, together);
+ cp++;
+ continue;
+ }
+ ac = parse(cp, player->argp, NULL, scanspace, NULL);
+ if (ac <= 1) {
+ sprintf(dp, "%d", leader->uid);
+ player->argp[1] = dp;
+ cp++;
+ } else
+ cp = NULL;
+ bmap_flag = 0;
+ switch (*player->argp[0]) {
+ case 'B':
+ bmap_flag = 'b';
+ /*
+ * fall through
+ */
+ case 'M':
+ do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]);
+ skip = 1;
+ continue;
+ case 'f':
+ if (ac <= 1)
+ switch_leader(&land_list, -1);
+ else
+ switch_leader(&land_list, atoi(player->argp[1]));
+ leader = get_leader(&land_list);
+ if (leader->uid != leader_uid) {
+ leader_uid = leader->uid;
+ pr_leader_change(leader);
}
continue;
- } else if (*cp == 'r' || *cp == 'l') {
- bp = ++cp;
- while ((*bp != ' ') && (*bp))
- bp++;
- while ((*bp == ' ') && (*bp))
- bp++;
- if ((bp != (s_char *)0) && (*bp))
- player->argp[1] = bp;
- else {
- sprintf(dp, "%d", lnd->lnd_uid);
+ case 'i':
+ lnd_list(&land_list);
+ continue;
+ case 'm':
+ lnd_sweep(&land_list, 1, 1, player->cnum);
+ stopping |= lnd_check_mines(&land_list);
+ continue;
+ case 'r':
+ radar(EF_LAND);
+ skip = 1;
+ player->btused++;
+ continue;
+ case 'l':
+ llook();
+ player->btused++;
+ continue;
+ case 'd':
+ if (ac == 2) {
+ player->argp[2] = player->argp[1];
+ sprintf(dp, "%d", leader->uid);
player->argp[1] = dp;
}
- if (cp[-1] == 'r') {
- player->argp[0] = "lradar";
- rada();
- skip = 1;
- } else
- llook();
- *cp = 0;
+ landmine();
+ skip = 1;
player->btused++;
continue;
- } else {
- dir = chkdir(*cp++, DIR_STOP, DIR_LAST);
- if (dir == -1) {
- if (NULL != (cp = lnd_path(together, lnd, buf)))
- continue;
- direrr("`%c' to stop", 0, 0);
- pr(", `i' to list units, `f' to change leader,\n");
- pr("`r' to radar, `l' to look, `M' to map, `B' to bmap,\n");
- pr("and `m' to minesweep\n");
- stopping = 1;
- continue;
- }
}
- stopping |=
- lnd_mar_one_sector(&land_list, dir, player->cnum, together);
+ direrr("`%c' to stop", 0, 0);
+ pr(", `i' to list units, `f' to change leader,\n");
+ pr("`r' to radar, `l' to look, `M' to map, `B' to bmap,\n");
+ pr("`d' to drop mines, and `m' to minesweep\n");
+ stopping = 1;
}
return RET_OK;
}
-static int
-set_leader(struct emp_qelem *list, struct lndstr **leaderp)
+void
+pr_leader_change(struct empobj *leader)
{
- struct llist *llp = (struct llist *)(list->q_back);
+ pr("Changing %s to %s\n",
+ leader->ef_type == EF_SHIP ? "flagship" : "leader",
+ obj_nameof(leader));
+}
- if (!*leaderp)
- pr("Leader is ");
- else if ((*leaderp)->lnd_uid != llp->land.lnd_uid)
- pr("Changing leader to ");
- else
- return 0;
- *leaderp = &llp->land;
- pr("%s\n", prland(&llp->land));
- return 1;
+struct empobj *
+get_leader(struct emp_qelem *list)
+{
+ return &((struct ulist *)(list->q_back))->unit.gen;
}
+
+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);
+}
+
projects / empserver / blobdiff