},
{
- EL_BD_SAND, -1,
+ EL_BD_SAND_1, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_sand_looks_like, EL_BD_SAND
+ &li.bd_sand_looks_like, EL_BD_SAND_1
},
{
- EL_BD_ROCK, -1,
+ EL_BD_ROCK_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_rock_turns_to_on_falling, EL_BD_ROCK_FALLING
+ &li.bd_rock_turns_to_on_falling, EL_BD_ROCK_NATIVE_FALLING
},
{
- EL_BD_ROCK, -1,
+ EL_BD_ROCK_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(2),
- &li.bd_rock_turns_to_on_impact, EL_BD_ROCK
+ &li.bd_rock_turns_to_on_impact, EL_BD_ROCK_NATIVE
},
{
- EL_BD_DIAMOND, -1,
+ EL_BD_DIAMOND_NATIVE, -1,
TYPE_INTEGER, CONF_VALUE_16_BIT(1),
&li.score[SC_DIAMOND_EXTRA], 20
},
{
- EL_BD_DIAMOND, -1,
+ EL_BD_DIAMOND_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(2),
- &li.bd_diamond_turns_to_on_falling, EL_BD_DIAMOND_FALLING
+ &li.bd_diamond_turns_to_on_falling, EL_BD_DIAMOND_NATIVE_FALLING
},
{
- EL_BD_DIAMOND, -1,
+ EL_BD_DIAMOND_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(3),
- &li.bd_diamond_turns_to_on_impact, EL_BD_DIAMOND
+ &li.bd_diamond_turns_to_on_impact, EL_BD_DIAMOND_NATIVE
},
{
- EL_BD_FIREFLY, -1,
+ EL_BD_FIREFLY_1, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_firefly_explodes_to, EL_BD_EXPLODING_1
+ &li.bd_firefly_1_explodes_to, EL_BD_EXPLODING_1
},
{
},
{
- EL_BD_BUTTERFLY, -1,
+ EL_BD_BUTTERFLY_1, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_butterfly_explodes_to, EL_BD_DIAMOND_GROWING_1
+ &li.bd_butterfly_1_explodes_to, EL_BD_DIAMOND_NATIVE_GROWING_1
},
{
EL_BD_BUTTERFLY_2, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_butterfly_2_explodes_to, EL_BD_DIAMOND_GROWING_1
+ &li.bd_butterfly_2_explodes_to, EL_BD_DIAMOND_NATIVE_GROWING_1
},
{
EL_BD_STONEFLY, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_stonefly_explodes_to, EL_BD_ROCK_GROWING_1
+ &li.bd_stonefly_explodes_to, EL_BD_ROCK_NATIVE_GROWING_1
},
{
},
{
- EL_BD_DIAMOND_GROWING_5, -1,
+ EL_BD_DIAMOND_NATIVE_GROWING_5, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_diamond_birth_turns_to, EL_BD_DIAMOND
+ &li.bd_diamond_birth_turns_to, EL_BD_DIAMOND_NATIVE
},
{
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(1),
&li.bd_magic_wall_wait_hatching, FALSE
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
&li.bd_magic_wall_stops_amoeba, TRUE
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(3),
&li.bd_magic_wall_zero_infinite, TRUE
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_BOOLEAN, CONF_VALUE_8_BIT(4),
&li.bd_magic_wall_break_scan, FALSE
},
{
- EL_BD_MAGIC_WALL, -1,
- TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_magic_wall_diamond_to, EL_BD_ROCK_FALLING
+ EL_BD_MAGIC_WALL_NATIVE, -1,
+ TYPE_INTEGER, CONF_VALUE_16_BIT(1),
+ &li.bd_magic_wall_time, 999
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(2),
- &li.bd_magic_wall_rock_to, EL_BD_DIAMOND_FALLING
+ &li.bd_magic_wall_diamond_to, EL_BD_ROCK_NATIVE_FALLING
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(3),
- &li.bd_magic_wall_mega_rock_to, EL_BD_NITRO_PACK_FALLING
+ &li.bd_magic_wall_rock_to, EL_BD_DIAMOND_NATIVE_FALLING
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(4),
- &li.bd_magic_wall_nut_to, EL_BD_NUT_FALLING
+ &li.bd_magic_wall_mega_rock_to, EL_BD_NITRO_PACK_FALLING
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(5),
- &li.bd_magic_wall_nitro_pack_to, EL_BD_MEGA_ROCK_FALLING
+ &li.bd_magic_wall_nut_to, EL_BD_NUT_FALLING
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(6),
- &li.bd_magic_wall_flying_diamond_to, EL_BD_FLYING_ROCK_FLYING
+ &li.bd_magic_wall_nitro_pack_to, EL_BD_MEGA_ROCK_FALLING
},
{
- EL_BD_MAGIC_WALL, -1,
+ EL_BD_MAGIC_WALL_NATIVE, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(7),
+ &li.bd_magic_wall_flying_diamond_to, EL_BD_FLYING_ROCK_FLYING
+ },
+ {
+ EL_BD_MAGIC_WALL_NATIVE, -1,
+ TYPE_ELEMENT, CONF_VALUE_16_BIT(8),
&li.bd_magic_wall_flying_rock_to, EL_BD_FLYING_DIAMOND_FLYING
},
{
EL_BD_SLIME, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_slime_eats_element_1, EL_BD_DIAMOND
+ &li.bd_slime_eats_element_1, EL_BD_DIAMOND_NATIVE
},
{
EL_BD_SLIME, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(2),
- &li.bd_slime_converts_to_element_1, EL_BD_DIAMOND_FALLING
+ &li.bd_slime_converts_to_element_1, EL_BD_DIAMOND_NATIVE_FALLING
},
{
EL_BD_SLIME, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(3),
- &li.bd_slime_eats_element_2, EL_BD_ROCK
+ &li.bd_slime_eats_element_2, EL_BD_ROCK_NATIVE
},
{
EL_BD_SLIME, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(4),
- &li.bd_slime_converts_to_element_2, EL_BD_ROCK_FALLING
+ &li.bd_slime_converts_to_element_2, EL_BD_ROCK_NATIVE_FALLING
},
{
EL_BD_SLIME, -1,
{
EL_BD_ACID, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_acid_eats_element, EL_BD_SAND
+ &li.bd_acid_eats_element, EL_BD_SAND_1
},
{
EL_BD_ACID, -1,
{
EL_BD_BITER, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
- &li.bd_biter_eats_element, EL_BD_DIAMOND
+ &li.bd_biter_eats_element, EL_BD_DIAMOND_NATIVE
},
{
&li.score[SC_CRYSTAL], 10
},
- // (amoeba values used by R'n'D game engine only)
{
EL_BD_AMOEBA, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(1),
TYPE_BOOLEAN, CONF_VALUE_8_BIT(1),
&li.grow_into_diggable, TRUE
},
- // (amoeba values used by BD game engine only)
- {
- EL_BD_AMOEBA, -1,
- TYPE_BOOLEAN, CONF_VALUE_8_BIT(2),
- &li.bd_amoeba_wait_for_hatching, FALSE
- },
+
{
- EL_BD_AMOEBA, -1,
- TYPE_BOOLEAN, CONF_VALUE_8_BIT(3),
- &li.bd_amoeba_start_immediately, TRUE
+ EL_BD_AMOEBA_1, -1,
+ TYPE_INTEGER, CONF_VALUE_16_BIT(1),
+ &li.bd_amoeba_1_threshold_too_big, 200
},
{
- EL_BD_AMOEBA, -1,
- TYPE_BOOLEAN, CONF_VALUE_8_BIT(4),
- &li.bd_amoeba_2_explode_by_amoeba, TRUE
+ EL_BD_AMOEBA_1, -1,
+ TYPE_INTEGER, CONF_VALUE_16_BIT(2),
+ &li.bd_amoeba_1_slow_growth_time, 200
},
{
- EL_BD_AMOEBA, -1,
- TYPE_INTEGER, CONF_VALUE_16_BIT(3),
- &li.bd_amoeba_threshold_too_big, 200
+ EL_BD_AMOEBA_1, -1,
+ TYPE_ELEMENT, CONF_VALUE_16_BIT(3),
+ &li.bd_amoeba_1_content_too_big, EL_BD_ROCK_NATIVE
},
{
- EL_BD_AMOEBA, -1,
- TYPE_INTEGER, CONF_VALUE_16_BIT(4),
- &li.bd_amoeba_slow_growth_time, 200
+ EL_BD_AMOEBA_1, -1,
+ TYPE_ELEMENT, CONF_VALUE_16_BIT(4),
+ &li.bd_amoeba_1_content_enclosed, EL_BD_DIAMOND_NATIVE
},
{
- EL_BD_AMOEBA, -1,
- TYPE_INTEGER, CONF_VALUE_8_BIT(5),
- &li.bd_amoeba_slow_growth_rate, 3
+ EL_BD_AMOEBA_1, -1,
+ TYPE_INTEGER, CONF_VALUE_8_BIT(1),
+ &li.bd_amoeba_1_slow_growth_rate, 3
},
{
- EL_BD_AMOEBA, -1,
- TYPE_INTEGER, CONF_VALUE_8_BIT(6),
- &li.bd_amoeba_fast_growth_rate, 25
+ EL_BD_AMOEBA_1, -1,
+ TYPE_INTEGER, CONF_VALUE_8_BIT(2),
+ &li.bd_amoeba_1_fast_growth_rate, 25
},
{
- EL_BD_AMOEBA, -1,
- TYPE_ELEMENT, CONF_VALUE_16_BIT(5),
- &li.bd_amoeba_content_too_big, EL_BD_ROCK
+ EL_BD_AMOEBA_1, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(3),
+ &li.bd_amoeba_wait_for_hatching, FALSE
},
{
- EL_BD_AMOEBA, -1,
- TYPE_ELEMENT, CONF_VALUE_16_BIT(6),
- &li.bd_amoeba_content_enclosed, EL_BD_DIAMOND
+ EL_BD_AMOEBA_1, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(4),
+ &li.bd_amoeba_start_immediately, TRUE
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_INTEGER, CONF_VALUE_16_BIT(3),
+ TYPE_INTEGER, CONF_VALUE_16_BIT(1),
&li.bd_amoeba_2_threshold_too_big, 200
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_INTEGER, CONF_VALUE_16_BIT(4),
+ TYPE_INTEGER, CONF_VALUE_16_BIT(2),
&li.bd_amoeba_2_slow_growth_time, 200
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_INTEGER, CONF_VALUE_8_BIT(5),
- &li.bd_amoeba_2_slow_growth_rate, 3
+ TYPE_ELEMENT, CONF_VALUE_16_BIT(3),
+ &li.bd_amoeba_2_content_too_big, EL_BD_ROCK_NATIVE
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_INTEGER, CONF_VALUE_8_BIT(6),
- &li.bd_amoeba_2_fast_growth_rate, 25
+ TYPE_ELEMENT, CONF_VALUE_16_BIT(4),
+ &li.bd_amoeba_2_content_enclosed, EL_BD_DIAMOND_NATIVE
},
{
EL_BD_AMOEBA_2, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(5),
- &li.bd_amoeba_2_content_too_big, EL_BD_ROCK
+ &li.bd_amoeba_2_content_exploding, EL_EMPTY
},
{
EL_BD_AMOEBA_2, -1,
TYPE_ELEMENT, CONF_VALUE_16_BIT(6),
- &li.bd_amoeba_2_content_enclosed, EL_BD_DIAMOND
+ &li.bd_amoeba_2_content_looks_like, EL_BD_AMOEBA_2
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_ELEMENT, CONF_VALUE_16_BIT(7),
- &li.bd_amoeba_2_content_exploding, EL_EMPTY
+ TYPE_INTEGER, CONF_VALUE_8_BIT(1),
+ &li.bd_amoeba_2_slow_growth_rate, 3
},
{
EL_BD_AMOEBA_2, -1,
- TYPE_ELEMENT, CONF_VALUE_16_BIT(8),
- &li.bd_amoeba_2_content_looks_like, EL_BD_AMOEBA_2
+ TYPE_INTEGER, CONF_VALUE_8_BIT(2),
+ &li.bd_amoeba_2_fast_growth_rate, 25
+ },
+ {
+ EL_BD_AMOEBA_2, -1,
+ TYPE_BOOLEAN, CONF_VALUE_8_BIT(3),
+ &li.bd_amoeba_2_explode_by_amoeba, TRUE
},
{
cave->voodoo_dies_by_stone = level->bd_voodoo_dies_by_rock;
cave->voodoo_disappear_in_explosion = level->bd_voodoo_vanish_by_explosion;
cave->level_penalty_time[0] = level->bd_voodoo_penalty_time;
- cave->level_magic_wall_time[0] = level->time_magic_wall;
+ cave->level_magic_wall_time[0] = level->bd_magic_wall_time;
cave->magic_timer_zero_is_infinite = level->bd_magic_wall_zero_infinite;
cave->magic_timer_wait_for_hatching = level->bd_magic_wall_wait_hatching;
cave->magic_wall_stops_amoeba = level->bd_magic_wall_stops_amoeba;
cave->amoeba_timer_wait_for_hatching = level->bd_amoeba_wait_for_hatching;
cave->amoeba_timer_started_immediately= level->bd_amoeba_start_immediately;
cave->amoeba_2_explodes_by_amoeba = level->bd_amoeba_2_explode_by_amoeba;
- cave->level_amoeba_threshold[0] = level->bd_amoeba_threshold_too_big;
- cave->level_amoeba_time[0] = level->bd_amoeba_slow_growth_time;
- cave->amoeba_growth_prob = level->bd_amoeba_slow_growth_rate * 10000;
- cave->amoeba_fast_growth_prob = level->bd_amoeba_fast_growth_rate * 10000;
+ cave->level_amoeba_threshold[0] = level->bd_amoeba_1_threshold_too_big;
+ cave->level_amoeba_time[0] = level->bd_amoeba_1_slow_growth_time;
+ cave->amoeba_growth_prob = level->bd_amoeba_1_slow_growth_rate * 10000;
+ cave->amoeba_fast_growth_prob = level->bd_amoeba_1_fast_growth_rate * 10000;
cave->level_amoeba_2_threshold[0] = level->bd_amoeba_2_threshold_too_big;
cave->level_amoeba_2_time[0] = level->bd_amoeba_2_slow_growth_time;
cave->amoeba_2_growth_prob = level->bd_amoeba_2_slow_growth_rate * 10000;
cave->amoeba_2_fast_growth_prob = level->bd_amoeba_2_fast_growth_rate * 10000;
- cave->amoeba_too_big_effect = LEVEL_TO_CAVE(level->bd_amoeba_content_too_big);
- cave->amoeba_enclosed_effect = LEVEL_TO_CAVE(level->bd_amoeba_content_enclosed);
+ cave->amoeba_too_big_effect = LEVEL_TO_CAVE(level->bd_amoeba_1_content_too_big);
+ cave->amoeba_enclosed_effect = LEVEL_TO_CAVE(level->bd_amoeba_1_content_enclosed);
cave->amoeba_2_too_big_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_too_big);
cave->amoeba_2_enclosed_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_enclosed);
cave->amoeba_2_explosion_effect = LEVEL_TO_CAVE(level->bd_amoeba_2_content_exploding);
cave->diamond_falling_effect = LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_falling);
cave->diamond_bouncing_effect = LEVEL_TO_CAVE(level->bd_diamond_turns_to_on_impact);
- cave->firefly_explode_to = LEVEL_TO_CAVE(level->bd_firefly_explodes_to);
+ cave->firefly_explode_to = LEVEL_TO_CAVE(level->bd_firefly_1_explodes_to);
cave->alt_firefly_explode_to = LEVEL_TO_CAVE(level->bd_firefly_2_explodes_to);
- cave->butterfly_explode_to = LEVEL_TO_CAVE(level->bd_butterfly_explodes_to);
+ cave->butterfly_explode_to = LEVEL_TO_CAVE(level->bd_butterfly_1_explodes_to);
cave->alt_butterfly_explode_to = LEVEL_TO_CAVE(level->bd_butterfly_2_explodes_to);
cave->stonefly_explode_to = LEVEL_TO_CAVE(level->bd_stonefly_explodes_to);
cave->dragonfly_explode_to = LEVEL_TO_CAVE(level->bd_dragonfly_explodes_to);
level->bd_voodoo_dies_by_rock = cave->voodoo_dies_by_stone;
level->bd_voodoo_vanish_by_explosion = cave->voodoo_disappear_in_explosion;
level->bd_voodoo_penalty_time = cave->level_penalty_time[bd_level_nr];
- level->time_magic_wall = cave->level_magic_wall_time[bd_level_nr];
+ level->bd_magic_wall_time = cave->level_magic_wall_time[bd_level_nr];
level->bd_magic_wall_zero_infinite = cave->magic_timer_zero_is_infinite;
level->bd_magic_wall_wait_hatching = cave->magic_timer_wait_for_hatching;
level->bd_magic_wall_stops_amoeba = cave->magic_wall_stops_amoeba;
level->bd_amoeba_wait_for_hatching = cave->amoeba_timer_wait_for_hatching;
level->bd_amoeba_start_immediately = cave->amoeba_timer_started_immediately;
level->bd_amoeba_2_explode_by_amoeba = cave->amoeba_2_explodes_by_amoeba;
- level->bd_amoeba_threshold_too_big = cave->level_amoeba_threshold[bd_level_nr];
- level->bd_amoeba_slow_growth_time = cave->level_amoeba_time[bd_level_nr];
- level->bd_amoeba_slow_growth_rate = cave->amoeba_growth_prob / 10000;
- level->bd_amoeba_fast_growth_rate = cave->amoeba_fast_growth_prob / 10000;
+ level->bd_amoeba_1_threshold_too_big = cave->level_amoeba_threshold[bd_level_nr];
+ level->bd_amoeba_1_slow_growth_time = cave->level_amoeba_time[bd_level_nr];
+ level->bd_amoeba_1_slow_growth_rate = cave->amoeba_growth_prob / 10000;
+ level->bd_amoeba_1_fast_growth_rate = cave->amoeba_fast_growth_prob / 10000;
level->bd_amoeba_2_threshold_too_big = cave->level_amoeba_2_threshold[bd_level_nr];
level->bd_amoeba_2_slow_growth_time = cave->level_amoeba_2_time[bd_level_nr];
level->bd_amoeba_2_slow_growth_rate = cave->amoeba_2_growth_prob / 10000;
level->bd_amoeba_2_fast_growth_rate = cave->amoeba_2_fast_growth_prob / 10000;
- level->bd_amoeba_content_too_big = CAVE_TO_LEVEL(cave->amoeba_too_big_effect);
- level->bd_amoeba_content_enclosed = CAVE_TO_LEVEL(cave->amoeba_enclosed_effect);
+ level->bd_amoeba_1_content_too_big = CAVE_TO_LEVEL(cave->amoeba_too_big_effect);
+ level->bd_amoeba_1_content_enclosed = CAVE_TO_LEVEL(cave->amoeba_enclosed_effect);
level->bd_amoeba_2_content_too_big = CAVE_TO_LEVEL(cave->amoeba_2_too_big_effect);
level->bd_amoeba_2_content_enclosed = CAVE_TO_LEVEL(cave->amoeba_2_enclosed_effect);
level->bd_amoeba_2_content_exploding = CAVE_TO_LEVEL(cave->amoeba_2_explosion_effect);
level->bd_diamond_turns_to_on_falling = CAVE_TO_LEVEL(cave->diamond_falling_effect);
level->bd_diamond_turns_to_on_impact = CAVE_TO_LEVEL(cave->diamond_bouncing_effect);
- level->bd_firefly_explodes_to = CAVE_TO_LEVEL(cave->firefly_explode_to);
+ level->bd_firefly_1_explodes_to = CAVE_TO_LEVEL(cave->firefly_explode_to);
level->bd_firefly_2_explodes_to = CAVE_TO_LEVEL(cave->alt_firefly_explode_to);
- level->bd_butterfly_explodes_to = CAVE_TO_LEVEL(cave->butterfly_explode_to);
+ level->bd_butterfly_1_explodes_to = CAVE_TO_LEVEL(cave->butterfly_explode_to);
level->bd_butterfly_2_explodes_to = CAVE_TO_LEVEL(cave->alt_butterfly_explode_to);
level->bd_stonefly_explodes_to = CAVE_TO_LEVEL(cave->stonefly_explode_to);
level->bd_dragonfly_explodes_to = CAVE_TO_LEVEL(cave->dragonfly_explode_to);
TYPE_SWITCH,
&setup.skip_levels, "skip_levels"
},
+ {
+ TYPE_SWITCH_3_STATES,
+ &setup.allow_skipping_levels, "allow_skipping_levels"
+ },
{
TYPE_SWITCH,
&setup.increment_levels, "increment_levels"
&setup.bd_show_invisible_outbox, "bd_show_invisible_outbox"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.bd_smooth_movements, "bd_smooth_movements"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.bd_pushing_graphics, "bd_pushing_graphics"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.bd_up_down_graphics, "bd_up_down_graphics"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.bd_skip_falling_sounds, "bd_skip_falling_sounds"
},
{
&setup.music_set, "music_set"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.override_level_graphics, "override_level_graphics"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.override_level_sounds, "override_level_sounds"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.override_level_music, "override_level_music"
},
{
&setup.debug.show_frames_per_second, "debug.show_frames_per_second"
},
{
- TYPE_SWITCH3,
+ TYPE_SWITCH_3_STATES,
&setup.debug.xsn_mode, "debug.xsn_mode"
},
{
si->team_mode = FALSE;
si->handicap = TRUE;
si->skip_levels = TRUE;
+ si->allow_skipping_levels = STATE_ASK;
si->increment_levels = TRUE;
si->auto_play_next_level = TRUE;
si->count_score_after_game = TRUE;
si->bd_skip_hatching = FALSE;
si->bd_scroll_delay = TRUE;
si->bd_show_invisible_outbox = FALSE;
- si->bd_smooth_movements = AUTO;
- si->bd_pushing_graphics = TRUE;
- si->bd_up_down_graphics = TRUE;
- si->bd_skip_falling_sounds = AUTO;
+ si->bd_smooth_movements = STATE_AUTO;
+ si->bd_pushing_graphics = STATE_TRUE;
+ si->bd_up_down_graphics = STATE_TRUE;
+ si->bd_skip_falling_sounds = STATE_AUTO;
si->bd_palette_c64 = GD_DEFAULT_PALETTE_C64;
si->bd_palette_c64dtv = GD_DEFAULT_PALETTE_C64DTV;
si->bd_palette_atari = GD_DEFAULT_PALETTE_ATARI;
si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR);
si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR);
- si->override_level_graphics = FALSE;
- si->override_level_sounds = FALSE;
- si->override_level_music = FALSE;
+ si->override_level_graphics = STATE_FALSE;
+ si->override_level_sounds = STATE_FALSE;
+ si->override_level_music = STATE_FALSE;
si->volume_simple = 100; // percent
si->volume_loops = 100; // percent
si->debug.show_frames_per_second = FALSE;
- si->debug.xsn_mode = AUTO;
+ si->debug.xsn_mode = STATE_AUTO;
si->debug.xsn_percent = 0;
si->options.verbose = FALSE;
fprintf(file, "\n");
for (i = 0; i < ARRAY_SIZE(debug_setup_tokens); i++)
if (!strPrefix(debug_setup_tokens[i].text, "debug.xsn_") ||
- setup.debug.xsn_mode != AUTO)
+ setup.debug.xsn_mode != STATE_AUTO)
fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i));
fprintf(file, "\n");
projects / rocksndiamonds.git / blobdiff