X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=ae2843a1fbc515b64e4dceda60589d6ae85e9f31;hb=c5d03f36989babf47697957101ecebe9b7b9cbe8;hp=b3732972293429add837ad45c1b2fa1725ac9e59;hpb=652f2eebd3bac1458da0010bef1b1208c19649c7;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index b3732972..ae2843a1 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -285,8 +285,10 @@ void DrawMainMenu()
   SetDrawtoField(DRAW_BACKBUFFER);
 #endif
 
+#if 0
   /* map gadgets for main menu screen */
   MapTapeButtons();
+#endif
 
   /* level_nr may have been set to value over handicap with level editor */
   if (setup.handicap && level_nr > leveldir_current->handicap_level)
@@ -390,6 +392,11 @@ void DrawMainMenu()
   PlayMenuMusic();
 
   OpenDoor(DOOR_CLOSE_1 | DOOR_OPEN_2);
+
+#if 1
+  /* map gadgets for main menu screen */
+  MapTapeButtons();
+#endif
 }
 
 #if 0
@@ -880,7 +887,7 @@ static char *getHelpText(int element, int action, int direction)
     strcat(token, element_action_info[action].suffix);
 
   if (direction != -1)
-    strcat(token, element_direction_info[MV_DIR_BIT(direction)].suffix);
+    strcat(token, element_direction_info[MV_DIR_TO_BIT(direction)].suffix);
 
   return getHashEntry(helptext_info, token);
 }
@@ -2043,14 +2050,18 @@ static struct TokenInfo setup_info_editor[] =
 #if 0
   { TYPE_STRING,	NULL,			"Offer Special Elements:"},
 #endif
+
+#if 0
+#else
   { TYPE_SWITCH,	&setup.editor.el_boulderdash,	"BoulderDash:"	},
   { TYPE_SWITCH,	&setup.editor.el_emerald_mine,	"Emerald Mine:"	},
-  { TYPE_SWITCH,	&setup.editor.el_emerald_mine_club,"E.M. Club:"	},
-  { TYPE_SWITCH,	&setup.editor.el_more,		"More:"		},
+  { TYPE_SWITCH,	&setup.editor.el_emerald_mine_club,"E.M.C.:"	},
+  { TYPE_SWITCH,	&setup.editor.el_more,		"R'n'D:"	},
   { TYPE_SWITCH,	&setup.editor.el_sokoban,	"Sokoban:"	},
   { TYPE_SWITCH,	&setup.editor.el_supaplex,	"Supaplex:"	},
-  { TYPE_SWITCH,	&setup.editor.el_diamond_caves,	"Diamd. Caves:"	},
-  { TYPE_SWITCH,	&setup.editor.el_dx_boulderdash,"DX Boulderd.:"	},
+  { TYPE_SWITCH,	&setup.editor.el_diamond_caves,	"DC II:"	},
+  { TYPE_SWITCH,	&setup.editor.el_dx_boulderdash,"DX BD:"	},
+#endif
   { TYPE_SWITCH,	&setup.editor.el_chars,		"Characters:"	},
   { TYPE_SWITCH,	&setup.editor.el_custom,	"Custom:"	},
   { TYPE_SWITCH,	&setup.editor.el_headlines,	"Headlines:"	},