diff options
| author | xazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-04 21:53:09 +0000 |
|---|---|---|
| committer | xazax-hun <xazax-hun@54d463be-8e91-2dee-dedb-b68131a5f0ec> | 2012-05-04 21:53:09 +0000 |
| commit | a7ea318bbf7feb5f7d1ffa9292b23a16c8a3be87 (patch) | |
| tree | 6b0366cbbd79c5f0c243a53ca6d902fa99bc01f7 /src | |
| parent | a3f8ecfcc0ed3f6bf487fcba6dd832e4c697c9c7 (diff) | |
| download | hercules-a7ea318bbf7feb5f7d1ffa9292b23a16c8a3be87.tar.gz hercules-a7ea318bbf7feb5f7d1ffa9292b23a16c8a3be87.tar.bz2 hercules-a7ea318bbf7feb5f7d1ffa9292b23a16c8a3be87.tar.xz hercules-a7ea318bbf7feb5f7d1ffa9292b23a16c8a3be87.zip | |
* Partially reverted r16076. The 2 loops wasn't unnecessary, they use different match strategy.
git-svn-id: https://rathena.svn.sourceforge.net/svnroot/rathena/trunk@16078 54d463be-8e91-2dee-dedb-b68131a5f0ec
Diffstat (limited to 'src')
| -rw-r--r-- | src/map/atcommand.c | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/src/map/atcommand.c b/src/map/atcommand.c index 24a453cce..741513ca2 100644 --- a/src/map/atcommand.c +++ b/src/map/atcommand.c @@ -8780,15 +8780,36 @@ 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 ( stristr(command_info->command, name) == command_info->command && pc_can_use_command(sd, command_info->command, type) ) { + if ( strstr(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 ( stristr(alias_info->alias, name) == alias_info->alias && pc_can_use_command(sd, alias_info->command->command, type) ) { + 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) ) + { suggestions[count] = alias_info->alias; ++count; } |