From ee483eea0e50ff1f21e67c01b9bf82a2fc5ac0a8 Mon Sep 17 00:00:00 2001 From: epoque11 Date: Fri, 4 May 2012 09:43:31 +0000 Subject: [PATCH] - Fixed feature.conf improper formatting and removed two unnecessary iterations (follow-up to r16071) git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16076 54d463be-8e91-2dee-dedb-b68131a5f0ec --- conf/battle/feature.conf | 2 +- src/map/atcommand.c | 25 ++----------------------- 2 files changed, 3 insertions(+), 24 deletions(-) diff --git a/conf/battle/feature.conf b/conf/battle/feature.conf index efb58722ac..fa05efd8b4 100644 --- a/conf/battle/feature.conf +++ b/conf/battle/feature.conf @@ -17,4 +17,4 @@ feature.search_stores: on // Atcommand suggestions (Note 1) // If one type incomplete atcommand, it will suggest the complete ones. -feature.atcommand_suggestions = off \ No newline at end of file +feature.atcommand_suggestions: off \ No newline at end of file diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 741513ca2a..24a453cce0 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8780,36 +8780,15 @@ static void atcommand_get_suggestions(struct map_session_data* sd, const char *n else type = COMMAND_CHARCOMMAND; - - // First match the beginnings of the commands for (command_info = dbi_first(atcommand_iter); dbi_exists(atcommand_iter) && count < MAX_SUGGESTIONS; command_info = dbi_next(atcommand_iter)) { - if ( strstr(command_info->command, name) == command_info->command && pc_can_use_command(sd, command_info->command, type) ) - { + if ( stristr(command_info->command, name) == command_info->command && pc_can_use_command(sd, command_info->command, type) ) { suggestions[count] = command_info->command; ++count; } } for (alias_info = dbi_first(alias_iter); dbi_exists(alias_iter) && count < MAX_SUGGESTIONS; alias_info = dbi_next(alias_iter)) { - if ( strstr(alias_info->alias, name) == alias_info->alias && pc_can_use_command(sd, alias_info->command->command, type) ) - { - suggestions[count] = alias_info->alias; - ++count; - } - } - - // Fill up the space left, with full matches - for (command_info = dbi_first(atcommand_iter); dbi_exists(atcommand_iter) && count < MAX_SUGGESTIONS; command_info = dbi_next(atcommand_iter)) { - if ( strstr(command_info->command, name) != NULL && pc_can_use_command(sd, command_info->command, type) ) - { - suggestions[count] = command_info->command; - ++count; - } - } - - for (alias_info = dbi_first(alias_iter); dbi_exists(alias_iter) && count < MAX_SUGGESTIONS; alias_info = dbi_next(alias_iter)) { - if ( strstr(alias_info->alias, name) != NULL && pc_can_use_command(sd, alias_info->command->command, type) ) - { + if ( stristr(alias_info->alias, name) == alias_info->alias && pc_can_use_command(sd, alias_info->command->command, type) ) { suggestions[count] = alias_info->alias; ++count; }