removed support for object rendering wrap-around for BD level handling
[rocksndiamonds.git] / src / files.c
index 964deb5a1ab8e479cf20f6eb166c2095926f9b56..87ad27a9cecea8597be335f520a24da9db422ee7 100644 (file)
@@ -298,21 +298,16 @@ static struct LevelFileConfigInfo chunk_config_INFO[] =
   {
     -1,                                        -1,
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(21),
-    &li.bd_wraparound_objects,         FALSE
-  },
-  {
-    -1,                                        -1,
-    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(22),
     &li.bd_scan_first_and_last_row,    TRUE
   },
   {
     -1,                                        -1,
-    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(23),
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(22),
     &li.bd_short_explosions,           TRUE
   },
   {
     -1,                                        -1,
-    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(24),
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(23),
     &li.bd_gravity_affects_all,                TRUE
   },
 
@@ -617,6 +612,21 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] =
     TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(2),
     &li.bd_topmost_player_active,      TRUE
   },
+  {
+    EL_BD_PLAYER,                      -1,
+    TYPE_INTEGER,                      CONF_VALUE_8_BIT(3),
+    &li.bd_pushing_prob,               25
+  },
+  {
+    EL_BD_PLAYER,                      -1,
+    TYPE_INTEGER,                      CONF_VALUE_8_BIT(4),
+    &li.bd_pushing_prob_with_sweet,    100
+  },
+  {
+    EL_BD_PLAYER,                      -1,
+    TYPE_BOOLEAN,                      CONF_VALUE_8_BIT(5),
+    &li.bd_push_mega_rock_with_sweet,  FALSE
+  },
 
   {
     EL_BD_DIAMOND,                     -1,
@@ -3745,45 +3755,54 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level)
   GdCave *cave = NULL; // will be changed below
   int cave_w = MIN(level->fieldx, MAX_PLAYFIELD_WIDTH);
   int cave_h = MIN(level->fieldy, MAX_PLAYFIELD_HEIGHT);
-  int i, x, y;
+  int x, y;
 
   setLevelInfoToDefaults_BD_Ext(cave_w, cave_h);
 
   // cave and map newly allocated when set to defaults above
   cave = level_bd->cave;
 
-  for (i = 0; i < 5; i++)
-  {
-    cave->level_time[i]                        = level->time;
-    cave->level_diamonds[i]            = level->gems_needed;
-    cave->level_magic_wall_time[i]     = level->time_magic_wall;
+  // level type
+  cave->intermission                   = level->bd_intermission;
 
-    cave->level_speed[i]               = level->bd_cycle_delay_ms;
-    cave->level_ckdelay[i]             = level->bd_cycle_delay_c64;
-    cave->level_hatching_delay_frame[i]        = level->bd_hatching_delay_cycles;
-    cave->level_hatching_delay_time[i] = level->bd_hatching_delay_seconds;
+  // level settings
+  cave->level_time[0]                  = level->time;
+  cave->level_diamonds[0]              = level->gems_needed;
 
-    cave->level_timevalue[i]           = level->score[SC_TIME_BONUS];
-  }
+  // game timing
+  cave->scheduling                     = level->bd_scheduling_type;
+  cave->pal_timing                     = level->bd_pal_timing;
+  cave->level_speed[0]                 = level->bd_cycle_delay_ms;
+  cave->level_ckdelay[0]               = level->bd_cycle_delay_c64;
+  cave->level_hatching_delay_frame[0]  = level->bd_hatching_delay_cycles;
+  cave->level_hatching_delay_time[0]   = level->bd_hatching_delay_seconds;
 
+  // scores
+  cave->level_timevalue[0]             = level->score[SC_TIME_BONUS];
   cave->diamond_value                  = level->score[SC_EMERALD];
   cave->extra_diamond_value            = level->score[SC_DIAMOND_EXTRA];
 
-  cave->scheduling                     = level->bd_scheduling_type;
-  cave->pal_timing                     = level->bd_pal_timing;
-  cave->intermission                   = level->bd_intermission;
-  cave->diagonal_movements             = level->bd_diagonal_movements;
-  cave->active_is_first_found          = level->bd_topmost_player_active;
-
+  // compatibility settings
   cave->lineshift                      = level->bd_line_shifting_borders;
