Update copyright notice

[empserver] / src / lib / commands / scut.c

diff --git a/src/lib/commands/scut.c b/src/lib/commands/scut.c
index 46a582c533b9459077e2ab12c0547aaa420e3596..0555fc0afde9cc449301fb8f98951604c50ed160 100644 (file)
--- a/src/lib/commands/scut.c
+++ b/src/lib/commands/scut.c
@@ -1,6 +1,6 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2011, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *  Copyright (C) 1986-2017, Dave Pare, Jeff Bailey, Thomas Ruschak,
  *                Ken Stevens, Steve McClure, Markus Armbruster
  *
  *  Empire is free software: you can redistribute it and/or modify
@@ -27,7 +27,7 @@
  *  scut.c: Scuttle ships, planes or land units
  *
  *  Known contributors to this file:
- *     Markus Armbruster, 2004-2011
+ *     Markus Armbruster, 2004-2014
  */
 
 #include <config.h>
@@ -38,12 +38,14 @@
 #include "optlist.h"
 #include "unit.h"
 
+static int scuttle_tradeship(struct shpstr *);
+
 int
 scut(void)
 {
     struct nstr_item ni;
     union empobj_storage item;
-    int type;
+    int type, n;
     struct mchrstr *mp;
     char *p;
     char prompt[128];
@@ -66,53 +68,21 @@ scut(void)
        pr("Ships, land units, or planes only! (s, l, p)\n");
        return RET_SYN;
     }
-    sprintf(prompt, "%s(s)? ", ef_nameof(type));
-    if (!(p = getstarg(player->argp[2], prompt, buf)))
-       return RET_SYN;
-    if (!snxtitem(&ni, type, p, NULL))
-       return RET_SYN;
-    if (p && (isalpha(*p) || (*p == '*') || (*p == '~') || issector(p)
-             || islist(p))) {
-       char y_or_n[80], bbuf[80];
 
-       if (type == EF_SHIP) {
-           if (*p == '*')
-               sprintf(bbuf, "all ships");
-           else if (*p == '~')
-               sprintf(bbuf, "all unassigned ships");
-           else if (issector(p))
-               sprintf(bbuf, "all ships in %s", p);
-           else if (isalpha(*p))
-               sprintf(bbuf, "fleet %c", *p);
-           else
-               sprintf(bbuf, "ships %s", p);
-       } else if (type == EF_LAND) {
-           if (*p == '*')
-               sprintf(bbuf, "all land units");
-           else if (*p == '~')
-               sprintf(bbuf, "all unassigned land units");
-           else if (issector(p))
-               sprintf(bbuf, "all units in %s", p);
-           else if (isalpha(*p))
-               sprintf(bbuf, "army %c", *p);
-           else
-               sprintf(bbuf, "units %s", p);
-       } else {
-           if (*p == '*')
-               sprintf(bbuf, "all planes");
-           else if (*p == '~')
-               sprintf(bbuf, "all unassigned planes");
-           else if (issector(p))
-               sprintf(bbuf, "all planes in %s", p);
-           else if (isalpha(*p))
-               sprintf(bbuf, "wing %c", *p);
-           else
-               sprintf(bbuf, "planes %s", p);
-       }
-       sprintf(y_or_n, "Really scuttle %s? ", bbuf);
-       if (!confirm(y_or_n))
-           return RET_FAIL;
+    if (!snxtitem(&ni, type, player->argp[2], NULL))
+       return RET_SYN;
+    n = 0;
+    while (nxtitem(&ni, &item)) {
+       if (!player->owner)
+           continue;
+       n++;
     }
+    snprintf(prompt, sizeof(prompt), "Really scuttle %d %s%s [n]? ",
+                           n, ef_nameof(type), splur(n));
+    if (!confirm(prompt))
+       return RET_FAIL;
+
+    snxtitem_rewind(&ni);
     while (nxtitem(&ni, &item)) {
        if (!player->owner)
            continue;
@@ -126,7 +96,7 @@ scut(void)
        if (type == EF_SHIP) {
            mp = &mchr[(int)item.ship.shp_type];
            if (mp->m_flags & M_TRADE) {
-               if (!scuttle_tradeship(&item.ship, 1))
+               if (!scuttle_tradeship(&item.ship))
                    continue;
            }
        } else if (type == EF_LAND) {
@@ -149,8 +119,8 @@ scut(void)
     return RET_OK;
 }
 
-int
-scuttle_tradeship(struct shpstr *sp, int interactive)
+static int
+scuttle_tradeship(struct shpstr *sp)
 {
     float cash = 0;
     float ally_cash = 0;
@@ -159,7 +129,6 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     struct mchrstr *mp;
     struct natstr *np;
     char buf[512];
-    struct natstr *natp;
 
     mp = &mchr[(int)sp->shp_type];
     getsect(sp->shp_x, sp->shp_y, &sect);
@@ -168,8 +137,8 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
        dist = mapdist(sp->shp_x, sp->shp_y,
                       sp->shp_orig_x, sp->shp_orig_y);
        /* Don't disclose distance to to pirates */
-       if (sp->shp_own == sp->shp_orig_own)
-           mpr(sp->shp_own, "%s has gone %d sects\n", prship(sp), dist);
+       if (player->cnum == sp->shp_orig_own)
+           pr("%s has gone %d sects\n", prship(sp), dist);
        if (dist < trade_1_dist)
            cash = 0;
        else if (dist < trade_2_dist)
@@ -188,23 +157,13 @@ scuttle_tradeship(struct shpstr *sp, int interactive)
     }
 
     if (!cash && (dist < 0 || sp->shp_own == sp->shp_orig_own)) {
-       if (interactive) {
-           pr("You won't get any money if you scuttle in %s!",
-              xyas(sp->shp_x, sp->shp_y, player->cnum));
-           sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
-           return confirm(buf);
-       } else
-           return 0;
+       pr("You won't get any money if you scuttle in %s!",
+          xyas(sp->shp_x, sp->shp_y, player->cnum));
+       sprintf(buf, "Are you sure you want to scuttle %s? ", prship(sp));
+       return confirm(buf);
     }
 
-    if (interactive) {
-       player->dolcost -= cash;
-    } else {
-       natp = getnatp(sp->shp_own);
-       natp->nat_money += cash;
-       putnat(natp);
-       wu(0, sp->shp_own, "You just made $%d.\n", (int)cash);
-    }
+    player->dolcost -= cash;
 
     if (ally_cash) {
        np = getnatp(sect.sct_own);