X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=5fde5b2c4b87b2029190f21baa32e1f8defad184;hb=61c3da024802ecc0268bab42d7499fc0346e4fd3;hp=37ccbe8e193e77c51880710bded1760114043ff5;hpb=8848a001bf529a3e06710b80b928094e48f25aa8;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index 37ccbe8e..5fde5b2c 100644 --- a/src/screens.c +++ b/src/screens.c @@ -1448,7 +1448,7 @@ static void gotoTopLevelDir() void HandleTitleScreen(int mx, int my, int dx, int dy, int button) { - static unsigned long title_delay = 0; + static unsigned int title_delay = 0; static int title_screen_nr = 0; static int last_sound = -1, last_music = -1; boolean return_to_main_menu = FALSE; @@ -2335,7 +2335,7 @@ void DrawInfoScreen_Elements() void HandleInfoScreen_Elements(int button) { - static unsigned long info_delay = 0; + static unsigned int info_delay = 0; static int num_anims; static int num_pages; static int page; @@ -3767,9 +3767,13 @@ void DrawChooseLevelNr() ti->node_top = &level_number; ti->sort_priority = 10000 + value; + ti->color = (level.no_valid_file ? FC_BLUE : + LevelStats_getSolved(i) ? FC_GREEN : + LevelStats_getPlayed(i) ? FC_YELLOW : FC_RED); sprintf(identifier, "%d", value); - sprintf(name, "%03d: %s", value, level.name); + sprintf(name, "%03d: %s", value, + (level.no_valid_file ? "(no file)" : level.name)); setString(&ti->identifier, identifier); setString(&ti->name, name); @@ -5909,7 +5913,7 @@ static struct static void CreateScreenMenubuttons() { struct GadgetInfo *gi; - unsigned long event_mask; + unsigned int event_mask; int i; for (i = 0; i < NUM_SCREEN_MENUBUTTONS; i++) @@ -5962,7 +5966,7 @@ static void CreateScreenMenubuttons() static void CreateScreenScrollbuttons() { struct GadgetInfo *gi; - unsigned long event_mask; + unsigned int event_mask; int i; /* these values are not constant, but can change at runtime */ @@ -6042,7 +6046,7 @@ static void CreateScreenScrollbars() int gd_x1, gd_x2, gd_y1, gd_y2; struct GadgetInfo *gi; int items_max, items_visible, item_position; - unsigned long event_mask; + unsigned int event_mask; int num_page_entries = NUM_MENU_ENTRIES_ON_SCREEN; int id = scrollbar_info[i].gadget_id;