X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=d9840486bf81bbf77fb0641882c2cbbf23eb7fe5;hb=274935f49f49068998ad7b4ed9d93892aedfc6aa;hp=358333a474f74da747c2fa25a0f87d7cba8ed2f1;hpb=5d25c2fc3934b3d7e6b02465361569d3a0033bae;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 358333a4..d9840486 100644 --- a/src/files.c +++ b/src/files.c @@ -47,6 +47,54 @@ /* level file functions */ /* ========================================================================= */ +void setElementChangePages(struct ElementInfo *ei, int change_pages) +{ + int change_page_size = sizeof(struct ElementChangeInfo); + + ei->num_change_pages = MAX(1, change_pages); + + ei->change_page = + checked_realloc(ei->change_page, ei->num_change_pages * change_page_size); + + if (ei->current_change_page >= ei->num_change_pages) + ei->current_change_page = ei->num_change_pages - 1; + + ei->change = &ei->change_page[ei->current_change_page]; +} + +void setElementChangeInfoToDefaults(struct ElementChangeInfo *eci) +{ + int x, y; + + eci->events = CE_BITMASK_DEFAULT; + eci->target_element = EL_EMPTY_SPACE; + + eci->delay_fixed = 0; + eci->delay_random = 0; + eci->delay_frames = -1; /* later set to reliable default value */ + + eci->trigger_element = EL_EMPTY_SPACE; + + eci->explode = FALSE; + eci->use_content = FALSE; + eci->only_complete = FALSE; + eci->use_random_change = FALSE; + eci->random = 0; + eci->power = CP_NON_DESTRUCTIVE; + + for(x=0; x<3; x++) + for(y=0; y<3; y++) + eci->content[x][y] = EL_EMPTY_SPACE; + + eci->player_action = 0; + eci->collide_action = 0; + eci->other_action = 0; + + eci->pre_change_function = NULL; + eci->change_function = NULL; + eci->post_change_function = NULL; +} + static void setLevelInfoToDefaults(struct LevelInfo *level) { int i, j, x, y; @@ -87,6 +135,10 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) strcpy(level->name, NAMELESS_LEVEL_NAME); strcpy(level->author, ANONYMOUS_NAME); + level->envelope[0] = '\0'; + level->envelope_xsize = MAX_ENVELOPE_XSIZE; + level->envelope_ysize = MAX_ENVELOPE_YSIZE; + for(i=0; iscore[i] = 10; @@ -100,11 +152,17 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->field[0][0] = EL_PLAYER_1; level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; + for (i=0; i < MAX_NUM_ELEMENTS; i++) + { + setElementChangePages(&element_info[i], 1); + setElementChangeInfoToDefaults(element_info[i].change); + } + for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; - for(j=0; jtarget_element = custom_target_element; else Error(ERR_WARN, "invalid custom element number %d", element); } @@ -515,29 +552,29 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) element_info[element].content[x][y] = checkLevelElement(getFile16BitBE(file)); - element_info[element].change.events = getFile32BitBE(file); + element_info[element].change->events = getFile32BitBE(file); - element_info[element].change.target_element = + element_info[element].change->target_element = checkLevelElement(getFile16BitBE(file)); - element_info[element].change.delay_fixed = getFile16BitBE(file); - element_info[element].change.delay_random = getFile16BitBE(file); - element_info[element].change.delay_frames = getFile16BitBE(file); + element_info[element].change->delay_fixed = getFile16BitBE(file); + element_info[element].change->delay_random = getFile16BitBE(file); + element_info[element].change->delay_frames = getFile16BitBE(file); - element_info[element].change.trigger_element = + element_info[element].change->trigger_element = checkLevelElement(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->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.random = getFile8Bit(file); - element_info[element].change.power = getFile8Bit(file); + element_info[element].change->random = getFile8Bit(file); + element_info[element].change->power = 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->content[x][y] = checkLevelElement(getFile16BitBE(file)); element_info[element].slippery_type = getFile8Bit(file); @@ -682,16 +719,17 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename) static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) { - int x, y; + int i, j, x, y; if (leveldir_current == NULL) /* only when dumping level */ return; + /* determine correct game engine version of current level */ if (IS_LEVELCLASS_CONTRIBUTION(leveldir_current) || IS_LEVELCLASS_USER(leveldir_current)) { #if 0 - printf("::: This level is private or contributed: '%s'\n", filename); + printf("\n::: This level is private or contributed: '%s'\n", filename); #endif /* For user contributed and private levels, use the version of @@ -719,7 +757,7 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) else { #if 0 - printf("::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n", + printf("\n::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n", leveldir_current->sort_priority, filename); #endif @@ -743,7 +781,7 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) level->em_slippery_gems = TRUE; } - /* map elements which have changed in newer versions */ + /* map elements that have changed in newer versions */ for(y=0; yfieldy; y++) { for(x=0; xfieldx; x++) @@ -773,6 +811,36 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) } } + /* map custom element change events that have changed in newer versions + (these following values have accidentally changed in version 3.0.1) */ + if (level->game_version <= VERSION_IDENT(3,0,0)) + { + for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + + /* order of checking events to be mapped is important */ + for (j=CE_BY_OTHER; j >= CE_BY_PLAYER; j--) + { + if (HAS_CHANGE_EVENT(element, j - 2)) + { + SET_CHANGE_EVENT(element, j - 2, FALSE); + SET_CHANGE_EVENT(element, j, TRUE); + } + } + + /* order of checking events to be mapped is important */ + for (j=CE_OTHER_GETS_COLLECTED; j >= CE_COLLISION; j--) + { + if (HAS_CHANGE_EVENT(element, j - 1)) + { + SET_CHANGE_EVENT(element, j - 1, FALSE); + SET_CHANGE_EVENT(element, j, TRUE); + } + } + } + } + /* copy elements to runtime playfield array */ for(x=0; xtarget_element != EL_EMPTY_SPACE) { if (check < num_changed_custom_elements) { putFile16BitBE(file, element); - putFile16BitBE(file, element_info[element].change.target_element); + putFile16BitBE(file, element_info[element].change->target_element); } check++; @@ -1045,27 +1113,27 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, for(x=0; x<3; x++) putFile16BitBE(file, element_info[element].content[x][y]); - putFile32BitBE(file, element_info[element].change.events); + putFile32BitBE(file, element_info[element].change->events); - putFile16BitBE(file, element_info[element].change.target_element); + putFile16BitBE(file, element_info[element].change->target_element); - putFile16BitBE(file, element_info[element].change.delay_fixed); - putFile16BitBE(file, element_info[element].change.delay_random); - putFile16BitBE(file, element_info[element].change.delay_frames); + putFile16BitBE(file, element_info[element].change->delay_fixed); + putFile16BitBE(file, element_info[element].change->delay_random); + putFile16BitBE(file, element_info[element].change->delay_frames); - putFile16BitBE(file, element_info[element].change.trigger_element); + 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->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.random); - putFile8Bit(file, element_info[element].change.power); + putFile8Bit(file, element_info[element].change->random); + putFile8Bit(file, element_info[element].change->power); for(y=0; y<3; y++) for(x=0; x<3; x++) - putFile16BitBE(file, element_info[element].change.content[x][y]); + putFile16BitBE(file, element_info[element].change->content[x][y]); putFile8Bit(file, element_info[element].slippery_type); @@ -1279,6 +1347,8 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) engine_version = getFileVersion(file); if (engine_version > 0) tape->engine_version = engine_version; + else + tape->engine_version = tape->game_version; } return chunk_size; @@ -1506,7 +1576,8 @@ void LoadTapeFromFilename(char *filename) tape.length_seconds = GetTapeLength(); #if 0 - printf("tape version: %d\n", tape.game_version); + printf("tape game version: %d\n", tape.game_version); + printf("tape engine version: %d\n", tape.engine_version); #endif }