/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2006, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2010, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
* ---
*
* marc.c: March units around
- *
+ *
* Known contributors to this file:
* Thomas Ruschak
* Ken Stevens, 1995 (rewrite)
+ * Ron Koenderink, 2006-2007
*/
#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);
-static void switch_leader(struct emp_qelem *list, int land_uid);
+#include "path.h"
+#include "empobj.h"
+#include "unit.h"
int
march(void)
struct emp_qelem land_list;
double minmob, maxmob;
int together;
- char *cp = NULL;
- struct lndstr *lnd = NULL; /* leader */
- struct nstr_sect ns;
- char origin;
- int dir;
- int stopping = 0;
- int skip = 0;
- char buf[1024];
- char prompt[128];
- char scanspace[1024];
- char bmap_flag;
- int ac;
- if (!snxtitem(&ni_land, EF_LAND, player->argp[1]))
+ if (!snxtitem(&ni_land, EF_LAND, player->argp[1], NULL))
return RET_SYN;
lnd_sel(&ni_land, &land_list);
lnd_mar(&land_list, &minmob, &maxmob, &together, player->cnum);
pr("No lands\n");
return RET_FAIL;
}
- set_leader(&land_list, &lnd);
- if (player->argp[2]) {
- strcpy(buf, player->argp[2]);
- if (!(cp = lnd_path(together, lnd, buf)))
- cp = player->argp[2];
- }
-
- while (!QEMPTY(&land_list)) {
- char dp[80];
-
- 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)) {
- stopping = 1;
- continue;
- }
- if (!skip)
- nav_map(lnd->lnd_x, lnd->lnd_y, 1);
- else
- skip = 0;
- sprintf(prompt, "<%.1f:%.1f: %s> ", maxmob,
- minmob, xyas(lnd->lnd_x, lnd->lnd_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.
- */
- 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)) {
- stopping = 1;
- continue;
- }
- if (cp && !(cp = lnd_path(together, lnd, buf)))
- cp = buf;
- }
- if (cp == NULL || *cp == '\0')
- cp = &dirch[DIR_STOP];
- 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", lnd->lnd_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':
- unit_map(EF_LAND, atoi(player->argp[1]), &ns, &origin);
- draw_map(bmap_flag, origin, 0, &ns);
- skip = 1;
- break;
- case 'f':
- if (ac <= 1)
- switch_leader(&land_list, -1);
- else
- switch_leader(&land_list, atoi(player->argp[1]));
- set_leader(&land_list, &lnd);
- break;
- case 'i':
- lnd_list(&land_list);
- break;
- case 'm':
- lnd_sweep(&land_list, 1, 1, player->cnum);
- stopping |= lnd_check_mines(&land_list);
- break;
- case 'r':
- player->argp[0] = "lradar";
- rada();
- skip = 1;
- player->btused++;
- break;
- case 'l':
- llook();
- player->btused++;
- break;
- case 'd':
- if (ac == 2) {
- player->argp[2] = player->argp[1];
- sprintf(dp, "%d", lnd->lnd_uid);
- player->argp[1] = dp;
- }
- landmine();
- skip = 1;
- player->btused++;
- break;
- default:
- 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;
+ return do_unit_move(&land_list, &together, &minmob, &maxmob);
}
-
-static int
-set_leader(struct emp_qelem *list, struct lndstr **leaderp)
-{
- struct llist *llp = (struct llist *)(list->q_back);
-
- 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;
-}
-
-static void
-switch_leader(struct emp_qelem *list, int land_uid)
-{
- struct emp_qelem *qp, *save;
- struct llist *llp;
-
- if (QEMPTY(list))
- return;
-
- save = qp = list->q_back;
- do {
- emp_remque(qp);
- emp_insque(qp, list);
- qp = list->q_back;
- llp = (struct llist *)qp;
- if (llp->land.lnd_uid == land_uid || land_uid == -1)
- break;
- } while (list->q_back != save);
-}
-
projects / empserver / blobdiff