projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
added sorting tree group nodes prior to normal nodes (level sets / artwork)
[rocksndiamonds.git]
/
src
/
libgame
/
setup.c
diff --git
a/src/libgame/setup.c
b/src/libgame/setup.c
index e81498a0683f04fb5461cf4e7e0c1ce54caa979a..31c92c8e1f2d92a1b19558dddfaf7d3c321ad509 100644
(file)
--- a/
src/libgame/setup.c
+++ b/
src/libgame/setup.c
@@
-2877,16
+2877,10
@@
static int compareTreeInfoEntries(const void *object1, const void *object2)
if (entry1->parent_link || entry2->parent_link)
compare_result = (entry1->parent_link ? -1 : +1);
if (entry1->parent_link || entry2->parent_link)
compare_result = (entry1->parent_link ? -1 : +1);
+ else if (entry1->level_group != entry2->level_group)
+ compare_result = (entry1->level_group ? -1 : +1);
else if (entry1->sort_priority == entry2->sort_priority)
else if (entry1->sort_priority == entry2->sort_priority)
- {
- char *name1 = getStringToLower(entry1->name_sorting);
- char *name2 = getStringToLower(entry2->name_sorting);
-
- compare_result = strcmp(name1, name2);
-
- free(name1);
- free(name2);
- }
+ compare_result = strcasecmp(entry1->name_sorting, entry2->name_sorting);
else if (class_sorting1 == class_sorting2)
compare_result = entry1->sort_priority - entry2->sort_priority;
else
else if (class_sorting1 == class_sorting2)
compare_result = entry1->sort_priority - entry2->sort_priority;
else
@@
-3974,7
+3968,7
@@
void LoadArtworkInfo(void)
static void MoveArtworkInfoIntoSubTree(ArtworkDirTree **artwork_node)
{
ArtworkDirTree *artwork_new = newTreeInfo();
static void MoveArtworkInfoIntoSubTree(ArtworkDirTree **artwork_node)
{
ArtworkDirTree *artwork_new = newTreeInfo();
- char *top_node_name = "
dedicated custom
artwork";
+ char *top_node_name = "
standalone
artwork";
setTreeInfoToDefaults(artwork_new, (*artwork_node)->type);
setTreeInfoToDefaults(artwork_new, (*artwork_node)->type);
@@
-4065,8
+4059,8
@@
static void LoadArtworkInfoFromLevelInfoExt(ArtworkDirTree **artwork_node,
if (node_parent == NULL) // check for top tree node
{
char *top_node_name = (empty_level_set_mode ?
if (node_parent == NULL) // check for top tree node
{
char *top_node_name = (empty_level_set_mode ?
- "artwork
-only
level sets" :
- "artwork
from
level sets");
+ "artwork
for certain
level sets" :
+ "artwork
included in
level sets");
setString(&artwork_new->name, top_node_name);
setString(&artwork_new->name_sorting, top_node_name);
setString(&artwork_new->name, top_node_name);
setString(&artwork_new->name_sorting, top_node_name);