X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=76e2444709815029e88dd31fcad6bbe6d4510ca1;hb=5c717898f717007b885f86e0d02f10d2a0306237;hp=5b207805d1ee1647919aae723d91d6954660a35f;hpb=fa628a204ea4662806244b0ed994a48b40ece2ca;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 5b207805..76e24447 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -61,6 +61,7 @@
 #define MAX_MENU_ENTRIES_ON_SCREEN	(SCR_FIELDY - 2)
 #define MENU_SCREEN_START_YPOS		2
 #define MENU_SCREEN_VALUE_XPOS		14
+#define MENU_SCREEN_MAX_XPOS		(SCR_FIELDX - 1)
 #define MENU_TITLE1_YPOS		8
 #define MENU_TITLE2_YPOS		46
 
@@ -2063,12 +2064,6 @@ static struct TokenInfo setup_info_game[] =
 
 static struct TokenInfo setup_info_editor[] =
 {
-#if 0
-  { TYPE_STRING,	NULL,			"Offer Special Elements:"},
-#endif
-
-#if 0
-#else
   { TYPE_SWITCH,	&setup.editor.el_boulderdash,	"Boulder Dash:" },
   { TYPE_SWITCH,	&setup.editor.el_emerald_mine,	"Emerald Mine:"	},
   { TYPE_SWITCH, &setup.editor.el_emerald_mine_club,	"Emerald Mine Club:" },
@@ -2077,7 +2072,6 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,	&setup.editor.el_supaplex,	"Supaplex:"	},
   { TYPE_SWITCH,	&setup.editor.el_diamond_caves,	"Diamond Caves II:" },
   { TYPE_SWITCH,	&setup.editor.el_dx_boulderdash,"DX-Boulderdash:" },
-#endif
   { TYPE_SWITCH,	&setup.editor.el_chars,		"Text Characters:" },
   { TYPE_SWITCH,	&setup.editor.el_custom,  "Custom & Group Elements:" },
   { TYPE_SWITCH,	&setup.editor.el_headlines,	"Headlines:"	},
@@ -2232,8 +2226,8 @@ static void drawSetupValue(int pos)
   int font_nr = FONT_VALUE_1;
   int type = setup_info[pos].type;
   void *value = setup_info[pos].value;
-  char *value_string = (!(type & TYPE_GHOSTED) ? getSetupValue(type, value) :
-			"n/a");
+  char *value_string = getSetupValue(type, value);
+  int i;
 
   if (value_string == NULL)
     return;
@@ -2267,8 +2261,14 @@ static void drawSetupValue(int pos)
     font_nr = (*(boolean *)value ? FONT_OPTION_ON : FONT_OPTION_OFF);
   }
 
+#if 1
+  for (i = xpos; i <= MENU_SCREEN_MAX_XPOS; i++)
+    DrawText(mSX + i * 32, mSY + ypos * 32, " ", font_nr);
+#else
   DrawText(mSX + xpos * 32, mSY + ypos * 32,
 	   (xpos == 3 ? "              " : "   "), font_nr);
+#endif
+
   DrawText(mSX + xpos * 32, mSY + ypos * 32, value_string, font_nr);
 }