summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/map/map.c18
1 files changed, 8 insertions, 10 deletions
diff --git a/src/map/map.c b/src/map/map.c
index 33a5343c4..07d672503 100644
--- a/src/map/map.c
+++ b/src/map/map.c
@@ -1693,21 +1693,19 @@ struct map_session_data * map_nick2sd(const char *nick)
{
if( battle_config.partial_name_scan )
{// partial name search
+ int qty = 0;
+
if( strnicmp(sd->status.name, nick, nicklen) == 0 )
{
+ found_sd = sd;
+
if( strcmp(sd->status.name, nick) == 0 )
- {// perfect match found
- found_sd = sd;
- break;
- }
- if( found_sd != NULL )
- {// collision
- found_sd = NULL;
- break;
- }
+ break; // Perfect Match
- found_sd = sd;
+ qty++;
}
+
+ if( qty != 1 ) found_sd = NULL; // Collisions
}
else
{// exact search only