Mirroristas/rathena
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Partially reverted r16076. The 2 loops wasn't unnecessary, they use different match strategy.

Browse Source 
git-svn-id: https://svn.code.sf.net/p/rathena/svn/trunk@16078 54d463be-8e91-2dee-dedb-b68131a5f0ec
This commit is contained in:
xazax-hun 2012-05-04 21:53:09 +00:00
parent ee483eea0e
commit ff9de8d82c
1 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
src/map/atcommand.c
View File

@ -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;
}