X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=af90c247d4a14c9031a8e3b6f6c56bb2a8c5a20e;hb=ac90a37dbfe706bbfc4b21eb581b21067d81a6eb;hp=e81498a0683f04fb5461cf4e7e0c1ce54caa979a;hpb=e1bc80b7482a6baa481391980991f42480a7c52f;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index e81498a0..af90c247 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -2878,15 +2878,7 @@ static int compareTreeInfoEntries(const void *object1, const void *object2) if (entry1->parent_link || entry2->parent_link) compare_result = (entry1->parent_link ? -1 : +1); 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 @@ -3974,7 +3966,7 @@ void LoadArtworkInfo(void) 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); @@ -4065,8 +4057,8 @@ static void LoadArtworkInfoFromLevelInfoExt(ArtworkDirTree **artwork_node, 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);