diff --git a/include/prototypes.h b/include/prototypes.h index cf6f0847..cef69112 100644 --- a/include/prototypes.h +++ b/include/prototypes.h @@ -486,7 +486,6 @@ extern int def_support(coord, coord, natid, natid); extern int oprange(struct empobj *, int); extern int in_oparea(struct empobj *, coord, coord); extern int cando(int, int); -extern void show_mission(int, struct nstr_item *); extern int air_defense(coord, coord, natid, struct emp_qelem *, struct emp_qelem *); /* move.c */ diff --git a/src/lib/commands/miss.c b/src/lib/commands/miss.c index 40a667e9..7a98fb05 100644 --- a/src/lib/commands/miss.c +++ b/src/lib/commands/miss.c @@ -40,6 +40,8 @@ #include "optlist.h" #include "path.h" +static void show_mission(int, struct nstr_item *); + /* * mission [] */ @@ -301,3 +303,45 @@ mission(void) pr("%d %s%s\n", num, ef_nameof(type), splur(num)); return RET_OK; } + +static void +show_mission(int type, struct nstr_item *np) +{ + int first = 1; + union empobj_storage item; + struct empobj *gp; + + while (nxtitem(np, &item)) { + gp = (struct empobj *)&item; + if (!player->owner || gp->own == 0) + continue; + + if (first) { + pr("Thing x,y op-sect rad mission\n"); + first = 0; + } + pr("%-25s", obj_nameof(gp)); + prxy(" %3d,%-3d", gp->x, gp->y, player->cnum); + switch (gp->mission) { + case MI_INTERDICT: + case MI_SUPPORT: + case MI_RESERVE: + case MI_ESCORT: + case MI_AIR_DEFENSE: + case MI_DSUPPORT: + case MI_OSUPPORT: + prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum); + pr(" %4d", gp->radius); + break; + default: + CANT_REACH(); + /* fall through */ + case MI_NONE: + pr(" "); + } + if (gp->mission) + pr(" is on %s mission\n", mission_name(gp->mission)); + else + pr(" has no mission.\n"); + } +} diff --git a/src/lib/subs/mission.c b/src/lib/subs/mission.c index c4243b4f..e39f4a77 100644 --- a/src/lib/subs/mission.c +++ b/src/lib/subs/mission.c @@ -741,48 +741,6 @@ mission_name(short mission) return "a mysterious"; } -void -show_mission(int type, struct nstr_item *np) -{ - int first = 1; - union empobj_storage item; - struct empobj *gp; - - while (nxtitem(np, &item)) { - gp = (struct empobj *)&item; - if (!player->owner || gp->own == 0) - continue; - - if (first) { - pr("Thing x,y op-sect rad mission\n"); - first = 0; - } - pr("%-25s", obj_nameof(gp)); - prxy(" %3d,%-3d", gp->x, gp->y, player->cnum); - switch (gp->mission) { - case MI_INTERDICT: - case MI_SUPPORT: - case MI_RESERVE: - case MI_ESCORT: - case MI_AIR_DEFENSE: - case MI_DSUPPORT: - case MI_OSUPPORT: - prxy(" %3d,%-3d", gp->opx, gp->opy, player->cnum); - pr(" %4d", gp->radius); - break; - default: - CANT_REACH(); - /* fall through */ - case MI_NONE: - pr(" "); - } - if (gp->mission) - pr(" is on %s mission\n", mission_name(gp->mission)); - else - pr(" has no mission.\n"); - } -} - int oprange(struct empobj *gp, int mission) {