adam/cobm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Move the sorting into the C++ so I can make qsort disappear.

Browse Source
This commit is contained in:
ADAM David Alan Martin
2024-04-24 20:37:46 -04:00
parent d813c3ae37
commit 20c0a8e258
3 changed files with 39 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
sc2/src/uqm/planets/pstarmap-modern.cpp
+39
View File
@@ -17,15 +17,54 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
#include <cstdlib>
#include <vector>
#include <memory>
#include "../gamestr.h"
#include "../starmap.h"
#include "../menustat.h"
#include "../controls.h"
#include "../sis.h"
#include "../sounds.h"
static int
compStarName (const void *ptr1, const void *ptr2)
{
int index1;
int index2;
index1 = *(const int *) ptr1;
index2 = *(const int *) ptr2;
if (star_array[index1].Postfix != star_array[index2].Postfix)
{
return utf8StringCompare (GAME_STRING (star_array[index1].Postfix),
GAME_STRING (star_array[index2].Postfix));
}
if (star_array[index1].Prefix < star_array[index2].Prefix)
return -1;
if (star_array[index1].Prefix > star_array[index2].Prefix)
return 1;
return 0;
}
static void
SortStarsOnName (STAR_SEARCH_STATE *pSS)
{
int i;
int *sorted = pSS->SortedStars;
for (i = 0; i < GetStarCount(); i++)
sorted[i] = i;
std::qsort (sorted, GetStarCount(), sizeof (int), compStarName);
}
extern "C" bool
DoStarSearch (MENU_STATE *pMS)
sc2/src/uqm/planets/pstarmap.c
-35
View File
@@ -797,41 +797,6 @@ UpdateFuelRequirement (void)
DrawStatusMessage (buf);
}
static int
compStarName (const void *ptr1, const void *ptr2)
{
int index1;
int index2;
index1 = *(const int *) ptr1;
index2 = *(const int *) ptr2;
if (star_array[index1].Postfix != star_array[index2].Postfix)
{
return utf8StringCompare (GAME_STRING (star_array[index1].Postfix),
GAME_STRING (star_array[index2].Postfix));
}
if (star_array[index1].Prefix < star_array[index2].Prefix)
return -1;
if (star_array[index1].Prefix > star_array[index2].Prefix)
return 1;
return 0;
}
void
SortStarsOnName (STAR_SEARCH_STATE *pSS)
{
int i;
int *sorted = pSS->SortedStars;
for (i = 0; i < GetStarCount(); i++)
sorted[i] = i;
qsort (sorted, GetStarCount(), sizeof (int), compStarName);
}
static void
SplitStarName (STAR_SEARCH_STATE *pSS)
{
sc2/src/uqm/starmap.h
-1
View File
@@ -66,7 +66,6 @@ typedef struct starsearch_state
} STAR_SEARCH_STATE;
bool DoStarSearch( MENU_STATE * );
void SortStarsOnName( STAR_SEARCH_STATE * );
BOOLEAN OnStarNameChange( TEXTENTRY_STATE * );
BOOLEAN OnStarNameFrame ( TEXTENTRY_STATE *pTES );