-  cave->wraparound_objects             = level->bd_wraparound_objects;
   cave->border_scan_first_and_last     = level->bd_scan_first_and_last_row;
   cave->short_explosions               = level->bd_short_explosions;
   cave->gravity_affects_all            = level->bd_gravity_affects_all;
 
+  // player properties
+  cave->diagonal_movements             = level->bd_diagonal_movements;
+  cave->active_is_first_found          = level->bd_topmost_player_active;
+  cave->pushing_stone_prob             = level->bd_pushing_prob            * 10000;
+  cave->pushing_stone_prob_sweet       = level->bd_pushing_prob_with_sweet * 10000;
+  cave->mega_stones_pushable_with_sweet        = level->bd_push_mega_rock_with_sweet;
+
+  // element properties
+  cave->level_magic_wall_time[0]       = level->time_magic_wall;
+
+  // level name
   strncpy(cave->name, level->name, sizeof(GdString));
   cave->name[sizeof(GdString) - 1] = '\0';
 
+  // playfield elements
   for (x = 0; x < cave->w; x++)
     for (y = 0; y < cave->h; y++)
       cave->map[y][x] = map_element_RND_to_BD(level->field[x][y]);
@@ -3799,36 +3818,49 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level)
   level->fieldx = MIN(cave->w, MAX_LEV_FIELDX);
   level->fieldy = MIN(cave->h, MAX_LEV_FIELDY);
 
+  // level type
+  level->bd_intermission               = cave->intermission;
+
+  // level settings
   level->time                          = cave->level_time[bd_level_nr];
   level->gems_needed                   = cave->level_diamonds[bd_level_nr];
-  level->time_magic_wall               = cave->level_magic_wall_time[bd_level_nr];
 
+  // game timing
+  level->bd_scheduling_type            = cave->scheduling;
+  level->bd_pal_timing                 = cave->pal_timing;
   level->bd_cycle_delay_ms             = cave->level_speed[bd_level_nr];
   level->bd_cycle_delay_c64            = cave->level_ckdelay[bd_level_nr];
   level->bd_hatching_delay_cycles      = cave->level_hatching_delay_frame[bd_level_nr];
   level->bd_hatching_delay_seconds     = cave->level_hatching_delay_time[bd_level_nr];
 
+  // scores
   level->score[SC_TIME_BONUS]          = cave->level_timevalue[bd_level_nr];
   level->score[SC_EMERALD]             = cave->diamond_value;
   level->score[SC_DIAMOND_EXTRA]       = cave->extra_diamond_value;
 
-  level->bd_scheduling_type            = cave->scheduling;
-  level->bd_pal_timing                 = cave->pal_timing;
-  level->bd_intermission               = cave->intermission;
-  level->bd_diagonal_movements         = cave->diagonal_movements;
-  level->bd_topmost_player_active      = cave->active_is_first_found;
-
+  // compatibility settings
   level->bd_line_shifting_borders      = cave->lineshift;
-  level->bd_wraparound_objects         = cave->wraparound_objects;
   level->bd_scan_first_and_last_row    = cave->border_scan_first_and_last;
   level->bd_short_explosions           = cave->short_explosions;
   level->bd_gravity_affects_all                = cave->gravity_affects_all;
 
+  // player properties
+  level->bd_diagonal_movements         = cave->diagonal_movements;
+  level->bd_topmost_player_active      = cave->active_is_first_found;
+  level->bd_pushing_prob               = cave->pushing_stone_prob       / 10000;
+  level->bd_pushing_prob_with_sweet    = cave->pushing_stone_prob_sweet / 10000;
+  level->bd_push_mega_rock_with_sweet  = cave->mega_stones_pushable_with_sweet;
+
+  // element properties
+  level->time_magic_wall               = cave->level_magic_wall_time[bd_level_nr];
+
+  // level name
   char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1);
 
   strncpy(level->name, cave_name, MAX_LEVEL_NAME_LEN);
   level->name[MAX_LEVEL_NAME_LEN] = '\0';
 
+  // playfield elements
   for (x = 0; x < level->fieldx; x++)
     for (y = 0; y < level->fieldy; y++)
       level->field[x][y] = map_element_BD_to_RND(cave->map[y][x]);