Update copyright notice

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

diff --git a/src/lib/commands/scra.c b/src/lib/commands/scra.c
index c7beacfaba121d4e1fe07a260b8c07a01753da75..9057ad70910b69b9a697eedf52fcd6225e7370e2 100644 (file)
--- a/src/lib/commands/scra.c
+++ b/src/lib/commands/scra.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2012, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ *                Ken Stevens, Steve McClure, Markus Armbruster
  *
- *  This program is free software; you can redistribute it and/or modify
+ *  Empire is free software: you can redistribute it and/or modify
  *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
+ *  the Free Software Foundation, either version 3 of the License, or
  *  (at your option) any later version.
  *
  *  This program is distributed in the hope that it will be useful,
@@ -14,8 +14,7 @@
  *  GNU General Public License for more details.
  *
  *  You should have received a copy of the GNU General Public License
- *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
  *
  *  ---
  *
@@ -26,16 +25,16 @@
  *  ---
  *
  *  scra.c: Scrap ships, planes or land units
- * 
+ *
  *  Known contributors to this file:
  *     Steve McClure, 2000
+ *     Markus Armbruster, 2004-2012
  */
 
 #include <config.h>
 
 #include <ctype.h>
 #include "commands.h"
-#include "empobj.h"
 #include "optlist.h"
 #include "unit.h"
 
@@ -44,7 +43,7 @@ scra(void)
 {
     struct nstr_item ni;
     union empobj_storage item;
-    int type;
+    int type, n;
     struct sctstr sect;
     struct mchrstr *mp;
     struct plchrstr *pp;
@@ -71,55 +70,21 @@ scra(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)) == 0)
-       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];
 
-       memset(y_or_n, 0, sizeof(y_or_n));
-       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 scrap %s [n]? ", 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 scrap %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;
@@ -134,7 +99,7 @@ scra(void)
        getsect(item.gen.x, item.gen.y, &sect);
        if (type == EF_SHIP) {
            if (!player->owner
-               && getrel(getnatp(sect.sct_own), player->cnum) < FRIENDLY) {
+               && relations_with(sect.sct_own, player->cnum) < FRIENDLY) {
                pr("%s is not in a friendly harbor!\n",
                   prship(&item.ship));
                continue;
@@ -144,8 +109,7 @@ scra(void)
                   prship(&item.ship));
                continue;
            }
-           if (opt_TRADESHIPS
-               && (mchr[item.ship.shp_type].m_flags & M_TRADE)) {
+           if (mchr[item.ship.shp_type].m_flags & M_TRADE) {
                pr("WARNING: You only collect money from trade ships if you \"scuttle\" them!\n");
                sprintf(prompt,
                        "Are you really sure that you want to scrap %s (n)? ",
@@ -157,9 +121,9 @@ scra(void)
            }
        } else {
            if (!player->owner
-               && getrel(getnatp(sect.sct_own), player->cnum) != ALLIED) {
+               && relations_with(sect.sct_own, player->cnum) != ALLIED) {
                pr("%s is not in an allied sector!\n",
-                  obj_nameof(&item.gen));
+                  unit_nameof(&item.gen));
                continue;
            }
            if (type == EF_PLANE
@@ -171,7 +135,7 @@ scra(void)
        }
 
        pr("%s scrapped in %s\n",
-          obj_nameof(&item.gen),
+          unit_nameof(&item.gen),
           xyas(item.gen.x, item.gen.y, player->cnum));
        unit_drop_cargo(&item.gen, sect.sct_own);
        if (type == EF_SHIP) {