X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e4c4d0e6052e42826b18671dee2b8e9d8219e160;hb=3b292f6abf8f677bbfdbd9b583c54113b8e64959;hp=040a94481794c49ae1eff1418d2ffd22759d1c95;hpb=0f6b2c62e0c72652c8b2093995845e02b91c51d3;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 040a9448..e4c4d0e6 100644 --- a/src/files.c +++ b/src/files.c @@ -19,6 +19,7 @@ #include "files.h" #include "init.h" #include "screens.h" +#include "editor.h" #include "tools.h" #include "tape.h" #include "config.h" @@ -310,6 +311,41 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = TYPE_INTEGER, CONF_VALUE_8_BIT(23), &li.bd_cave_random_seed_c64, 0 }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(3), + &li.bd_color_b, GD_C64_COLOR(0) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(4), + &li.bd_color_0, GD_C64_COLOR(0) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(5), + &li.bd_color_1, GD_C64_COLOR(8) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(6), + &li.bd_color_2, GD_C64_COLOR(11) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(7), + &li.bd_color_3, GD_C64_COLOR(1) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(8), + &li.bd_color_4, GD_C64_COLOR(5) + }, + { + -1, -1, + TYPE_INTEGER, CONF_VALUE_32_BIT(9), + &li.bd_color_5, GD_C64_COLOR(6) + }, { -1, -1, @@ -2298,6 +2334,11 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) static void setLevelInfoToDefaults_Level(struct LevelInfo *level) { + boolean add_border = FALSE; + int x1 = 0; + int y1 = 0; + int x2 = STD_LEV_FIELDX - 1; + int y2 = STD_LEV_FIELDY - 1; int i, x, y; li = *level; // copy level data into temporary buffer @@ -2333,19 +2374,49 @@ static void setLevelInfoToDefaults_Level(struct LevelInfo *level) strcpy(level->name, NAMELESS_LEVEL_NAME); strcpy(level->author, ANONYMOUS_NAME); + // set default game engine type + level->game_engine_type = setup.default_game_engine_type; + + // some game engines should have a default playfield with border elements + if (level->game_engine_type == GAME_ENGINE_TYPE_BD || + level->game_engine_type == GAME_ENGINE_TYPE_EM || + level->game_engine_type == GAME_ENGINE_TYPE_SP) + { + add_border = TRUE; + x1++; + y1++; + x2--; + y2--; + } + // set level playfield to playable default level with player and exit for (x = 0; x < MAX_LEV_FIELDX; x++) + { for (y = 0; y < MAX_LEV_FIELDY; y++) - level->field[x][y] = EL_SAND; + { + if (add_border && (x == 0 || x == STD_LEV_FIELDX - 1 || + y == 0 || y == STD_LEV_FIELDY - 1)) + level->field[x][y] = getEngineElement(EL_STEELWALL); + else + level->field[x][y] = getEngineElement(EL_SAND); + } + } - level->field[0][0] = EL_PLAYER_1; - level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; + level->field[x1][y1] = getEngineElement(EL_PLAYER_1); + level->field[x2][y2] = getEngineElement(EL_EXIT_CLOSED); - BorderElement = EL_STEELWALL; + BorderElement = getEngineElement(EL_STEELWALL); // detect custom elements when loading them level->file_has_custom_elements = FALSE; + // set random colors for BD style levels according to preferred color type + SetRandomLevelColors_BD(setup.bd_default_color_type); + + // set default color type and colors for BD style level colors + SetDefaultLevelColorType_BD(); + SetDefaultLevelColors_BD(); + // set all bug compatibility flags to "false" => do not emulate this bug level->use_action_after_change_bug = FALSE; @@ -4378,6 +4449,14 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->nitro_explosion_effect = LEVEL_TO_CAVE(level->bd_nitro_explosion_turns_to); cave->explosion_effect = LEVEL_TO_CAVE(level->bd_explosion_turns_to); + cave->colorb = level->bd_color_b; + cave->color0 = level->bd_color_0; + cave->color1 = level->bd_color_1; + cave->color2 = level->bd_color_2; + cave->color3 = level->bd_color_3; + cave->color4 = level->bd_color_4; + cave->color5 = level->bd_color_5; + // level name strncpy(cave->name, level->name, sizeof(GdString)); cave->name[sizeof(GdString) - 1] = '\0'; @@ -4543,6 +4622,18 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_nitro_explosion_turns_to = CAVE_TO_LEVEL(cave->nitro_explosion_effect); level->bd_explosion_turns_to = CAVE_TO_LEVEL(cave->explosion_effect); + level->bd_color_b = cave->colorb; + level->bd_color_0 = cave->color0; + level->bd_color_1 = cave->color1; + level->bd_color_2 = cave->color2; + level->bd_color_3 = cave->color3; + level->bd_color_4 = cave->color4; + level->bd_color_5 = cave->color5; + + // set default color type and colors for BD style level colors + SetDefaultLevelColorType_BD(); + SetDefaultLevelColors_BD(); + // level name char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1); @@ -10664,6 +10755,10 @@ static struct TokenInfo global_setup_tokens[] = TYPE_INTEGER, &setup.game_frame_delay, "game_frame_delay" }, + { + TYPE_INTEGER, + &setup.default_game_engine_type, "default_game_engine_type" + }, { TYPE_SWITCH, &setup.bd_skip_uncovering, "bd_skip_uncovering" @@ -10680,6 +10775,30 @@ static struct TokenInfo global_setup_tokens[] = TYPE_SWITCH3, &setup.bd_smooth_movements, "bd_smooth_movements" }, + { + TYPE_SWITCH3, + &setup.bd_pushing_graphics, "bd_pushing_graphics" + }, + { + TYPE_INTEGER, + &setup.bd_palette_c64, "bd_palette_c64" + }, + { + TYPE_INTEGER, + &setup.bd_palette_c64dtv, "bd_palette_c64dtv" + }, + { + TYPE_INTEGER, + &setup.bd_palette_atari, "bd_palette_atari" + }, + { + TYPE_INTEGER, + &setup.bd_default_color_type, "bd_default_color_type" + }, + { + TYPE_SWITCH, + &setup.bd_random_colors, "bd_random_colors" + }, { TYPE_SWITCH, &setup.sp_show_border_elements, "sp_show_border_elements" @@ -11500,10 +11619,17 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->prefer_extra_panel_items = TRUE; si->game_speed_extended = FALSE; si->game_frame_delay = GAME_FRAME_DELAY; + si->default_game_engine_type = GAME_ENGINE_TYPE_RND; si->bd_skip_uncovering = FALSE; si->bd_skip_hatching = FALSE; si->bd_scroll_delay = TRUE; si->bd_smooth_movements = AUTO; + si->bd_pushing_graphics = TRUE; + 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->bd_default_color_type = GD_DEFAULT_COLOR_TYPE; + si->bd_random_colors = FALSE; si->sp_show_border_elements = FALSE; si->small_game_graphics = FALSE; si->show_load_save_buttons = FALSE;