X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=e17ef526412bcca6ec178c60922d4d50dacdb657;hb=945d51a5966241e4964a2b72058b6295cbc4a688;hp=21717f1d7bdc74897abc1aa41df199ab06b1fea9;hpb=d6c432b07a5880f361902a689341c84cc3fec342;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 21717f1d..e17ef526 100644 --- a/src/files.c +++ b/src/files.c @@ -116,8 +116,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].use_gfx_element = FALSE; element_info[element].gfx_element = EL_EMPTY_SPACE; - element_info[element].score = 0; - element_info[element].gem_count = 0; + element_info[element].collect_score = 10; /* special default */ + element_info[element].collect_count = 1; /* special default */ element_info[element].push_delay_fixed = 2; /* special default */ element_info[element].push_delay_random = 8; /* special default */ @@ -171,6 +171,8 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) /* start with no properties at all */ for (j=0; j < NUM_EP_BITFIELDS; j++) Properties[element][j] = EP_BITMASK_DEFAULT; + + element_info[element].modified_settings = FALSE; } BorderElement = EL_STEELWALL; @@ -496,8 +498,8 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) element_info[element].gfx_element = checkLevelElement(getFile16BitBE(file)); - element_info[element].score = getFile8Bit(file); - element_info[element].gem_count = getFile8Bit(file); + element_info[element].collect_score = getFile8Bit(file); + element_info[element].collect_count = getFile8Bit(file); element_info[element].push_delay_fixed = getFile16BitBE(file); element_info[element].push_delay_random = getFile16BitBE(file); @@ -542,6 +544,9 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) /* some free bytes for future properties and padding */ ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED); + + /* mark that this custom element has been modified */ + element_info[element].modified_settings = TRUE; } return chunk_size; @@ -677,14 +682,19 @@ 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("\n::: This level is private or contributed: '%s'\n", filename); +#endif + /* For user contributed and private levels, use the version of the game engine the levels were created for. Since 2.0.1, the game engine version is now directly stored @@ -709,6 +719,11 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) } else { +#if 0 + printf("\n::: ALWAYS USE LATEST ENGINE FOR THIS LEVEL: [%d] '%s'\n", + leveldir_current->sort_priority, filename); +#endif + /* Always use the latest version of the game engine for all but user contributed and private levels; this allows for actual corrections in the game engine to take effect for existing, @@ -729,26 +744,62 @@ static void LoadLevel_InitLevel(struct LevelInfo *level, char *filename) level->em_slippery_gems = TRUE; } - /* map elements which have changed in newer versions */ - if (level->game_version <= VERSION_IDENT(2,2,0)) + /* map elements that have changed in newer versions */ + for(y=0; yfieldy; y++) + { + for(x=0; xfieldx; x++) + { + int element = level->field[x][y]; + + if (level->game_version <= VERSION_IDENT(2,2,0)) + { + /* map game font elements */ + element = (element == EL_CHAR('[') ? EL_CHAR_AUMLAUT : + element == EL_CHAR('\\') ? EL_CHAR_OUMLAUT : + element == EL_CHAR(']') ? EL_CHAR_UUMLAUT : + element == EL_CHAR('^') ? EL_CHAR_COPYRIGHT : element); + } + + if (level->game_version < VERSION_IDENT(3,0,0)) + { + /* map Supaplex gravity tube elements */ + element = (element == EL_SP_GRAVITY_PORT_LEFT ? EL_SP_PORT_LEFT : + element == EL_SP_GRAVITY_PORT_RIGHT ? EL_SP_PORT_RIGHT : + element == EL_SP_GRAVITY_PORT_UP ? EL_SP_PORT_UP : + element == EL_SP_GRAVITY_PORT_DOWN ? EL_SP_PORT_DOWN : + element); + } + + level->field[x][y] = element; + } + } + + /* 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)) { - /* map game font elements */ - for(y=0; yfieldy; y++) + for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) { - for(x=0; xfieldx; x++) + 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--) { - int element = level->field[x][y]; - - if (element == EL_CHAR('[')) - element = EL_CHAR_AUMLAUT; - else if (element == EL_CHAR('\\')) - element = EL_CHAR_OUMLAUT; - else if (element == EL_CHAR(']')) - element = EL_CHAR_UUMLAUT; - else if (element == EL_CHAR('^')) - element = EL_CHAR_COPYRIGHT; - - level->field[x][y] = element; + 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); + } } } } @@ -992,7 +1043,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, { int element = EL_CUSTOM_START + i; - if (Properties[element][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT) + if (element_info[element].modified_settings) { if (check < num_changed_custom_elements) { @@ -1009,8 +1060,8 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile8Bit(file, element_info[element].use_gfx_element); putFile16BitBE(file, element_info[element].gfx_element); - putFile8Bit(file, element_info[element].score); - putFile8Bit(file, element_info[element].gem_count); + putFile8Bit(file, element_info[element].collect_score); + putFile8Bit(file, element_info[element].collect_count); putFile16BitBE(file, element_info[element].push_delay_fixed); putFile16BitBE(file, element_info[element].push_delay_random); @@ -1104,7 +1155,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) /* check for non-standard custom elements and calculate "CUS3" chunk size */ for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) - if (Properties[EL_CUSTOM_START +i][EP_BITFIELD_BASE] != EP_BITMASK_DEFAULT) + if (element_info[EL_CUSTOM_START + i].modified_settings) num_changed_custom_elements++; level_chunk_CUS3_size = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements); @@ -1259,6 +1310,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; @@ -1486,7 +1539,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 } @@ -1871,6 +1925,7 @@ static struct TokenInfo editor_setup_tokens[] = { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash" }, { TYPE_SWITCH, &sei.el_chars, "editor.el_chars" }, { TYPE_SWITCH, &sei.el_custom, "editor.el_custom" }, + { TYPE_SWITCH, &sei.el_custom_more, "editor.el_custom_more" }, }; static struct TokenInfo shortcut_setup_tokens[] = @@ -1950,9 +2005,9 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->fullscreen = FALSE; si->ask_on_escape = TRUE; - si->graphics_set = getStringCopy(GRAPHICS_SUBDIR); - si->sounds_set = getStringCopy(SOUNDS_SUBDIR); - si->music_set = getStringCopy(MUSIC_SUBDIR); + si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); + si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); + si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR); si->override_level_graphics = FALSE; si->override_level_sounds = FALSE; si->override_level_music = FALSE; @@ -1966,6 +2021,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->editor.el_dx_boulderdash = TRUE; si->editor.el_chars = TRUE; si->editor.el_custom = TRUE; + si->editor.el_custom_more = FALSE; si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME; si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME;