Flummi/amxmodx
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix an SortADTArray() issue where strings are not properly sorted

Browse Source
This commit is contained in:
Arkshine 2015-08-04 17:03:26 +02:00
parent 6d7daf787d
commit 4d3e31cf6c
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
amxmodx/sorting.cpp
View File

@ -402,14 +402,27 @@ enum SortType
Sort_String, Sort_String,
}; };
int strcellcmp(cell *s1, cell *s2)
{
for (; *s1 == *s2; s1++, s2++)
{
if (*s1 == '\0')
{
return 0;
}
}
return (*(byte *)s1 < *(byte *)s2) ? -1 : +1;
}
int sort_adtarray_strings_asc(const void *str1, const void *str2) int sort_adtarray_strings_asc(const void *str1, const void *str2)
{ {
return strcmp((char *) str1, (char *) str2); return strcellcmp((cell *)str1, (cell *)str2);
} }
int sort_adtarray_strings_desc(const void *str1, const void *str2) int sort_adtarray_strings_desc(const void *str1, const void *str2)
{ {
return strcmp((char *) str2, (char *) str1); return strcellcmp((cell *)str2, (cell *)str1);
} }
void sort_adt_random(CellArray *cArray) void sort_adt_random(CellArray *cArray)