X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.c;h=f85738a1fa71d0ce23bd4768dec23a4b2fc5ee58;hb=f668f77f85a42d0aabbc89f4896bea79d63af0a1;hp=31c92c8e1f2d92a1b19558dddfaf7d3c321ad509;hpb=bd4911b7d2f6abd30f73852e79807f06885fcba2;p=rocksndiamonds.git diff --git a/src/libgame/setup.c b/src/libgame/setup.c index 31c92c8e..f85738a1 100644 --- a/src/libgame/setup.c +++ b/src/libgame/setup.c @@ -43,14 +43,13 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = "DX Boulderdash" }; - #define LEVELCOLOR(n) (IS_LEVELCLASS_TUTORIAL(n) ? FC_BLUE : \ IS_LEVELCLASS_CLASSICS(n) ? FC_RED : \ - IS_LEVELCLASS_BD(n) ? FC_YELLOW : \ - IS_LEVELCLASS_EM(n) ? FC_YELLOW : \ - IS_LEVELCLASS_SP(n) ? FC_YELLOW : \ - IS_LEVELCLASS_DX(n) ? FC_YELLOW : \ - IS_LEVELCLASS_SB(n) ? FC_YELLOW : \ + IS_LEVELCLASS_BD(n) ? FC_GREEN : \ + IS_LEVELCLASS_EM(n) ? FC_GREEN : \ + IS_LEVELCLASS_SP(n) ? FC_GREEN : \ + IS_LEVELCLASS_DX(n) ? FC_GREEN : \ + IS_LEVELCLASS_SB(n) ? FC_GREEN : \ IS_LEVELCLASS_CONTRIB(n) ? FC_GREEN : \ IS_LEVELCLASS_PRIVATE(n) ? FC_RED : \ FC_BLUE) @@ -69,7 +68,7 @@ static char *levelclass_desc[NUM_LEVELCLASS_DESC] = #define ARTWORKCOLOR(n) (IS_ARTWORKCLASS_CLASSICS(n) ? FC_RED : \ IS_ARTWORKCLASS_CONTRIB(n) ? FC_GREEN : \ IS_ARTWORKCLASS_PRIVATE(n) ? FC_RED : \ - IS_ARTWORKCLASS_LEVEL(n) ? FC_YELLOW : \ + IS_ARTWORKCLASS_LEVEL(n) ? FC_GREEN : \ FC_BLUE) #define ARTWORKSORTING(n) (IS_ARTWORKCLASS_CLASSICS(n) ? 0 : \ @@ -4028,6 +4027,7 @@ static void LoadArtworkInfoFromLevelInfoExt(ArtworkDirTree **artwork_node, setString(&artwork_new->name_sorting, level_node->name_sorting); artwork_new->sort_priority = level_node->sort_priority; + artwork_new->in_user_dir = level_node->in_user_dir; artwork_new->color = LEVELCOLOR(artwork_new); update_artworkinfo_cache = TRUE;