/*
* Empire - A multi-player, client/server Internet based war game.
- * Copyright (C) 1986-2004, Dave Pare, Jeff Bailey, Thomas Ruschak,
+ * Copyright (C) 1986-2007, 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.
*
* ---
*
* Dave Pare, 1989
*/
+#include <config.h>
+
+#include <ctype.h>
#include "misc.h"
#include "player.h"
#include "xy.h"
* can select on NS_ALL, NS_AREA, NS_DIST, and NS_LIST.
* iterate thru the "condarg" string looking
* for arguments to compile into the nstr.
+ * Using this function for anything but command arguments is usually
+ * incorrect, because it respects conditionals. Use the snxtitem_FOO()
+ * instead.
*/
int
-snxtitem(struct nstr_item *np, int type, s_char *str)
+snxtitem(struct nstr_item *np, int type, char *str)
{
struct range range;
int list[NS_LSIZE];
coord cx, cy;
int dist;
int flags;
- s_char natnumber[16];
- s_char prompt[128];
- s_char buf[1024];
+ char natnumber[16];
+ char prompt[128];
+ char buf[1024];
np->type = EF_BAD;
np->sel = NS_UNDEF;
return 0;
}
if (*str == 0) {
- /* str present, but only <cr>: nil string passed by player */
+ /* empty string passed by player */
return 0;
}
if (type == EF_NATION && isalpha(*str)) {
- sprintf(natnumber, "%d", natarg(str, ""));
+ sprintf(natnumber, "%d", natarg(str, NULL));
str = natnumber;
}
flags = ef_flags(type);
np->read = ef_read;
np->flags = ef_flags(type);
xysize_range(&np->range);
- ef_zapcache(type);
}
void
/* It did the wrong thing for small, hitech worlds. */
xysize_range(&np->range);
#endif
- ef_zapcache(type);
}
void
np->dist = 0;
np->read = ef_read;
np->flags = ef_flags(type);
- ef_zapcache(type);
}
void
np->read = ef_read;
np->flags = ef_flags(type);
xysize_range(&np->range);
- ef_zapcache(type);
}
void
-snxtitem_group(struct nstr_item *np, int type, s_char group)
+snxtitem_group(struct nstr_item *np, int type, char group)
{
if (group == '~')
- group = ' ';
+ group = 0;
memset(np, 0, sizeof(*np));
np->cur = -1;
np->sel = NS_GROUP;
np->read = ef_read;
np->flags = ef_flags(type);
xysize_range(&np->range);
- ef_zapcache(type);
}
void
{
np->cur = -1;
np->index = -1;
- ef_zapcache(np->type);
}
int
for (i = 0; i < len; i++)
np->list[i] = list[i];
np->size = len;
- ef_zapcache(type);
return 1;
}