code formatting changes
authorHolger Schemel <holger.schemel@virtion.de>
Sat, 17 Aug 2024 23:38:04 +0000 (01:38 +0200)
committerHolger Schemel <holger.schemel@virtion.de>
Sat, 17 Aug 2024 23:42:08 +0000 (01:42 +0200)
src/game_bd/bd_c64import.c
src/game_bd/bd_caveset.c

index c89fdd020817e3dd2195fc6263aab620596290ef..02c9909e5b9a611e8a5000db693b2bbaed8dba58 100644 (file)
@@ -204,218 +204,222 @@ const GdElement gd_crazylight_import_table[] =
 
 GdPropertyDefault gd_defaults_bd1[] =
 {
-  { CAVE_OFFSET(level_amoeba_threshold), 200 },
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), TRUE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(diagonal_movements), FALSE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), FALSE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), FALSE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), TRUE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_backwards), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_time), 0 },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), TRUE },
-  { CAVE_OFFSET(intermission_rewardlife), FALSE },
-  { CAVE_OFFSET(magic_wall_stops_amoeba), TRUE },
-  { CAVE_OFFSET(magic_wall_breakscan), TRUE },
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), TRUE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), FALSE },
-  { CAVE_OFFSET(short_explosions), TRUE },
-  { CAVE_OFFSET(slime_predictable), TRUE },
-  { CAVE_OFFSET(snap_element), O_SPACE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_BD1 },
-  { CAVE_OFFSET(pal_timing), TRUE },
+  { CAVE_OFFSET(level_amoeba_threshold),                       200                     },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             TRUE                    },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               FALSE                   },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(diagonal_movements),                           FALSE                   },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     FALSE                   },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         FALSE                   },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        TRUE                    },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_backwards),                          FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_time),         0                       },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     TRUE                    },
+  { CAVE_OFFSET(intermission_rewardlife),                      FALSE                   },
+  { CAVE_OFFSET(magic_wall_stops_amoeba),                      TRUE                    },
+  { CAVE_OFFSET(magic_wall_breakscan),                         TRUE                    },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 TRUE                    },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        FALSE                   },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                FALSE                   },
+  { CAVE_OFFSET(short_explosions),                             TRUE                    },
+  { CAVE_OFFSET(slime_predictable),                            TRUE                    },
+  { CAVE_OFFSET(snap_element),                                 O_SPACE                 },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_BD1       },
 
   { -1 },
 };
 
 GdPropertyDefault gd_defaults_bd2[] =
 {
-  { CAVE_OFFSET(level_amoeba_threshold), 200 },
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), FALSE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(diagonal_movements), FALSE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), FALSE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), FALSE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), TRUE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_backwards), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_time), 0 },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), TRUE },
-  { CAVE_OFFSET(intermission_rewardlife), FALSE },
-  { CAVE_OFFSET(magic_wall_stops_amoeba), FALSE },    // marek roth bd inside faq 3.0
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), TRUE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), FALSE },
-  { CAVE_OFFSET(short_explosions), TRUE },
-  { CAVE_OFFSET(slime_predictable), TRUE },
-  { CAVE_OFFSET(snap_element), O_SPACE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(pal_timing), TRUE },
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_BD2 },
+  { CAVE_OFFSET(level_amoeba_threshold),                       200                     },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             FALSE                   },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               FALSE                   },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(diagonal_movements),                           FALSE                   },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     FALSE                   },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         FALSE                   },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        TRUE                    },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_backwards),                          FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_time),         0                       },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     TRUE                    },
+  { CAVE_OFFSET(intermission_rewardlife),                      FALSE                   },
+  // marek roth bd inside faq 3.0
+  { CAVE_OFFSET(magic_wall_stops_amoeba),                      FALSE                   },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 TRUE                    },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        FALSE                   },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                FALSE                   },
+  { CAVE_OFFSET(short_explosions),                             TRUE                    },
+  { CAVE_OFFSET(slime_predictable),                            TRUE                    },
+  { CAVE_OFFSET(snap_element),                                 O_SPACE                 },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_BD2       },
 
   { -1 },
 };
 
 GdPropertyDefault gd_defaults_plck[] =
 {
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), FALSE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(border_scan_first_and_last), FALSE },
-  { CAVE_OFFSET(diagonal_movements), FALSE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), FALSE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), FALSE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), TRUE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_backwards), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_time), 0 },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), TRUE },
-  { CAVE_OFFSET(intermission_rewardlife), FALSE },
-  { CAVE_OFFSET(magic_wall_stops_amoeba), FALSE },
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), TRUE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), FALSE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), FALSE },
-  { CAVE_OFFSET(short_explosions), TRUE },
-  { CAVE_OFFSET(snap_element), O_SPACE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(pal_timing), TRUE },
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_PLCK },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             FALSE                   },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               FALSE                   },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(border_scan_first_and_last),                   FALSE                   },
+  { CAVE_OFFSET(diagonal_movements),                           FALSE                   },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     FALSE                   },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         FALSE                   },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        TRUE                    },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_backwards),                          FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_time),         0                       },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     TRUE                    },
+  { CAVE_OFFSET(intermission_rewardlife),                      FALSE                   },
+  { CAVE_OFFSET(magic_wall_stops_amoeba),                      FALSE                   },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 TRUE                    },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        FALSE                   },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                FALSE                   },
+  { CAVE_OFFSET(short_explosions),                             TRUE                    },
+  { CAVE_OFFSET(snap_element),                                 O_SPACE                 },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_PLCK      },
 
   { -1 },
 };
 
 GdPropertyDefault gd_defaults_1stb[] =
 {
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), FALSE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), TRUE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), TRUE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), FALSE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), TRUE },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), FALSE },
-  { CAVE_OFFSET(intermission_rewardlife), TRUE },
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), TRUE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), TRUE },
-  { CAVE_OFFSET(short_explosions), FALSE },
-  { CAVE_OFFSET(slime_predictable), TRUE },
-  { CAVE_OFFSET(snap_element), O_SPACE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(pal_timing), TRUE },
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_PLCK },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             FALSE                   },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               TRUE                    },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     TRUE                    },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         TRUE                    },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        FALSE                   },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     TRUE                    },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     FALSE                   },
+  { CAVE_OFFSET(intermission_rewardlife),                      TRUE                    },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 TRUE                    },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        TRUE                    },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                TRUE                    },
+  { CAVE_OFFSET(short_explosions),                             FALSE                   },
+  { CAVE_OFFSET(slime_predictable),                            TRUE                    },
+  { CAVE_OFFSET(snap_element),                                 O_SPACE                 },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_PLCK      },
+
   // not immediately to diamond, but with animation
