X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fscreens.c;h=89b9d3d48c515478dc2894924fd96ef9de463004;hp=ad21972ceafc8d89c377d84bab1276dc86913785;hb=70fe541d68f18a22eb3bd134f128c0d56b885701;hpb=c64a1336914e69861b3cee04cd03afb3f1a7801a

diff --git a/src/screens.c b/src/screens.c
index ad21972c..89b9d3d4 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -1651,6 +1651,10 @@ void DrawMainMenu()
   FreeScreenGadgets();
   CreateScreenGadgets();
 
+  /* may be required if audio buttons shown on tape and changed in setup menu */
+  FreeGameButtons();
+  CreateGameButtons();
+
   /* map gadgets for main menu screen */
   MapTapeButtons();
   MapScreenMenuGadgets(SCREEN_MASK_MAIN);
@@ -7558,13 +7562,19 @@ boolean ConfigureVirtualButtonsMain()
 
 	    /* press 'Enter' to keep the existing key binding */
 	    if (key == KSYM_Return ||
+#if defined(TARGET_SDL2)
 		key == KSYM_Menu ||
+#endif
 		key == KSYM_space)
 	    {
 	      step_nr++;
 	    }
-	    else if (key == KSYM_BackSpace ||
-		     key == KSYM_Back)
+	    else if (key == KSYM_BackSpace
+#if defined(TARGET_SDL2)
+		     ||
+		     key == KSYM_Back
+#endif
+		     )
 	    {
 	      if (step_nr == 0)
 	      {
@@ -8022,6 +8032,7 @@ static void CreateScreenMenubuttons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_IMAGE_ID, gfx_unpressed,
 		      GDI_INFO_TEXT, menubutton_info[i].infotext,
 		      GDI_X, x,
 		      GDI_Y, y,
@@ -8089,6 +8100,7 @@ static void CreateScreenScrollbuttons()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_IMAGE_ID, gfx_unpressed,
 		      GDI_INFO_TEXT, scrollbutton_info[i].infotext,
 		      GDI_X, x,
 		      GDI_Y, y,
@@ -8161,6 +8173,7 @@ static void CreateScreenScrollbars()
 
     gi = CreateGadget(GDI_CUSTOM_ID, id,
 		      GDI_CUSTOM_TYPE_ID, i,
+		      GDI_IMAGE_ID, gfx_unpressed,
 		      GDI_INFO_TEXT, scrollbar_info[i].infotext,
 		      GDI_X, x,
 		      GDI_Y, y,