--- deliantra/server/common/arch.C 2006/09/14 22:35:53 1.22 +++ deliantra/server/common/arch.C 2006/09/14 23:13:48 1.23 @@ -271,7 +271,6 @@ retval = 14; else if (!strncasecmp (cp, query_base_name (op, 1), strlen (cp))) retval = 14; - /* Do substring checks, so things like 'Str+1' will match. * retval of these should perhaps be lower - they are lower * then the specific strcasecmp aboves, but still higher than @@ -283,16 +282,11 @@ retval = 12; else if (strstr (query_short_name (op), cp)) retval = 12; - /* Check against plural/non plural based on count. */ else if (count > 1 && !strcasecmp (cp, op->name_pl)) - { - retval = 6; - } + retval = 6; else if (count == 1 && !strcasecmp (op->name, cp)) - { - retval = 6; - } + retval = 6; /* base name matched - not bad */ else if (strcasecmp (cp, op->name) == 0 && !count) retval = 4; @@ -304,9 +298,11 @@ { if (pl->type == PLAYER) pl->contr->count = count; + return retval; } } + return 0; }