empire/empserver
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

(navi): Reorganize, use parse() to split arguments.

Browse source
This commit is contained in:
Ron Koenderink 2006-06-28 13:51:44 +00:00
parent 6fd656a685
commit 0c12d837cb
1 changed files with 74 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

138
src/lib/commands/navi.c
View file

@ -56,8 +56,8 @@ navi(void)
struct emp_qelem ship_list; struct emp_qelem ship_list;
double minmob, maxmob; double minmob, maxmob;
int together; int together;
char *cp = 0; char *cp = NULL;
struct shpstr *shp = 0; /* flagship */ struct shpstr *shp = NULL; /* flagship */
struct nstr_sect ns; struct nstr_sect ns;
char origin; char origin;
int dir; int dir;
@ -65,8 +65,11 @@ navi(void)
int skip = 0; int skip = 0;
char buf[1024]; char buf[1024];
char prompt[128]; 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 *pt = pathtaken;
char bmap_flag;
int ac;
if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1])) if (!snxtitem(&ni_ship, EF_SHIP, player->argp[1]))
return RET_SYN; return RET_SYN;
@ -85,9 +88,9 @@ navi(void)
*pt = '\0'; *pt = '\0';
while (!QEMPTY(&ship_list)) { while (!QEMPTY(&ship_list)) {
char *bp, dp[80]; char dp[80];
if (cp == 0 || *cp == '\0' || stopping) { if (cp == NULL || *cp == '\0' || stopping) {
stopping = 0; stopping = 0;
shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum); shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
if (QEMPTY(&ship_list)) { if (QEMPTY(&ship_list)) {
@ -111,8 +114,8 @@ navi(void)
sprintf(prompt, "<%.1f:%.1f: %s> ", maxmob, sprintf(prompt, "<%.1f:%.1f: %s> ", maxmob,
minmob, xyas(shp->shp_x, shp->shp_y, player->cnum)); minmob, xyas(shp->shp_x, shp->shp_y, player->cnum));
cp = getstring(prompt, buf); cp = getstring(prompt, buf);
/* Just in case any of our ships were shelled while we were at the /* Just in case any of our ships were shelled while we were
* prompt, we call shp_nav() again. * at the prompt, we call shp_nav() again.
*/ */
shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum); shp_nav(&ship_list, &minmob, &maxmob, &together, player->cnum);
if (QEMPTY(&ship_list)) { if (QEMPTY(&ship_list)) {
@ -136,72 +139,79 @@ navi(void)
mchr[(int)shp->shp_type].m_vrnge), mchr[(int)shp->shp_type].m_vrnge),
(mchr[(int)shp->shp_type].m_flags & M_SONAR) (mchr[(int)shp->shp_type].m_flags & M_SONAR)
? techfact(shp->shp_tech, 1.0) : 0.0); ? techfact(shp->shp_tech, 1.0) : 0.0);
if (cp == 0 || *cp == '\0') if (cp == NULL || *cp == '\0') {
cp = &dirch[DIR_STOP]; cp = &dirch[DIR_STOP];
if (*cp == 'M' || }
*cp == 'B' || *cp == 'f' || *cp == 'i' || *cp == 'm') { dir = chkdir(*cp, DIR_STOP, DIR_VIEW);
++cp; if (dir >= 0) {
if (cp[-1] == 'M') { if (dir == DIR_VIEW)
unit_map(EF_SHIP, shp->shp_uid, &ns, &origin); shp_view(&ship_list);
draw_map(0, origin, MAP_SHIP, &ns); else {
skip = 1; stopping |= shp_nav_one_sector(&ship_list, dir, player->cnum, together);
} else if (cp[-1] == 'B') { if (stopping != 2) {
unit_map(EF_SHIP, shp->shp_uid, &ns, &origin); *pt++ = dirch[dir];
draw_map('b', origin, MAP_SHIP, &ns); *pt = '\0';
skip = 1; }
} else if (cp[-1] == 'f') { }
cp++;
continue;
}
ac = parse(cp, player->argp, NULL, scanspace, NULL);
if (ac <= 1) {
sprintf(dp, "%d", shp->shp_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_SHIP, shp->shp_uid, &ns, &origin);
draw_map(bmap_flag, origin, MAP_SHIP, &ns);
skip = 1;
break;
case 'f':
{
struct emp_qelem *qp; struct emp_qelem *qp;
qp = ship_list.q_back; qp = ship_list.q_back;
emp_remque(ship_list.q_back); emp_remque(ship_list.q_back);
emp_insque(qp, &ship_list); emp_insque(qp, &ship_list);
set_flagship(&ship_list, &shp); set_flagship(&ship_list, &shp);
} else if (cp[-1] == 'i') {
shp_list(&ship_list);
} else {
stopping |= shp_sweep(&ship_list, 1, 0, player->cnum);
} }
continue; break;
} else if (*cp == 'r' || *cp == 'l' || *cp == 's') { case 'i':
for (bp = cp + 1; *bp && !isspace(*bp); bp++) ; shp_list(&ship_list);
for (; *bp && isspace(*bp); bp++) ; skip = 1;
if (*bp) break;
player->argp[1] = bp; case 'm':
else { stopping |= shp_sweep(&ship_list, 1, 0, player->cnum);
sprintf(dp, "%d", shp->shp_uid); break;
player->argp[1] = dp; case 'r':
} rada();
if (*cp++ == 'r') { skip = 1;
rada();
skip = 1;
} else if (cp[-1] == 'l')
look();
else {
player->argp[2] = 0;
sona();
skip = 1;
}
*cp = 0;
player->btused++; player->btused++;
continue; break;
} else { case 'l':
dir = chkdir(*cp++, DIR_STOP, DIR_VIEW); look();
if (dir < 0) { player->btused++;
direrr("`%c' to stop", ", `%c' to view, ", 0); break;
pr("`i' to list ships, `f' to change flagship,\n"); case 's':
pr("`r' to radar, `s' to sonar, `l' to look, `M' to map, `B' to bmap,\n"); sona();
pr("and `m' to minesweep\n"); player->btused++;
stopping = 1; skip = 1;
continue; break;
} else if (dir == DIR_VIEW) { default:
shp_view(&ship_list); direrr("`%c' to stop", ", `%c' to view, ", 0);
continue; 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("and `m' to minesweep\n");
stopping |= stopping = 1;
shp_nav_one_sector(&ship_list, dir, player->cnum, together);
if (stopping != 2) {
*pt++ = dirch[dir];
*pt = '\0';
} }
} }
if (strlen(pathtaken) > 0) { if (strlen(pathtaken) > 0) {