rnd-20060518-1-src

[rocksndiamonds.git] / src / files.c

diff --git a/src/files.c b/src/files.c
index 19c6bd9af48d3cd35b5d375d64028bd9b874b822..e96f86364e3345f5863bd9d4889bb94a0f939b14 100644 (file)
--- a/src/files.c
+++ b/src/files.c
@@ -211,6 +211,11 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(5),
     &li.can_pass_to_walkable,          FALSE
   },
+  {
+    EL_PLAYER_1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(6),
+    &li.initial_player_gravity[0],     FALSE
+  },
   {
     EL_PLAYER_1,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(9),
@@ -252,6 +257,11 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =
     &li.continuous_snapping,           TRUE
   },
 
+  {
+    EL_PLAYER_2,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(6),
+    &li.initial_player_gravity[1],     FALSE
+  },
   {
     EL_PLAYER_2,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(10),
@@ -283,6 +293,11 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =
     &li.explosion_element[1],          EL_PLAYER_2
   },
 
+  {
+    EL_PLAYER_3,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(6),
+    &li.initial_player_gravity[2],     FALSE
+  },
   {
     EL_PLAYER_3,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(10),
@@ -314,6 +329,11 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =
     &li.explosion_element[2],          EL_PLAYER_3
   },
 
+  {
+    EL_PLAYER_4,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(6),
+    &li.initial_player_gravity[3],     FALSE
+  },
   {
     EL_PLAYER_4,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(10),
@@ -560,12 +580,6 @@ static struct LevelFileConfigInfo chunk_config_CONF[] =
     &li.use_spring_bug,                        FALSE
   },
 
-  {
-    EL_BALLOON,
-    TYPE_BITFIELD,                     CONF_VALUE_8_BIT(1),
-    &li.wind_direction_initial,                MV_NONE
-  },
-
   {
     EL_EMC_ANDROID,
     TYPE_INTEGER,                      CONF_VALUE_16_BIT(1),
@@ -694,13 +708,19 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
 
   {
     -1,
-    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(4),
-    &li.em_slippery_gems,              FALSE
+    TYPE_BITFIELD,                     CONF_VALUE_8_BIT(4),
+    &li.wind_direction_initial,                MV_NONE
   },
 
   {
     -1,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(5),
+    &li.em_slippery_gems,              FALSE
+  },
+
+  {
+    -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(6),
     &li.use_custom_template,           FALSE
   },
 
@@ -712,7 +732,7 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
 
   {
     -1,
-    TYPE_BITFIELD,                     CONF_VALUE_8_BIT(6),
+    TYPE_BITFIELD,                     CONF_VALUE_8_BIT(7),
     &li.dont_collide_with_bits,                ~0      /* default: always deadly */
   },
 
@@ -4954,6 +4974,7 @@ static void SaveLevel_AUTH(FILE *file, struct LevelInfo *level)
     putFile8Bit(file, level->author[i]);
 }
 
+#if 0
 static void SaveLevel_TITL(FILE *file, struct LevelInfo *level)
 {
   int i;
@@ -4961,6 +4982,7 @@ static void SaveLevel_TITL(FILE *file, struct LevelInfo *level)
   for (i = 0; i < MAX_LEVEL_NAME_LEN; i++)
     putFile8Bit(file, level->name[i]);
 }
+#endif
 
 static void SaveLevel_BODY(FILE *file, struct LevelInfo *level)
 {
@@ -4994,6 +5016,7 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level)
 }
 #endif
 
+#if 0
 static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
 {
   int i, x, y;
@@ -5044,6 +5067,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element)
       for (x = 0; x < 3; x++)
        putFile16BitBE(file, content_array[i][x][y]);
 }
+#endif
 
 static void SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element)
 {
@@ -5868,7 +5892,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
       /* check if non-default element settings need to be saved */
       if (cusx_chunk_size > cusx_chunk_size_no_changes)
       {
-#if 1
+#if 0
        printf("::: SAVING CE %d\n", i + 1);
 #endif
 
@@ -5885,7 +5909,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename)
       /* check if non-default element settings need to be saved */
       if (grpx_chunk_size > grpx_chunk_size_no_changes)
       {
-#if 1
+#if 0
        printf("::: SAVING GE %d\n", i + 1);
 #endif