Update copyright notice

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

diff --git a/src/lib/subs/sarg.c b/src/lib/subs/sarg.c
index 37f8753c047a9d77e27e7a237ba4889968ea5b99..dfd4e3b5604458967732b4492ccdcdecb380a8f6 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-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
- *                           Ken Stevens, Steve McClure
+ *  Copyright (C) 1986-2013, 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,10 +25,10 @@
  *  ---
  *
  *  sarg.c: Parse selection arguments
- * 
+ *
  *  Known contributors to this file:
  *     Dave Pare, 1989
- *     Markus Armbruster, 2004-2008
+ *     Markus Armbruster, 2004-2010
  */
 
 #include <config.h>
@@ -39,7 +38,6 @@
 #include "misc.h"
 #include "nat.h"
 #include "nsc.h"
-#include "optlist.h"
 #include "player.h"
 #include "prototypes.h"
 #include "xy.h"
@@ -65,7 +63,7 @@ sarg_type(char *str)
        return NS_DIST;
     if (c == '*')
        return NS_ALL;
-    if (c == '#' || strchr(str, ',') != 0)
+    if (c == '#' || strchr(str, ','))
        return NS_AREA;
     if (isdigit(c))
        return NS_LIST;
@@ -85,7 +83,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);
@@ -94,9 +92,12 @@ 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;
@@ -113,7 +114,7 @@ sarg_getrange(char *str, struct range *rp)
            if (end == str || (*end != 0 && !isspace(*end))
                || rlm < 0 || MAXNOR <= rlm)
                return 0;
-       } else 
+       } else
            rlm = 0;
        getrealm(rlm, player->cnum, &realm);
        rp->lx = realm.r_xl;
@@ -156,25 +157,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