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

diff --git a/src/screens.c b/src/screens.c
index bd59b4cd..bf9f0a96 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1938,7 +1938,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)
   {
@@ -6164,6 +6164,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 +8497,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;