X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=889136ff675bfb83d9e5b25c28aea93c08cbcfe4;hb=c42db18f39053cf2ec85943c37a20b8caa742d09;hp=7d0f6f0aff81becd92c1496e02263d5bf9fe1ace;hpb=b48dac24b604cdf088bcdca7392694d3312868e3;p=rocksndiamonds.git

diff --git a/src/files.c b/src/files.c
index 7d0f6f0a..889136ff 100644
--- a/src/files.c
+++ b/src/files.c
@@ -114,7 +114,7 @@
 					 CONF_CONTENT_NUM_BYTES : 1)
 
 #define CONF_ELEMENT_BYTE_POS(i)	((i) * CONF_ELEMENT_NUM_BYTES)
-#define CONF_ELEMENTS_ELEMENT(b,i)     ((b[CONF_ELEMENT_BYTE_POS(i)] << 8) |  \
+#define CONF_ELEMENTS_ELEMENT(b, i)	((b[CONF_ELEMENT_BYTE_POS(i)] << 8) | \
 					(b[CONF_ELEMENT_BYTE_POS(i) + 1]))
 
 #define CONF_CONTENT_ELEMENT_POS(c,x,y)	((c) * CONF_CONTENT_NUM_ELEMENTS +    \
@@ -12110,7 +12110,7 @@ static void InitMenuDesignSettings_SpecialPostProcessing(void)
       vp_playfield->width = MIN(vp_playfield->width, vp_playfield->max_width);
 
     if (vp_playfield->max_height != -1)
-      vp_playfield->height = MIN(vp_playfield->height,vp_playfield->max_height);
+      vp_playfield->height = MIN(vp_playfield->height, vp_playfield->max_height);
 
     // adjust playfield position according to specified alignment
 
@@ -12479,7 +12479,9 @@ 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]	},
+      { "menu.tile_size.INFO",		&menu.tile_size_info[i]		}
     };
 
     for (j = 0; j < ARRAY_SIZE(menu_config); j++)
@@ -12519,6 +12521,7 @@ static void LoadMenuDesignSettingsFromFilename(char *filename)
     struct TokenIntPtrInfo menu_config[] =
     {
       { "menu.left_spacing.INFO",	&menu.left_spacing_info[i]	},
+      { "menu.middle_spacing.INFO",	&menu.middle_spacing_info[i]	},
       { "menu.right_spacing.INFO",	&menu.right_spacing_info[i]	},
       { "menu.top_spacing.INFO",	&menu.top_spacing_info[i]	},
       { "menu.bottom_spacing.INFO",	&menu.bottom_spacing_info[i]	},
@@ -12952,7 +12955,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;