X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=d7a2b63e6883d10a6607eea3584561b16f866365;hb=5b58ec0b5237a4fdbea625e4473f4ef85f245d17;hp=e453e4a732e05c4f154e8962cf6603f5051d6173;hpb=9a252253d8cf93c1f1d7cbb716b6f6e6ab42d6f6;p=rocksndiamonds.git diff --git a/src/screens.c b/src/screens.c index e453e4a7..d7a2b63e 100644 --- a/src/screens.c +++ b/src/screens.c @@ -317,6 +317,9 @@ static struct } volumes_list[] = { { 0, "0 %" }, + { 1, "1 %" }, + { 2, "2 %" }, + { 5, "5 %" }, { 10, "10 %" }, { 20, "20 %" }, { 30, "30 %" }, @@ -1619,9 +1622,11 @@ void HandleTitleScreen(int mx, int my, int dx, int dy, int button) if (game_status == GAME_MODE_INFO) { + int fade_mask = (num_title_screens == 0 ? REDRAW_FIELD : REDRAW_ALL); + info_mode = INFO_MODE_MAIN; - DrawInfoScreenExt(REDRAW_ALL, use_fading_main_menu); + DrawInfoScreenExt(fade_mask, use_fading_main_menu); } else /* default: return to main menu */ { @@ -3296,8 +3301,8 @@ static void clearMenuListArea() int scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS + menu.scrollbar_xoffset; /* correct scrollbar position if placed outside menu (playfield) area */ - if (scrollbar_xpos > mSX + SC_SCROLLBAR_XPOS) - scrollbar_xpos = mSX + SC_SCROLLBAR_XPOS; + if (scrollbar_xpos > SX + SC_SCROLLBAR_XPOS) + scrollbar_xpos = SX + SC_SCROLLBAR_XPOS; /* clear menu list area, but not title or scrollbar */ DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,