From bb467e9764ff8f6c26fb540edd5db9af41f889c7 Mon Sep 17 00:00:00 2001 From: skotlex Date: Thu, 15 Jun 2006 01:40:59 +0000 Subject: - Fixed map_nick2sd so that searching for "Adam" will not match a char named "Adam Smith". Thanks to Adam for reporting it out. git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@7172 54d463be-8e91-2dee-dedb-b68131a5f0ec --- src/map/map.c | 18 +++--------------- 1 file changed, 3 insertions(+), 15 deletions(-) (limited to 'src/map') diff --git a/src/map/map.c b/src/map/map.c index a8672ee49..b639e8f85 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -1744,33 +1744,21 @@ struct map_session_data * map_charid2sd(int id) { *------------------------------------------ */ struct map_session_data * map_nick2sd(char *nick) { - int i, quantity=0, nicklen, users; + int i, quantity=0, users; struct map_session_data *sd = NULL; struct map_session_data *pl_sd = NULL, **pl_allsd; if (nick == NULL) return NULL; - nicklen = strlen(nick); - pl_allsd = map_getallusers(&users); for (i = 0; i < users; i++) { pl_sd = pl_allsd[i]; // Without case sensitive check (increase the number of similar character names found) - if (strnicmp(pl_sd->status.name, nick, nicklen) == 0) { - // Strict comparison (if found, we finish the function immediatly with correct value) - if (strcmp(pl_sd->status.name, nick) == 0) - return pl_sd; - quantity++; - sd = pl_sd; - } + if (strcasecmp(pl_sd->status.name, nick) == 0) + return pl_sd; } - // Here, the exact character name is not found - // We return the found index of a similar account ONLY if there is 1 similar character - if (quantity == 1) - return sd; - // Exact character name is not found and 0 or more than 1 similar characters have been found ==> we say not found return NULL; } -- cgit v1.2.3-70-g09d2