added variable to cleanup code
[rocksndiamonds.git] / src / files.c
index 7d0f6f0aff81becd92c1496e02263d5bf9fe1ace..cb1a9f77d277ee9177c0271771081f09430f1b93 100644 (file)
@@ -12456,9 +12456,10 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
   {
     struct TokenIntPtrInfo menu_config[] =
     {
-      { "menu.draw_xoffset",   &menu.draw_xoffset[i]   },
-      { "menu.draw_yoffset",   &menu.draw_yoffset[i]   },
-      { "menu.list_size",      &menu.list_size[i]      }
+      { "menu.draw_xoffset",   &menu.draw_xoffset[i]           },
+      { "menu.draw_yoffset",   &menu.draw_yoffset[i]           },
+      { "menu.list_size",      &menu.list_size[i]              },
+      { "menu.list_entry_size",        &menu.list_entry_size[i]        }
     };
 
     for (j = 0; j < ARRAY_SIZE(menu_config); j++)
@@ -12479,7 +12480,8 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     {
       { "menu.draw_xoffset.INFO",      &menu.draw_xoffset_info[i]      },
       { "menu.draw_yoffset.INFO",      &menu.draw_yoffset_info[i]      },
-      { "menu.list_size.INFO",         &menu.list_size_info[i]         }
+      { "menu.list_size.INFO",         &menu.list_size_info[i]         },
+      { "menu.list_entry_size.INFO",   &menu.list_entry_size_info[i]   }
     };
 
     for (j = 0; j < ARRAY_SIZE(menu_config); j++)
@@ -12952,7 +12954,7 @@ void LoadMusicInfo(void)
   int num_music = getMusicListSize();
   int num_music_noconf = 0;
   int num_sounds = getSoundListSize();
-  Directory *dir;
+  Directory *dir = NULL;
   DirectoryEntry *dir_entry;
   struct FileInfo *music, *sound;
   struct MusicFileInfo *next, **new;