/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2000, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2008, Dave Pare, Jeff Bailey, Thomas Ruschak,
* Ken Stevens, Steve McClure
*
* This program is free software; you can redistribute it and/or modify
*
* ---
*
- * 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.
*
* ---
*
*
* Known contributors to this file:
* Dave Pare, 1989
+ * Markus Armbruster, 2004
*/
+#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 "sect.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
* #1, lx:ly,hx:hy --> NS_AREA
* @x,y:dist --> NS_DIST
* %d or %d/%d/%d --> NS_LIST
+ * ~ or letter --> NS_GROUP
* * --> NS_ALL
*
* or 0 for none of the above.
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;
}
if (x < 0 || *str++ != ',')
return 0;
y = strtoy(str, &str);
- if (y < 0 || *str != 0)
- return 0;
+ if (y < 0 || (*str != 0 && !isspace(*str)))
+ return 0;
if ((x ^ y) & 1)
return 0;
np = getnatp(player->cnum);
{
long rlm;
struct natstr *np;
+ struct realmstr realm;
char *end;
if (*str == '#') {
*/
if (*++str) {
rlm = strtol(str, &end, 10);
- if (end == str || *end != 0 || rlm < 0 || MAXNOR <= rlm)
+ if (end == str || (*end != 0 && !isspace(*end))
+ || rlm < 0 || MAXNOR <= rlm)
return 0;
} 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
if (rp->hy < 0)
return 0;
}
- if (*str != 0)
+ if (*str != 0 && !isspace(*str))
return 0;
np = getnatp(player->cnum);
rp->lx = xabs(np, rp->lx);
if (y < 0 || *str++ != ':')
return 0;
d = strtol(str, &end, 10);
- if (end == str || d < 0 || *end != 0)
+ if (end == str || (*end != 0 && !isspace(*end)) || d < 0)
return 0;
*dist = d;
np = getnatp(player->cnum);
str = end;
} while (*str++ == '/');
- if (str[-1] != 0) {
+ if (str[-1] != 0 && !isspace(str[-1])) {
pr("Expecting '/', got '%c'\n", str[-1]);
return 0;
}