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

Added support for string array sorting

Browse Source
This commit is contained in:
Jittapan Pluemsumran 2018-01-11 00:06:51 +07:00
parent 12d5d99a4d
commit 9231262787
2 changed files with 41 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
doc/script_commands.txt
View File

@ -2260,6 +2260,15 @@ Example:
debugmes(.@msg$);
Output: 2 5 8 9 12 13 14 17 18 19 20 21 22 23 24 25 30 31 34 35 36 37 38 39 41 42 44 45 47 48
setarray .@text$, "Lemongrass", "Atemo", "Jey", "Lighta", "Nova", "MasterOfMuppets", "Aleos", "Cydh", "Playtester", "Stolao", "Nanakiwurtz", "Akkarin", "Secret";
sortarray(.@text$);
for(.@i = 0; .@i < getarraysize(.@text$); .@i++) {
.@msg$ = .@msg$ + .@text$[.@i] + " ";
}
debugmes(.@msg$);
Output: Akkarin Aleos Atemo Cydh Jey Lemongrass Lighta MasterOfMuppets Nanakiwurtz Nova Playtester Secret Stolao
---------------------------------------

40
src/map/script.cpp
View File

@ -23764,31 +23764,55 @@ void swap_array_element(script_state *st, map_session_data *sd, script_data* arr
int partition_array(script_state *st, map_session_data *sd, script_data *array_, int start, int end) {
auto ref = reference_getref(array_);
auto id = reference_getid(array_);
auto name = reference_getname(array_);
int i = start, j = end;
int pivotidx = rnd() % (end - start);
int pivot = reinterpret_cast<int>(__64BPRTSIZE(get_val2(st, reference_uid(id, start + pivotidx), ref)));
script_removetop(st, -1, 0);
void* pivot = get_val2(st, reference_uid(id, start + pivotidx), ref);
bool is_string = is_string_variable(name);
while (i < j) {
while (true) {
int tmp = reinterpret_cast<int>(__64BPRTSIZE(get_val2(st, reference_uid(id, i), ref)));
void* tmp = get_val2(st, reference_uid(id, i), ref);
if (is_string) {
if (strcmp((char*)(tmp), (char*)(pivot)) >= 0)
break;
} else {
if ((int)__64BPRTSIZE(tmp) >= (int)__64BPRTSIZE(pivot))
break;
}
// Pop tmp
script_removetop(st, -1, 0);
if (tmp >= pivot)
break;
i++;
}
// Pop tmp
script_removetop(st, -1, 0);
while (true) {
int tmp = reinterpret_cast<int>(__64BPRTSIZE(get_val2(st, reference_uid(id, j), ref)));
void* tmp = get_val2(st, reference_uid(id, j), ref);
if(is_string) {
if (strcmp((char*)(tmp), (char*)(pivot)) <= 0)
break;
}
else {
if ((int)__64BPRTSIZE(tmp) <= (int)__64BPRTSIZE(pivot))
break;
}
// Pop tmp
script_removetop(st, -1, 0);
if (tmp <= pivot)
break;
j--;
}
// Pop tmp
script_removetop(st, -1, 0);
swap_array_element(st, sd, array_, i, j);
}
// Pop pivot
script_removetop(st, -1, 0);
return j;
}