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

(marc, navi): Switch the parsing logic to facilitate the merging marc()

Browse source 
and navi() in the future.  No functional changes.
This commit is contained in:
Ron Koenderink 2007-01-06 12:35:44 +00:00
parent a5f8742b3f
commit 6225e47f9f
2 changed files with 25 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

17
src/lib/commands/marc.c
View file

@ -146,7 +146,7 @@ march(void)
case 'M': case 'M':
do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]); do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]);
skip = 1; skip = 1;
break; continue;
case 'f': case 'f':
if (ac <= 1) if (ac <= 1)
switch_leader(&land_list, -1); switch_leader(&land_list, -1);
@ -157,23 +157,23 @@ march(void)
leader_uid = leader->uid; leader_uid = leader->uid;
pr_leader_change(leader); pr_leader_change(leader);
} }
break; continue;
case 'i': case 'i':
lnd_list(&land_list); lnd_list(&land_list);
break; continue;
case 'm': case 'm':
lnd_sweep(&land_list, 1, 1, player->cnum); lnd_sweep(&land_list, 1, 1, player->cnum);
stopping |= lnd_check_mines(&land_list); stopping |= lnd_check_mines(&land_list);
break; continue;
case 'r': case 'r':
radar(EF_LAND); radar(EF_LAND);
skip = 1; skip = 1;
player->btused++; player->btused++;
break; continue;
case 'l': case 'l':
llook(); llook();
player->btused++; player->btused++;
break; continue;
case 'd': case 'd':
if (ac == 2) { if (ac == 2) {
player->argp[2] = player->argp[1]; player->argp[2] = player->argp[1];
@ -183,15 +183,14 @@ march(void)
landmine(); landmine();
skip = 1; skip = 1;
player->btused++; player->btused++;
break; continue;
default: }
direrr("`%c' to stop", 0, 0); direrr("`%c' to stop", 0, 0);
pr(", `i' to list units, `f' to change leader,\n"); 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("`r' to radar, `l' to look, `M' to map, `B' to bmap,\n");
pr("`d' to drop mines, and `m' to minesweep\n"); pr("`d' to drop mines, and `m' to minesweep\n");
stopping = 1; stopping = 1;
} }
}
return RET_OK; return RET_OK;
} }

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

@ -171,7 +171,7 @@ navi(void)
case 'M': case 'M':
do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]); do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]);
skip = 1; skip = 1;
break; continue;
case 'f': case 'f':
if (ac <= 1) if (ac <= 1)
switch_leader(&ship_list, -1); switch_leader(&ship_list, -1);
@ -182,27 +182,27 @@ navi(void)
leader_uid = leader->uid; leader_uid = leader->uid;
pr_leader_change(leader); pr_leader_change(leader);
} }
break; continue;
case 'i': case 'i':
shp_list(&ship_list); shp_list(&ship_list);
break; continue;
case 'm': case 'm':
stopping |= shp_sweep(&ship_list, 1, 1, player->cnum); stopping |= shp_sweep(&ship_list, 1, 1, player->cnum);
break; continue;
case 'r': case 'r':
radar(EF_SHIP); radar(EF_SHIP);
skip = 1; skip = 1;
player->btused++; player->btused++;
break; continue;
case 'l': case 'l':
look(); look();
player->btused++; player->btused++;
break; continue;
case 's': case 's':
sona(); sona();
player->btused++; player->btused++;
skip = 1; skip = 1;
break; continue;
case 'd': case 'd':
if (ac == 2) { if (ac == 2) {
player->argp[2] = player->argp[1]; player->argp[2] = player->argp[1];
@ -212,15 +212,14 @@ navi(void)
mine(); mine();
skip = 1; skip = 1;
player->btused++; player->btused++;
break; continue;
default: }
direrr("`%c' to stop", ", `%c' to view, ", 0); direrr("`%c' to stop", ", `%c' to view, ", 0);
pr("`i' to list ships, `f' to change flagship,\n"); 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("`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"); pr("`d' to drop mines, and `m' to minesweep\n");
stopping = 1; stopping = 1;
} }
}
if (strlen(pathtaken) > 0) { if (strlen(pathtaken) > 0) {
pathtaken[strlen(pathtaken) - 1] = '\0'; pathtaken[strlen(pathtaken) - 1] = '\0';
if (strlen(pathtaken) > 0) if (strlen(pathtaken) > 0)