Andreas/tbamud
1
0
Fork 0
mirror of https://github.com/tbamud/tbamud.git synced 2026-01-03 07:58:49 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #49 from tbamud/isname-bugfix

Browse source 
Revert "Multiple keyword support (#46)"
This commit is contained in:
Thomas Arp 2018-04-12 22:52:19 +02:00 • committed by GitHub
commit 68b9b35404
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

31
src/handler.c
View file

@ -81,8 +81,7 @@ int is_name(const char *str, const char *namelist)
/* allow abbreviations */
#define WHITESPACE " \t"
#define KEYWORDJOIN "_"
int isname_tok(const char *str, const char *namelist)
int isname(const char *str, const char *namelist)
{
char *newlist;
char *curtok;
@ -106,34 +105,6 @@ int isname_tok(const char *str, const char *namelist)
return 0;
}
int isname (const char *str, const char *namelist)
{
char *strlist;
char *substr;
if (!str || !*str || !namelist || !*namelist)
return 0;
if (!strcmp (str, namelist)) /* the easy way */
return 1;
strlist = strdup(str);
for (substr = strtok(strlist, KEYWORDJOIN); substr; substr = strtok (NULL, KEYWORDJOIN))
{
if (!substr) continue;
if (!isname_tok(substr, namelist))
{
free(strlist);
return 0;
}
}
/* If we didn't fail, assume we succeded because every token was matched */
free(strlist);
return 1;
}
static void aff_apply_modify(struct char_data *ch, byte loc, sbyte mod, char *msg)
{
switch (loc) {