X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=2db82d002cd1829e4f432a940e5cff02cde3c3f9;hb=c50ed169cbd9ea0a7ed120a2f6dc0042a84e104a;hp=b5ac78f262ebe17e97bfd604d879abc8431c3df3;hpb=61f59465af979e21d8cb1b6ee790bc5025549d15;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index b5ac78f2..2db82d00 100644 --- a/src/files.c +++ b/src/files.c @@ -165,7 +165,6 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = TYPE_INTEGER, CONF_VALUE_8_BIT(1), &li.game_engine_type, GAME_ENGINE_TYPE_RND }, - { -1, SAVE_CONF_ALWAYS, TYPE_INTEGER, CONF_VALUE_16_BIT(1), @@ -176,155 +175,140 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = TYPE_INTEGER, CONF_VALUE_16_BIT(2), &li.fieldy, STD_LEV_FIELDY }, - { -1, SAVE_CONF_ALWAYS, TYPE_INTEGER, CONF_VALUE_16_BIT(3), &li.time, 100 }, - { -1, SAVE_CONF_ALWAYS, TYPE_INTEGER, CONF_VALUE_16_BIT(4), &li.gems_needed, 0 }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_32_BIT(2), &li.random_seed, 0 }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), &li.use_step_counter, FALSE }, - { -1, -1, TYPE_BITFIELD, CONF_VALUE_8_BIT(4), &li.wind_direction_initial, MV_NONE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(5), &li.em_slippery_gems, FALSE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(6), &li.use_custom_template, FALSE }, - { -1, -1, TYPE_BITFIELD, CONF_VALUE_32_BIT(1), &li.can_move_into_acid_bits, ~0 // default: everything can }, - { -1, -1, TYPE_BITFIELD, CONF_VALUE_8_BIT(7), &li.dont_collide_with_bits, ~0 // default: always deadly }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(8), &li.em_explodes_by_fire, FALSE }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_16_BIT(5), &li.score[SC_TIME_BONUS], 1 }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(9), &li.auto_exit_sokoban, FALSE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(10), &li.auto_count_gems, FALSE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(11), &li.solved_by_one_player, FALSE }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(12), &li.time_score_base, 1 }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(13), &li.rate_time_over_score, FALSE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(14), &li.bd_intermission, FALSE }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(15), &li.bd_scheduling_type, GD_SCHEDULING_MILLISECONDS }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(16), &li.bd_pal_timing, FALSE }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_16_BIT(6), &li.bd_cycle_delay_ms, 200 }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(17), &li.bd_cycle_delay_c64, 0 }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(18), &li.bd_hatching_delay_cycles, 21 }, - { -1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(19), &li.bd_hatching_delay_seconds, 2 }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(20), &li.bd_line_shifting_borders, FALSE }, - { -1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(21), - &li.bd_wraparound_objects, FALSE + &li.bd_scan_first_and_last_row, TRUE + }, + { + -1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(22), + &li.bd_short_explosions, TRUE + }, + { + -1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(23), + &li.bd_gravity_affects_all, TRUE }, { @@ -623,6 +607,26 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), &li.bd_diagonal_movements, FALSE }, + { + EL_BD_PLAYER, -1, + 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, @@ -630,6 +634,17 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.score[SC_DIAMOND_EXTRA], 20 }, + { + EL_BD_MAGIC_WALL, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_magic_wall_wait_hatching, FALSE + }, + { + EL_BD_MAGIC_WALL, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.bd_magic_wall_stops_amoeba, TRUE + }, + // (the following values are related to various game elements) { @@ -3751,41 +3766,56 @@ 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; + // compatibility settings + cave->lineshift = level->bd_line_shifting_borders; + 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; - cave->lineshift = level->bd_line_shifting_borders; - cave->wraparound_objects = level->bd_wraparound_objects; + // element properties + cave->level_magic_wall_time[0] = level->time_magic_wall; + cave->magic_timer_wait_for_hatching = level->bd_magic_wall_wait_hatching; + cave->magic_wall_stops_amoeba = level->bd_magic_wall_stops_amoeba; + // 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]); @@ -3801,32 +3831,51 @@ 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; + // compatibility settings + level->bd_line_shifting_borders = cave->lineshift; + 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; - level->bd_line_shifting_borders = cave->lineshift; - level->bd_wraparound_objects = cave->wraparound_objects; + // element properties + level->time_magic_wall = cave->level_magic_wall_time[bd_level_nr]; + level->bd_magic_wall_wait_hatching = cave->magic_timer_wait_for_hatching; + level->bd_magic_wall_stops_amoeba = cave->magic_wall_stops_amoeba; + // 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]);