X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=929d38dc1953343fe52c1460061fd6a4def30e83;hb=43088f3908d6b92f5f26d93a1f9067effadbcc8c;hp=e78e7ab872bab62d8d36dfda37f2a3905220c8cd;hpb=57f6ae0759f8f895ad1fc88a4eb2279404a8bb2c;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index e78e7ab8..929d38dc 100644 --- a/src/files.c +++ b/src/files.c @@ -29,7 +29,7 @@ #define CHUNK_SIZE_NONE -1 /* do not write chunk size */ #define FILE_VERS_CHUNK_SIZE 8 /* size of file version chunk */ #define LEVEL_HEADER_SIZE 80 /* size of level file header */ -#define LEVEL_HEADER_UNUSED 4 /* unused level header bytes */ +#define LEVEL_HEADER_UNUSED 1 /* unused level header bytes */ #define LEVEL_CHUNK_CNT2_SIZE 160 /* size of level CNT2 chunk */ #define LEVEL_CHUNK_CNT2_UNUSED 11 /* unused CNT2 chunk bytes */ #define LEVEL_CHUNK_CNT3_HEADER 16 /* size of level CNT3 header */ @@ -106,15 +106,15 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) change->trigger_element = EL_EMPTY_SPACE; change->explode = FALSE; - change->use_content = FALSE; - change->only_complete = FALSE; - change->use_random_change = FALSE; - change->random = 100; - change->power = CP_NON_DESTRUCTIVE; + change->use_target_content = FALSE; + change->only_if_complete = FALSE; + change->use_random_replace = FALSE; + change->random_percentage = 100; + change->replace_when = CP_WHEN_EMPTY; for (x = 0; x < 3; x++) for (y = 0; y < 3; y++) - change->content[x][y] = EL_EMPTY_SPACE; + change->target_content[x][y] = EL_EMPTY_SPACE; change->direct_action = 0; change->other_action = 0; @@ -126,6 +126,8 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) static void setLevelInfoToDefaults(struct LevelInfo *level) { + static boolean clipboard_elements_initialized = FALSE; + int i, j, x, y; level->file_version = FILE_VERSION_ACTUAL; @@ -159,6 +161,9 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->em_slippery_gems = FALSE; level->block_last_field = FALSE; level->sp_block_last_field = TRUE; + level->instant_relocation = FALSE; + level->can_pass_to_walkable = FALSE; + level->grow_into_diggable = TRUE; level->can_move_into_acid_bits = ~0; /* everything can move into acid */ level->dont_collide_with_bits = ~0; /* always deadly when colliding */ @@ -200,10 +205,16 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) { int element = i; + /* never initialize clipboard elements after the very first time */ + if (IS_CLIPBOARD_ELEMENT(element) && clipboard_elements_initialized) + continue; + setElementChangePages(&element_info[element], 1); setElementChangeInfoToDefaults(element_info[element].change); - if (IS_CUSTOM_ELEMENT(element) || IS_GROUP_ELEMENT(element)) + if (IS_CUSTOM_ELEMENT(element) || + IS_GROUP_ELEMENT(element) || + IS_INTERNAL_ELEMENT(element)) { for (j = 0; j < MAX_ELEMENT_NAME_LEN + 1; j++) element_info[element].description[j] = '\0'; @@ -219,7 +230,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].gfx_element = EL_EMPTY_SPACE; } - if (IS_CUSTOM_ELEMENT(element)) + if (IS_CUSTOM_ELEMENT(element) || + IS_INTERNAL_ELEMENT(element)) { element_info[element].access_direction = MV_ALL_DIRECTIONS; @@ -228,6 +240,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].push_delay_fixed = -1; /* initialize later */ element_info[element].push_delay_random = -1; /* initialize later */ + element_info[element].drop_delay_fixed = 0; + element_info[element].drop_delay_random = 0; element_info[element].move_delay_fixed = 0; element_info[element].move_delay_random = 0; @@ -270,7 +284,9 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].modified_settings = FALSE; } - else if (IS_GROUP_ELEMENT(element) || element == EL_INTERNAL_EDITOR) + + if (IS_GROUP_ELEMENT(element) || + IS_INTERNAL_ELEMENT(element)) { /* initialize memory for list of elements in group */ if (element_info[element].group == NULL) @@ -287,6 +303,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) } } + clipboard_elements_initialized = TRUE; + BorderElement = EL_STEELWALL; level->no_valid_file = FALSE; @@ -686,6 +704,10 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) level->use_spring_bug = (getFile8Bit(file) == 1 ? TRUE : FALSE); level->use_step_counter = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->instant_relocation = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->can_pass_to_walkable = (getFile8Bit(file) == 1 ? TRUE : FALSE); + level->grow_into_diggable = (getFile8Bit(file) == 1 ? TRUE : FALSE); + ReadUnusedBytesFromFile(file, LEVEL_HEADER_UNUSED); return chunk_size; @@ -965,16 +987,16 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) getMappedElement(getFile16BitBE(file)); element_info[element].change->explode = getFile8Bit(file); - element_info[element].change->use_content = getFile8Bit(file); - element_info[element].change->only_complete = getFile8Bit(file); - element_info[element].change->use_random_change = getFile8Bit(file); + element_info[element].change->use_target_content = getFile8Bit(file); + element_info[element].change->only_if_complete = getFile8Bit(file); + element_info[element].change->use_random_replace = getFile8Bit(file); - element_info[element].change->random = getFile8Bit(file); - element_info[element].change->power = getFile8Bit(file); + element_info[element].change->random_percentage = getFile8Bit(file); + element_info[element].change->replace_when = getFile8Bit(file); for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - element_info[element].change->content[x][y] = + element_info[element].change->target_content[x][y] = getMappedElement(getFile16BitBE(file)); element_info[element].slippery_type = getFile8Bit(file); @@ -1035,8 +1057,10 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->collect_score = getFile8Bit(file); ei->collect_count = getFile8Bit(file); - ei->push_delay_fixed = getFile16BitBE(file); - ei->push_delay_random = getFile16BitBE(file); + ei->drop_delay_fixed = getFile8Bit(file); + ei->push_delay_fixed = getFile8Bit(file); + ei->drop_delay_random = getFile8Bit(file); + ei->push_delay_random = getFile8Bit(file); ei->move_delay_fixed = getFile16BitBE(file); ei->move_delay_random = getFile16BitBE(file); @@ -1088,16 +1112,16 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) change->trigger_element = getMappedElement(getFile16BitBE(file)); change->explode = getFile8Bit(file); - change->use_content = getFile8Bit(file); - change->only_complete = getFile8Bit(file); - change->use_random_change = getFile8Bit(file); + change->use_target_content = getFile8Bit(file); + change->only_if_complete = getFile8Bit(file); + change->use_random_replace = getFile8Bit(file); - change->random = getFile8Bit(file); - change->power = getFile8Bit(file); + change->random_percentage = getFile8Bit(file); + change->replace_when = getFile8Bit(file); for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - change->content[x][y] = getMappedElement(getFile16BitBE(file)); + change->target_content[x][y] = getMappedElement(getFile16BitBE(file)); change->can_change = getFile8Bit(file); @@ -2071,6 +2095,11 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) pre-2.0 levels, where the game version is still taken from the file format version used to store the level -- see above). */ +#if 1 + /* player was faster than enemies in 1.0.0 and before */ + if (level->file_version == FILE_VERSION_1_0) + level->double_speed = TRUE; +#else /* do some special adjustments to support older level versions */ if (level->file_version == FILE_VERSION_1_0) { @@ -2080,8 +2109,9 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) /* player was faster than monsters in (pre-)1.0 levels */ level->double_speed = TRUE; } +#endif - /* Default behaviour for EM style gems was "slippery" only in 2.0.1 */ + /* default behaviour for EM style gems was "slippery" only in 2.0.1 */ if (level->game_version == VERSION_IDENT(2,0,1,0)) level->em_slippery_gems = TRUE; @@ -2420,6 +2450,10 @@ static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) putFile8Bit(file, (level->use_spring_bug ? 1 : 0)); putFile8Bit(file, (level->use_step_counter ? 1 : 0)); + putFile8Bit(file, (level->instant_relocation ? 1 : 0)); + putFile8Bit(file, (level->can_pass_to_walkable ? 1 : 0)); + putFile8Bit(file, (level->grow_into_diggable ? 1 : 0)); + WriteUnusedBytesToFile(file, LEVEL_HEADER_UNUSED); } @@ -2645,12 +2679,12 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile16BitBE(file, element_info[element].change->trigger_element); putFile8Bit(file, element_info[element].change->explode); - putFile8Bit(file, element_info[element].change->use_content); - putFile8Bit(file, element_info[element].change->only_complete); - putFile8Bit(file, element_info[element].change->use_random_change); + putFile8Bit(file, element_info[element].change->use_target_content); + putFile8Bit(file, element_info[element].change->only_if_complete); + putFile8Bit(file, element_info[element].change->use_random_replace); - putFile8Bit(file, element_info[element].change->random); - putFile8Bit(file, element_info[element].change->power); + putFile8Bit(file, element_info[element].change->random_percentage); + putFile8Bit(file, element_info[element].change->replace_when); for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) @@ -2697,8 +2731,10 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, ei->collect_score); putFile8Bit(file, ei->collect_count); - putFile16BitBE(file, ei->push_delay_fixed); - putFile16BitBE(file, ei->push_delay_random); + putFile8Bit(file, ei->drop_delay_fixed); + putFile8Bit(file, ei->push_delay_fixed); + putFile8Bit(file, ei->drop_delay_random); + putFile8Bit(file, ei->push_delay_random); putFile16BitBE(file, ei->move_delay_fixed); putFile16BitBE(file, ei->move_delay_random); @@ -2745,16 +2781,16 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile16BitBE(file, change->trigger_element); putFile8Bit(file, change->explode); - putFile8Bit(file, change->use_content); - putFile8Bit(file, change->only_complete); - putFile8Bit(file, change->use_random_change); + putFile8Bit(file, change->use_target_content); + putFile8Bit(file, change->only_if_complete); + putFile8Bit(file, change->use_random_replace); - putFile8Bit(file, change->random); - putFile8Bit(file, change->power); + putFile8Bit(file, change->random_percentage); + putFile8Bit(file, change->replace_when); for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) - putFile16BitBE(file, change->content[x][y]); + putFile16BitBE(file, change->target_content[x][y]); putFile8Bit(file, change->can_change);