X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=933be2a19ef4977b993f2ceb1bcaf86c3d6e9b41;hp=bd59b4cd4d8c46493fdf78c4dff95d1624c069bd;hb=2965766321c0bc9b8985b3760a624ea9ef8e44e5;hpb=5ec24525b32769d5ce634218dea77c110e22ed8c

diff --git a/src/screens.c b/src/screens.c
index bd59b4cd..933be2a1 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -988,6 +988,7 @@ static struct TitleFadingInfo getTitleFading(struct TitleControlInfo *tci)
   ti.fade_delay = tmi.fade_delay;
   ti.post_delay = tmi.post_delay;
   ti.auto_delay = tmi.auto_delay;
+  ti.auto_delay_unit = tmi.auto_delay_unit;
 
   return ti;
 }
@@ -1938,7 +1939,7 @@ void HandleMainMenu(int mx, int my, int dx, int dy, int button)
   static boolean button_pressed_last = FALSE;
   boolean button_pressed = FALSE;
   int pos = choice;
-  int i;
+  int i = 0;	// needed to prevent compiler warning due to bad code below
 
   if (button == MB_MENU_INITIALIZE)
   {
@@ -4530,7 +4531,7 @@ void DrawChooseLevelNr(void)
   for (i = leveldir_current->first_level; i <= leveldir_current->last_level;i++)
   {
     TreeInfo *ti = newTreeInfo_setDefaults(TREE_TYPE_LEVEL_NR);
-    char identifier[32], name[32];
+    char identifier[32], name[64];
     int value = i;
 
     // temporarily load level info to get level name
@@ -4705,7 +4706,8 @@ void HandleHallOfFame(int mx, int my, int dx, int dy, int button)
 
     FadeSound(SND_BACKGROUND_SCORES);
 
-    if (game_status_last_screen == GAME_MODE_PLAYING &&
+    if (button == MB_MENU_CHOICE &&
+	game_status_last_screen == GAME_MODE_PLAYING &&
 	setup.auto_play_next_level && setup.increment_levels &&
 	level_nr < leveldir_current->last_level &&
 	!network_playing)
@@ -6164,6 +6166,17 @@ static struct
   { &setup.touch.grid_ysize[1],		execSetupChooseGridYSize_1	},
   { &setup.touch.grid_ysize[1],		&grid_size_text[1][1]		},
 
+  { &setup.internal.menu_game,		execSetupGame			},
+  { &setup.internal.menu_editor,	execSetupEditor			},
+  { &setup.internal.menu_graphics,	execSetupGraphics		},
+  { &setup.internal.menu_sound,		execSetupSound			},
+  { &setup.internal.menu_artwork,	execSetupArtwork		},
+  { &setup.internal.menu_input,		execSetupInput			},
+  { &setup.internal.menu_touch,		execSetupTouch			},
+  { &setup.internal.menu_shortcuts,	execSetupShortcuts		},
+  { &setup.internal.menu_exit,		execExitSetup			},
+  { &setup.internal.menu_save_and_exit,	execSaveAndExitSetup		},
+
   { NULL,				NULL				}
 };
 
@@ -8486,16 +8499,8 @@ static void CreateScreenMenubuttons(void)
 
     menubutton_info[i].get_gadget_position(&x, &y, id);
 
-    if (menubutton_info[i].screen_mask == SCREEN_MASK_MAIN_HAS_SOLUTION)
-    {
-      width  = graphic_info[menubutton_info[i].gfx_pressed].width;
-      height = graphic_info[menubutton_info[i].gfx_pressed].height;
-    }
-    else
-    {
-      width = SC_MENUBUTTON_XSIZE;
-      height = SC_MENUBUTTON_YSIZE;
-    }
+    width  = graphic_info[menubutton_info[i].gfx_pressed].width;
+    height = graphic_info[menubutton_info[i].gfx_pressed].height;
 
     gfx_unpressed = menubutton_info[i].gfx_unpressed;
     gfx_pressed   = menubutton_info[i].gfx_pressed;