License upgrade to GPL version 3 or later

[empserver] / src / lib / subs / sarg.c

diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index a0bf2b1e35173383ad1aaeb666e36cc8e76c1d4c..4baa3d654dc5f741c3fadfdcca92767f5330beca 100644 (file)
--- a/src/lib/subs/sarg.c
+++ b/src/lib/subs/sarg.c
@@ -1,11 +1,11 @@
 /*
  *  Empire - A multi-player, client/server Internet based war game.
- *  Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2011, 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,33 +14,34 @@
  *  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/>.
  *
  *  ---
  *
- *  See the "LEGAL", "LICENSE", "CREDITS" and "README" files for all the
- *  related information and legal notices. It is expected that any future
- *  projects/authors will amend these files as needed.
+ *  See files README, COPYING and CREDITS in the root of the source
+ *  tree for related information and legal notices.  It is expected
+ *  that future projects/authors will amend these files as needed.
  *
  *  ---
  *
  *  sarg.c: Parse selection arguments
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
+ *     Markus Armbruster, 2004-2009
  */
 
+#include <config.h>
+
 #include <ctype.h>
-#include <string.h>
+#include "file.h"
 #include "misc.h"
-#include "player.h"
-#include "xy.h"
-#include "nsc.h"
 #include "nat.h"
-#include "file.h"
-#include "prototypes.h"
+#include "nsc.h"
 #include "optlist.h"
+#include "player.h"
+#include "prototypes.h"
+#include "xy.h"
 
 /*
  * returns one of
@@ -48,11 +49,12 @@
  *  #1, lx:ly,hx:hy --> NS_AREA
  *  @x,y:dist  --> NS_DIST
  *  %d or %d/%d/%d --> NS_LIST
- *  * --> NS_EVERYTHING
+ *  ~ or letter --> NS_GROUP
+ *  * --> NS_ALL
  *
  * or 0 for none of the above.
  */
-ns_seltype
+enum ns_seltype
 sarg_type(char *str)
 {
     int c;
@@ -61,12 +63,12 @@ sarg_type(char *str)
     if (c == '@')
        return NS_DIST;
     if (c == '*')
-       return NS_EVERYTHING;
-    if (c == '#' || strchr(str, ',') != 0)
+       return NS_ALL;
+    if (c == '#' || strchr(str, ','))
        return NS_AREA;
     if (isdigit(c))
        return NS_LIST;
-    if (c == '~' || isupper(c) || islower(c))
+    if (c == '~' || isalpha(c))
        return NS_GROUP;
     return NS_UNDEF;
 }
@@ -82,7 +84,7 @@ sarg_xy(char *str, coord *xp, coord *yp)
        return 0;
     y = strtoy(str, &str);
     if (y < 0 || (*str != 0 && !isspace(*str)))
-      return 0;
+       return 0;
     if ((x ^ y) & 1)
        return 0;
     np = getnatp(player->cnum);
@@ -91,12 +93,16 @@ sarg_xy(char *str, coord *xp, coord *yp)
     return 1;
 }
 
-/* returns absolute coords */
-static int
-sarg_getrange(char *str, struct range *rp)
+/*
+ * translate #1 or lx:ly,hx:hy into a result range struct
+ * returns absolute coords
+ */
+int
+sarg_area(char *str, struct range *rp)
 {
     long rlm;
     struct natstr *np;
+    struct realmstr realm;
     char *end;
 
     if (*str == '#') {
@@ -109,13 +115,13 @@ sarg_getrange(char *str, struct range *rp)
            if (end == str || (*end != 0 && !isspace(*end))
                || rlm < 0 || MAXNOR <= rlm)
                return 0;
-       } else 
+       } else
            rlm = 0;
-       np = getnatp(player->cnum);
-       rp->lx = np->nat_b[rlm].b_xl;
-       rp->hx = np->nat_b[rlm].b_xh;
-       rp->ly = np->nat_b[rlm].b_yl;
-       rp->hy = np->nat_b[rlm].b_yh;
+       getrealm(rlm, player->cnum, &realm);
+       rp->lx = realm.r_xl;
+       rp->hx = realm.r_xh;
+       rp->ly = realm.r_yl;
+       rp->hy = realm.r_yh;
     } else {
        /*
         * full map specification
@@ -152,25 +158,6 @@ sarg_getrange(char *str, struct range *rp)
     return 1;
 }
 
-/*
- * translate #1 or lx:ly,hx:hy into
- * a result range struct
- */
-int
-sarg_area(char *str, struct range *rp)
-{
-    if (!sarg_getrange(str, rp))
-       return 0;
-    rp->hx += 1;
-    if (rp->hx >= WORLD_X)
-       rp->hx = 0;
-    rp->hy += 1;
-    if (rp->hy >= WORLD_Y)
-       rp->hy = 0;
-    xysize_range(rp);
-    return 1;
-}
-
 /*
  * translate @x,y:int into
  * result params