-  { CAVE_OFFSET(amoeba_enclosed_effect), O_PRE_DIA_1 },
-  { CAVE_OFFSET(dirt_looks_like), O_DIRT2 },
+  { CAVE_OFFSET(amoeba_enclosed_effect),                       O_PRE_DIA_1             },
+  { CAVE_OFFSET(dirt_looks_like),                              O_DIRT2                 },
 
   { -1 },
 };
 
 GdPropertyDefault gd_defaults_crdr_7[] =
 {
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), FALSE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), TRUE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), TRUE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), FALSE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), FALSE },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), FALSE },
-  { CAVE_OFFSET(intermission_rewardlife), TRUE },
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), FALSE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), TRUE },
-  { CAVE_OFFSET(short_explosions), FALSE },
-  { CAVE_OFFSET(slime_predictable), TRUE },
-  { CAVE_OFFSET(snap_element), O_SPACE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(pal_timing), TRUE },
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_CRDR },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             FALSE                   },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               TRUE                    },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     TRUE                    },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         TRUE                    },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        FALSE                   },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     FALSE                   },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     FALSE                   },
+  { CAVE_OFFSET(intermission_rewardlife),                      TRUE                    },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 FALSE                   },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        TRUE                    },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                TRUE                    },
+  { CAVE_OFFSET(short_explosions),                             FALSE                   },
+  { CAVE_OFFSET(slime_predictable),                            TRUE                    },
+  { CAVE_OFFSET(snap_element),                                 O_SPACE                 },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_CRDR      },
+
   // not immediately to diamond, but with animation
