X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=8197672ac21cf85370818650e8d31c725fe95319;hb=dc9fe7359bd0b8dea49f46b9fb2e59f006200a63;hp=a164fdfd4e3452d41d5cdc8fa92fed903fab3df5;hpb=440971997e0b8de3ec7c5ba8d3f577abbdeaa87e;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index a164fdfd..8197672a 100644 --- a/src/files.c +++ b/src/files.c @@ -770,6 +770,12 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.bd_conveyor_belts_changed, FALSE }, + { + EL_BD_WATER, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_water_cannot_flow_down, FALSE + }, + // (the following values are related to various game elements) { @@ -4073,6 +4079,8 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->conveyor_belts_active = level->bd_conveyor_belts_active; cave->conveyor_belts_direction_changed= level->bd_conveyor_belts_changed; + cave->water_does_not_flow_down = level->bd_water_cannot_flow_down; + // level name strncpy(cave->name, level->name, sizeof(GdString)); cave->name[sizeof(GdString) - 1] = '\0'; @@ -4180,6 +4188,8 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->bd_conveyor_belts_active = cave->conveyor_belts_active; level->bd_conveyor_belts_changed = cave->conveyor_belts_direction_changed; + level->bd_water_cannot_flow_down = cave->water_does_not_flow_down; + // level name char *cave_name = getStringPrint("%s / %d", cave->name, bd_level_nr + 1); @@ -10522,6 +10532,10 @@ static struct TokenInfo editor_cascade_setup_tokens[] = TYPE_SWITCH, &setup.editor_cascade.el_bd_native, "editor.cascade.el_bd_native" }, + { + TYPE_SWITCH, + &setup.editor_cascade.el_bd_effects, "editor.cascade.el_bd_effects" + }, { TYPE_SWITCH, &setup.editor_cascade.el_em, "editor.cascade.el_em" @@ -11216,6 +11230,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->editor.el_boulderdash = TRUE; si->editor.el_boulderdash_native = TRUE; + si->editor.el_boulderdash_effects = TRUE; si->editor.el_emerald_mine = TRUE; si->editor.el_emerald_mine_club = TRUE; si->editor.el_more = TRUE; @@ -11390,6 +11405,7 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) { si->editor_cascade.el_bd = TRUE; si->editor_cascade.el_bd_native = TRUE; + si->editor_cascade.el_bd_effects = FALSE; si->editor_cascade.el_em = TRUE; si->editor_cascade.el_emc = TRUE; si->editor_cascade.el_rnd = TRUE;