fixed bug with using already assigned byte position when saving level

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index cb1a9f77d277ee9177c0271771081f09430f1b93..363e033ecc9da80c014a910ec30146978ca8b8c0 100644 (file)
--- 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 +    \
@@ -923,7 +923,7 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
   },
   {
     EL_MM_GRAY_BALL,                   -1,
-    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(1),
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(3),
     &li.rotate_mm_ball_content,                TRUE
   },
   {
@@ -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
 
@@ -12456,10 +12456,9 @@ 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.list_entry_size",        &menu.list_entry_size[i]        }
+      { "menu.draw_xoffset",   &menu.draw_xoffset[i]   },
+      { "menu.draw_yoffset",   &menu.draw_yoffset[i]   },
+      { "menu.list_size",      &menu.list_size[i]      }
     };
 
     for (j = 0; j < ARRAY_SIZE(menu_config); j++)
@@ -12481,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_entry_size.INFO",   &menu.list_entry_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++)
@@ -12521,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]    },