X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Flibgame%2Fsetup.h;h=367bbbc37c415e06ff8fe24e376e6820737a7b55;hb=1936db4e59f82c3814e89194eb8a882c69714dc7;hp=2f5489d9e482604a845dcca8889923b15cdf0056;hpb=38142eccb93284bef9c3aeb2d9e81389a21da82a;p=rocksndiamonds.git diff --git a/src/libgame/setup.h b/src/libgame/setup.h index 2f5489d9..367bbbc3 100644 --- a/src/libgame/setup.h +++ b/src/libgame/setup.h @@ -228,17 +228,19 @@ typedef struct hashtable SetupFileHash; ARTWORKCLASS_UNDEFINED) #define TREE_SORTING_DIR(ti) \ - (((ti)->parent_link ? 0 : \ - (ti)->in_user_dir ? 8 : \ - (ti)->sort_priority >= LEVELCLASS_CLASSICS_START ? 6 : \ - (ti)->sort_priority >= LEVELCLASS_TUTORIAL_START ? 4 : \ - 2) + \ - ((ti)->level_group ? 0 : 1)) + (((ti)->parent_link ? 0 : \ + (ti)->in_user_dir ? 4 * 200 : \ + (ti)->sort_priority >= LEVELCLASS_CLASSICS_START ? 3 * 200 + \ + (ti)->sort_priority % 100 : \ + (ti)->sort_priority >= LEVELCLASS_TUTORIAL_START ? 2 * 200 + \ + (ti)->sort_priority % 100 : \ + 1 * 200) + \ + ((ti)->level_group ? 0 : 100)) #define TREE_COLOR_DIR(ti, active) \ ((active) ? FC_YELLOW : \ - TREE_SORTING(ti) / 2 == 4 ? FC_GREEN : \ - TREE_SORTING(ti) / 2 == 2 ? FC_BLUE : \ + TREE_SORTING(ti) / 200 == 4 ? FC_GREEN : \ + TREE_SORTING(ti) / 200 == 2 ? FC_BLUE : \ FC_RED) #define TREE_SORTING(ti) \