-  { CAVE_OFFSET(amoeba_enclosed_effect), O_PRE_DIA_1 },
-  { CAVE_OFFSET(water_does_not_flow_down), TRUE },
+  { CAVE_OFFSET(amoeba_enclosed_effect),                       O_PRE_DIA_1             },
+  { CAVE_OFFSET(water_does_not_flow_down),                     TRUE                    },
   // in crdr, skeletons can also be used to open the gate
-  { CAVE_OFFSET(skeletons_worth_diamonds), 1 },
+  { CAVE_OFFSET(skeletons_worth_diamonds),                     1                       },
   // the intermission "survive" needs this flag
-  { CAVE_OFFSET(gravity_affects_all), FALSE },
+  { CAVE_OFFSET(gravity_affects_all),                          FALSE                   },
 
   { -1 },
 };
 
 GdPropertyDefault gd_defaults_crli[] =
 {
-  { CAVE_OFFSET(amoeba_growth_prob), 31250 },
-  { CAVE_OFFSET(amoeba_fast_growth_prob), 250000 },
-  { CAVE_OFFSET(amoeba_timer_started_immediately), FALSE },
-  { CAVE_OFFSET(amoeba_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(lineshift), TRUE },
-  { CAVE_OFFSET(wraparound_objects), TRUE },
-  { CAVE_OFFSET(voodoo_collects_diamonds), TRUE },
-  { CAVE_OFFSET(voodoo_dies_by_stone), TRUE },
-  { CAVE_OFFSET(voodoo_disappear_in_explosion), FALSE },
-  { CAVE_OFFSET(voodoo_any_hurt_kills_player), FALSE },
-  { CAVE_OFFSET(creatures_direction_auto_change_on_start), FALSE },
-  { CAVE_OFFSET(level_hatching_delay_time[0]), 2 },
-  { CAVE_OFFSET(intermission_instantlife), FALSE },
-  { CAVE_OFFSET(intermission_rewardlife), TRUE },
-  { CAVE_OFFSET(magic_timer_zero_is_infinite), FALSE },
-  { CAVE_OFFSET(magic_timer_wait_for_hatching), TRUE },
-  { CAVE_OFFSET(pushing_stone_prob), 250000 },
-  { CAVE_OFFSET(pushing_stone_prob_sweet), 1000000 },
-  { CAVE_OFFSET(active_is_first_found), TRUE },
-  { CAVE_OFFSET(short_explosions), FALSE },
-  { CAVE_OFFSET(slime_predictable), TRUE },
-  { CAVE_OFFSET(max_time), 999 },
-
-  { CAVE_OFFSET(pal_timing), TRUE },
-  { CAVE_OFFSET(scheduling), GD_SCHEDULING_PLCK },
+  { CAVE_OFFSET(amoeba_growth_prob),                           31250                   },
+  { CAVE_OFFSET(amoeba_fast_growth_prob),                      250000                  },
+  { CAVE_OFFSET(amoeba_timer_started_immediately),             FALSE                   },
+  { CAVE_OFFSET(amoeba_timer_wait_for_hatching),               TRUE                    },
+  { CAVE_OFFSET(lineshift),                                    TRUE                    },
+  { CAVE_OFFSET(wraparound_objects),                           TRUE                    },
+  { CAVE_OFFSET(voodoo_collects_diamonds),                     TRUE                    },
+  { CAVE_OFFSET(voodoo_dies_by_stone),                         TRUE                    },
+  { CAVE_OFFSET(voodoo_disappear_in_explosion),                        FALSE                   },
+  { CAVE_OFFSET(voodoo_any_hurt_kills_player),                 FALSE                   },
+  { CAVE_OFFSET(creatures_direction_auto_change_on_start),     FALSE                   },
+  { CAVE_OFFSET(level_hatching_delay_time[0]),                 2                       },
+  { CAVE_OFFSET(intermission_instantlife),                     FALSE                   },
+  { CAVE_OFFSET(intermission_rewardlife),                      TRUE                    },
+  { CAVE_OFFSET(magic_timer_zero_is_infinite),                 FALSE                   },
+  { CAVE_OFFSET(magic_timer_wait_for_hatching),                        TRUE                    },
+  { CAVE_OFFSET(pushing_stone_prob),                           250000                  },
+  { CAVE_OFFSET(pushing_stone_prob_sweet),                     1000000                 },
+  { CAVE_OFFSET(active_is_first_found),                                TRUE                    },
+  { CAVE_OFFSET(short_explosions),                             FALSE                   },
+  { CAVE_OFFSET(slime_predictable),                            TRUE                    },
+  { CAVE_OFFSET(max_time),                                     999                     },
+
+  { CAVE_OFFSET(pal_timing),                                   TRUE                    },
+  { CAVE_OFFSET(scheduling),                                   GD_SCHEDULING_PLCK      },
+
   // not immediately to diamond, but with animation
-  { CAVE_OFFSET(amoeba_enclosed_effect), O_PRE_DIA_1 },
+  { CAVE_OFFSET(amoeba_enclosed_effect),                       O_PRE_DIA_1             },
 
   { -1 },
 };
index 0ee9c3b82d9ee59208d0bd0b0d2c2bc8f2f6ee25..366502d3acc433da837b1e63723a870aadd9bbfb 100644 (file)
@@ -48,35 +48,89 @@ char *gd_caveset_extensions[] =
 const GdStructDescriptor gd_caveset_properties[] =
 {
   // default data
-  {"", GD_TAB, 0, N_("Caveset data")},
-  {"Name", GD_TYPE_STRING, 0, N_("Name"), CAVESET_OFFSET(name), 1, N_("Name of the game")},
-  {"Description", GD_TYPE_STRING, 0, N_("Description"), CAVESET_OFFSET(description), 1, N_("Some words about the game")},
-  {"Author", GD_TYPE_STRING, 0, N_("Author"), CAVESET_OFFSET(author), 1, N_("Name of author")},
-  {"Date", GD_TYPE_STRING, 0, N_("Date"), CAVESET_OFFSET(date), 1, N_("Date of creation")},
-  {"WWW", GD_TYPE_STRING, 0, N_("WWW"), CAVESET_OFFSET(www), 1, N_("Web page or e-mail address")},
-  {"Difficulty", GD_TYPE_STRING, 0, N_("Difficulty"), CAVESET_OFFSET(difficulty), 1, N_("Difficulty (informative)")},
-
-  {"Lives", GD_TYPE_INT, 0, N_("Initial lives"), CAVESET_OFFSET(initial_lives), 1, N_("Number of lives you get at game start."), 3, 9},
-  {"Lives", GD_TYPE_INT, 0, N_("Maximum lives"), CAVESET_OFFSET(maximum_lives), 1, N_("Maximum number of lives you can have by collecting bonus points."), 3, 99},
-  {"BonusLife", GD_TYPE_INT, 0, N_("Bonus life score"), CAVESET_OFFSET(bonus_life_score), 1, N_("Number of points to collect for a bonus life."), 100, 5000},
-
-  {"Story", GD_TYPE_LONGSTRING, 0, N_("Story"), CAVESET_OFFSET(story), 1, N_("Long description of the game.")},
-  {"Remark", GD_TYPE_LONGSTRING, 0, N_("Remark"), CAVESET_OFFSET(remark), 1, N_("Remark (informative).")},
-
-  {"TitleScreen", GD_TYPE_LONGSTRING, GD_DONT_SHOW_IN_EDITOR, N_("Title screen"), CAVESET_OFFSET(title_screen), 1, N_("Title screen image")},
-  {"TitleScreenScroll", GD_TYPE_LONGSTRING, GD_DONT_SHOW_IN_EDITOR, N_("Title screen, scrolling"), CAVESET_OFFSET(title_screen_scroll), 1, N_("Scrolling background for title screen image")},
+  {
+    "", GD_TAB, 0,
+    N_("Caveset data")
+  },
+  {
+    "Name", GD_TYPE_STRING, 0,
+    N_("Name"), CAVESET_OFFSET(name), 1,
+    N_("Name of the game")
+  },
+  {
+    "Description", GD_TYPE_STRING, 0,
+    N_("Description"), CAVESET_OFFSET(description), 1,
+    N_("Some words about the game")
+  },
+  {
+    "Author", GD_TYPE_STRING, 0,
+    N_("Author"), CAVESET_OFFSET(author), 1,
+    N_("Name of author")
+  },
+  {
+    "Date", GD_TYPE_STRING, 0,
+    N_("Date"), CAVESET_OFFSET(date), 1,
+    N_("Date of creation")
+  },
+  {
+    "WWW", GD_TYPE_STRING, 0,
+    N_("WWW"), CAVESET_OFFSET(www), 1,
+    N_("Web page or e-mail address")
+  },
+  {
+    "Difficulty", GD_TYPE_STRING, 0,
+    N_("Difficulty"), CAVESET_OFFSET(difficulty), 1,
+    N_("Difficulty (informative)")
+  },
+  {
+    "Lives", GD_TYPE_INT, 0,
+    N_("Initial lives"), CAVESET_OFFSET(initial_lives), 1,
+    N_("Number of lives you get at game start."), 3, 9
+  },
+  {
+    "Lives", GD_TYPE_INT, 0,
+    N_("Maximum lives"), CAVESET_OFFSET(maximum_lives), 1,
+    N_("Maximum number of lives you can have by collecting bonus points."), 3, 99
+  },
+  {
+    "BonusLife", GD_TYPE_INT, 0,
+    N_("Bonus life score"), CAVESET_OFFSET(bonus_life_score), 1,
+    N_("Number of points to collect for a bonus life."), 100, 5000
+  },
+  {
+    "Story", GD_TYPE_LONGSTRING, 0,
+    N_("Story"), CAVESET_OFFSET(story), 1,
+    N_("Long description of the game.")
+  },
+  {
+    "Remark", GD_TYPE_LONGSTRING, 0,
+    N_("Remark"), CAVESET_OFFSET(remark), 1,
+    N_("Remark (informative).")
+  },
+  {
+    "TitleScreen", GD_TYPE_LONGSTRING, GD_DONT_SHOW_IN_EDITOR,
+    N_("Title screen"), CAVESET_OFFSET(title_screen), 1,
+    N_("Title screen image")
+  },
+  {
+    "TitleScreenScroll", GD_TYPE_LONGSTRING, GD_DONT_SHOW_IN_EDITOR,
+    N_("Title screen, scrolling"), CAVESET_OFFSET(title_screen_scroll), 1,
+    N_("Scrolling background for title screen image")
+  },
 
-  {NULL},
+  {
+    NULL
+  },
 };
 
 static GdPropertyDefault caveset_defaults[] =
 {
   // default data
-  {CAVESET_OFFSET(initial_lives), 3},
-  {CAVESET_OFFSET(maximum_lives), 9},
-  {CAVESET_OFFSET(bonus_life_score), 500},
+  { CAVESET_OFFSET(initial_lives),     3       },
+  { CAVESET_OFFSET(maximum_lives),     9       },
+  { CAVESET_OFFSET(bonus_life_score),  500     },
 
-  {-1},
+  { -1 },
 };
 
 GdCavesetData *gd_caveset_data_new(void)