Skip to content

Commit 7cc3923

Browse files
authored
Update smn_sorting.cpp
1 parent 38ae529 commit 7cc3923

File tree

1 file changed

+10
-10
lines changed

1 file changed

+10
-10
lines changed

core/logic/smn_sorting.cpp

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ static cell_t sm_SortStrings(IPluginContext *pContext, const cell_t *params)
342342
struct sort_info
343343
{
344344
IPluginFunction *pFunc;
345-
Handle_t hndl;
345+
cell_t data;
346346
cell_t array_addr;
347347
cell_t *array_base;
348348
cell_t *array_remap;
@@ -364,7 +364,7 @@ int sort1d_amx_custom(const void *elem1, const void *elem2)
364364
pf->PushCell(c1);
365365
pf->PushCell(c2);
366366
pf->PushCell(g_SortInfo.array_addr);
367-
pf->PushCell(g_SortInfo.hndl);
367+
pf->PushCell(g_SortInfo.data);
368368
pf->Invoke(&result);
369369

370370
return result;
@@ -386,7 +386,7 @@ static cell_t sm_SortCustom1D(IPluginContext *pContext, const cell_t *params)
386386
sort_info oldinfo = g_SortInfo;
387387

388388
DetectExceptions eh(pContext);
389-
g_SortInfo.hndl = params[4];
389+
g_SortInfo.data = params[4];
390390
g_SortInfo.array_addr = params[1];
391391
g_SortInfo.array_remap = NULL;
392392
g_SortInfo.array_base = NULL;
@@ -419,7 +419,7 @@ static int sort2d_amx_custom_legacy(const void *elem1, const void *elem2)
419419
g_SortInfo.pFunc->PushCell(c1_addr);
420420
g_SortInfo.pFunc->PushCell(c2_addr);
421421
g_SortInfo.pFunc->PushCell(g_SortInfo.array_addr);
422-
g_SortInfo.pFunc->PushCell(g_SortInfo.hndl);
422+
g_SortInfo.pFunc->PushCell(g_SortInfo.data);
423423
g_SortInfo.pFunc->Invoke(&result);
424424

425425
return result;
@@ -451,7 +451,7 @@ static cell_t sm_SortCustom2D_Legacy(IPluginContext *pContext, const cell_t *par
451451

452452
DetectExceptions eh(pContext);
453453
g_SortInfo.pFunc = pFunction;
454-
g_SortInfo.hndl = params[4];
454+
g_SortInfo.data = params[4];
455455
g_SortInfo.array_addr = params[1];
456456
g_SortInfo.eh = &eh;
457457

@@ -495,7 +495,7 @@ static int sort2d_amx_custom(const void *elem1, const void *elem2)
495495
g_SortInfo.pFunc->PushCell(iv1);
496496
g_SortInfo.pFunc->PushCell(iv2);
497497
g_SortInfo.pFunc->PushCell(g_SortInfo.array_addr);
498-
g_SortInfo.pFunc->PushCell(g_SortInfo.hndl);
498+
g_SortInfo.pFunc->PushCell(g_SortInfo.data);
499499
g_SortInfo.pFunc->Invoke(&result);
500500

501501
return result;
@@ -522,7 +522,7 @@ static cell_t sm_SortCustom2D(IPluginContext *pContext, const cell_t *params)
522522

523523
DetectExceptions eh(pContext);
524524
g_SortInfo.pFunc = pFunction;
525-
g_SortInfo.hndl = params[4];
525+
g_SortInfo.data = params[4];
526526
g_SortInfo.array_addr = params[1];
527527
g_SortInfo.eh = &eh;
528528

@@ -630,7 +630,7 @@ struct sort_infoADT
630630
cell_t *array_base;
631631
cell_t array_bsize;
632632
Handle_t array_hndl;
633-
Handle_t hndl;
633+
cell_t data;
634634
ExceptionHandler *eh;
635635
};
636636

@@ -646,7 +646,7 @@ int sort_adtarray_custom(const void *elem1, const void *elem2)
646646
pf->PushCell(((cell_t) ((cell_t *) elem1 - g_SortInfoADT.array_base)) / g_SortInfoADT.array_bsize);
647647
pf->PushCell(((cell_t) ((cell_t *) elem2 - g_SortInfoADT.array_base)) / g_SortInfoADT.array_bsize);
648648
pf->PushCell(g_SortInfoADT.array_hndl);
649-
pf->PushCell(g_SortInfoADT.hndl);
649+
pf->PushCell(g_SortInfoADT.data);
650650
pf->Invoke(&result);
651651

652652
return result;
@@ -681,7 +681,7 @@ static cell_t sm_SortADTArrayCustom(IPluginContext *pContext, const cell_t *para
681681
g_SortInfoADT.array_base = array;
682682
g_SortInfoADT.array_bsize = (cell_t) blocksize;
683683
g_SortInfoADT.array_hndl = params[1];
684-
g_SortInfoADT.hndl = params[3];
684+
g_SortInfoADT.data = params[3];
685685
g_SortInfoADT.eh = &eh;
686686

687687
qsort(array, arraysize, blocksize * sizeof(cell_t), sort_adtarray_custom);

0 commit comments

Comments
 (0)