X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fscreens.c;h=aa97ce2f704a135b80bb581dcdc7c5ea8f56ddb0;hb=d3eee47071cee093667ee49857d05d4f0142733e;hp=0d3b008ab9f44f115c8a6bc09e9f843ad554700b;hpb=c781e660ed2fe6ad36c9eee0a77d64ee07163030;p=rocksndiamonds.git

diff --git a/src/screens.c b/src/screens.c
index 0d3b008a..aa97ce2f 100644
--- a/src/screens.c
+++ b/src/screens.c
@@ -212,6 +212,7 @@ void DrawMainMenu()
   {
     game_status = GAME_MODE_EDITOR;
     DrawLevelEd();
+
     return;
   }
 
@@ -331,7 +332,7 @@ static void gotoTopLevelDir()
 
 void HandleMainMenu(int mx, int my, int dx, int dy, int button)
 {
-  static int choice = 0;
+  static int choice = 5;
   int x = 0;
   int y = choice;
 
@@ -1240,12 +1241,6 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   int yoffset = (ti->type == TREE_TYPE_LEVEL_DIR ? 0 : yoffset_setup);
   int last_game_status = game_status;	/* save current game status */
 
-#if 1
-  DrawBackground(mSX, mSY, SXSIZE - 32 + menu.scrollbar_xoffset, SYSIZE);
-#else
-  DrawBackground(SX, SY, SXSIZE - 32, SYSIZE);
-#endif
-
   title_string =
     (ti->type == TREE_TYPE_LEVEL_DIR ? "Level Directories" :
      ti->type == TREE_TYPE_GRAPHICS_DIR ? "Custom Graphics" :
@@ -1257,6 +1252,11 @@ static void drawChooseTreeList(int first_entry, int num_page_entries,
   /* force LEVELS font on artwork setup screen */
   game_status = GAME_MODE_LEVELS;
 
+  /* clear tree list area, but not title or scrollbar */
+  DrawBackground(mSX, mSY + MENU_SCREEN_START_YPOS * 32,
+		 SXSIZE - 32 + menu.scrollbar_xoffset,
+		 MAX_MENU_ENTRIES_ON_SCREEN * 32);
+
   for(i=0; i<num_page_entries; i++)
   {
     TreeInfo *node, *node_first;
@@ -1812,7 +1812,6 @@ static struct TokenInfo setup_info_editor[] =
   { TYPE_SWITCH,	&setup.editor.el_chars,		"Characters:"	},
   { TYPE_SWITCH,	&setup.editor.el_custom,	"Custom:"	},
   { TYPE_SWITCH,	&setup.editor.el_custom_more,	"More Custom:"	},
-  { TYPE_EMPTY,		NULL,			""			},
   { TYPE_SWITCH,	&setup.editor.el_headlines,	"Headlines:"	},
   { TYPE_EMPTY,		NULL,			""			},
   { TYPE_LEAVE_MENU,	execSetupMain, 		"Back"			},