X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e49a2965922169e7d4ffb495061232afcde7b5ca;hb=84f2d2359ecfa6253804b353f92dd9b2ccb55887;hp=0482ba8d65b1b6bcc33b59936a115d92b71f5d1b;hpb=42ab1555a4ae65badec13e8ef32bf5ff71c34568;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 0482ba8d..e49a2965 100644 --- a/src/files.c +++ b/src/files.c @@ -203,6 +203,44 @@ static struct EL_TIME_ORB_FULL, CONF_VALUE_BOOLEAN_1, &li.use_time_orb_bug, FALSE }, + { + EL_PLAYER_1, CONF_VALUE_BOOLEAN_1, + &li.block_snap_field, TRUE + }, + { + EL_PLAYER_1, CONF_VALUE_BOOLEAN_2, + &li.use_start_element[0], FALSE + }, + { + EL_PLAYER_2, CONF_VALUE_ELEMENT_2, + &li.use_start_element[1], FALSE + }, + { + EL_PLAYER_3, CONF_VALUE_ELEMENT_2, + &li.use_start_element[2], FALSE + }, + { + EL_PLAYER_4, CONF_VALUE_ELEMENT_2, + &li.use_start_element[3], FALSE + }, + + /* ---------- 2-byte values ---------------------------------------------- */ + { + EL_PLAYER_1, CONF_VALUE_ELEMENT_1, + &li.start_element[0], EL_PLAYER_1 + }, + { + EL_PLAYER_2, CONF_VALUE_ELEMENT_1, + &li.start_element[1], EL_PLAYER_2 + }, + { + EL_PLAYER_3, CONF_VALUE_ELEMENT_1, + &li.start_element[2], EL_PLAYER_3 + }, + { + EL_PLAYER_4, CONF_VALUE_ELEMENT_1, + &li.start_element[3], EL_PLAYER_4 + }, /* ---------- multi-byte values ------------------------------------------ */ { @@ -304,7 +342,7 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) change->delay_fixed = 0; change->delay_random = 0; - change->delay_frames = 1; + change->delay_frames = FRAMES_PER_SECOND; change->trigger_element = EL_EMPTY_SPACE; @@ -2836,12 +2874,12 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) if (level->game_version < VERSION_IDENT(2,2,0,0)) level->use_spring_bug = TRUE; - /* time orb caused limited time in endless time levels before 3.1.2 */ - if (level->game_version < VERSION_IDENT(3,1,2,0)) + /* time orb caused limited time in endless time levels before 3.2.0-5 */ + if (level->game_version < VERSION_IDENT(3,2,0,5)) level->use_time_orb_bug = TRUE; - /* default behaviour for snapping was "no snap delay" before 3.1.2 */ - if (level->game_version < VERSION_IDENT(3,1,2,0)) + /* default behaviour for snapping was "no snap delay" before 3.2.0-5 */ + if (level->game_version < VERSION_IDENT(3,2,0,5)) level->block_snap_field = FALSE; /* only few elements were able to actively move into acid before 3.1.0 */