yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-10 07:12:07 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #914 from protocultor/ordered

Browse source 
Mods ordered by priority in menu
This commit is contained in:
Yamagi 2022-10-09 10:50:25 +02:00 committed by GitHub
commit 4648f1f520
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 30 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/client/menu/menu.c
View file

@ -5514,6 +5514,9 @@ PlayerModelList(void)
}
}
// sort skin names alphabetically
qsort(s_skinnames[mdl].data, s_skinnames[mdl].num, sizeof(char**), Q_sort_strcomp);
s_skinnames[mdl].num++; // guard pointer
// at this point we have a valid player model

28
src/common/filesystem.c
View file

@ -1357,6 +1357,32 @@ FS_FreeList(char **list, int nfiles)
list = 0;
}
/*
* Comparator for mod sorting
*/
static int
Q_sort_modcmp(const void *p1, const void *p2)
{
static const char *first_mods[] = {BASEDIRNAME, "xatrix", "rogue", "ctf"};
static const unsigned short int first_mods_qty = 4;
const char * s1 = * (char * const *)p1;
const char * s2 = * (char * const *)p2;
for (unsigned short int i = 0; i < first_mods_qty; i++)
{
if (!strcmp(first_mods[i], s1))
{
return -1;
}
if (!strcmp(first_mods[i], s2))
{
return 1;
}
}
return strcmp(s1, s2);
}
/*
* Combs all Raw search paths to find game dirs containing PAK/PK2/PK3 files.
* Returns an alphabetized array of unique relative dir names.
@ -1452,7 +1478,7 @@ FS_ListMods(int *nummods)
modnames[nmods] = 0;
qsort(modnames, nmods, sizeof(modnames[0]), Q_sort_strcomp);
qsort(modnames, nmods, sizeof(modnames[0]), Q_sort_modcmp);
*nummods = nmods;
return modnames;