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

and navi() in the future.  No functional changes.

diff --git a/src/lib/commands/marc.c b/src/lib/commands/marc.c
index 88d8f1cfa98d58bd1d7064996e6561ced93dbf61..5e1963f79dd8b1689caabe5ced31a3c46ac67629 100644 (file)
--- a/src/lib/commands/marc.c
+++ b/src/lib/commands/marc.c
@@ -146,7 +146,7 @@ march(void)
        case 'M':
            do_map(bmap_flag, EF_LAND, player->argp[1], player->argp[2]);
            skip = 1;
-           break;
+           continue;
        case 'f':
            if (ac <= 1)
                switch_leader(&land_list, -1);
@@ -157,23 +157,23 @@ march(void)
                leader_uid = leader->uid;
                pr_leader_change(leader);
            }
-           break;
+           continue;
        case 'i':
            lnd_list(&land_list);
-           break;
+           continue;
        case 'm':
            lnd_sweep(&land_list, 1, 1, player->cnum);
            stopping |= lnd_check_mines(&land_list);
-           break;
+           continue;
        case 'r':
            radar(EF_LAND);
            skip = 1;
            player->btused++;
-           break;
+           continue;
        case 'l':
            llook();
            player->btused++;
-           break;
+           continue;
        case 'd':
            if (ac == 2) {
                player->argp[2] = player->argp[1];
@@ -183,14 +183,13 @@ march(void)
            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;
+           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("`d' to drop mines, and `m' to minesweep\n");
+       stopping = 1;
     }
     return RET_OK;
 }

diff --git a/src/lib/commands/navi.c b/src/lib/commands/navi.c
index 32171030f15a5129dbf259b6341470ca06deb84d..6b80c0e277b02ec9069b6856217eab9950cf83ac 100644 (file)
--- a/src/lib/commands/navi.c
+++ b/src/lib/commands/navi.c
@@ -171,7 +171,7 @@ navi(void)
        case 'M':
            do_map(bmap_flag, EF_SHIP, player->argp[1], player->argp[2]);
            skip = 1;
-           break;
+           continue;
        case 'f':
            if (ac <= 1) 
                switch_leader(&ship_list, -1);
@@ -182,27 +182,27 @@ navi(void)
                leader_uid = leader->uid;
                pr_leader_change(leader);
            }
-           break;
+           continue;
        case 'i':
            shp_list(&ship_list);
-           break;
+           continue;
        case 'm':
            stopping |= shp_sweep(&ship_list, 1, 1, player->cnum);
-           break;
+           continue;
        case 'r':
            radar(EF_SHIP);
            skip = 1;
            player->btused++;
-           break;
+           continue;
        case 'l':
            look();
            player->btused++;
-           break;
+           continue;
        case 's':
            sona();
            player->btused++;
            skip = 1;
-           break;
+           continue;
        case 'd':
            if (ac == 2) {
                player->argp[2] = player->argp[1];
@@ -212,14 +212,13 @@ navi(void)
            mine();
            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;
        }
+       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;
     }
     if (strlen(pathtaken) > 0) {
        pathtaken[strlen(pathtaken) - 1] = '\0';