X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=b48fcf4a1482b38942301fbadb8396be182513f0;hb=3fb6a71ff8cb550457ba2f4497993d75ef2742bd;hp=6944fbaf266f3e84116c84de19f4243c646d1bd6;hpb=50e762bca8b7cbca1d0a12674b559e81a4f2c3f9;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 6944fbaf..b48fcf4a 100644 --- a/src/files.c +++ b/src/files.c @@ -563,6 +563,15 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.initial_inventory_size[3], 1, MAX_INITIAL_INVENTORY_SIZE }, + // (these values are only valid for BD style levels) + { + EL_BD_PLAYER, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.bd_diagonal_movements, FALSE + }, + + // (the following values are related to various game elements) + { EL_EMERALD, -1, TYPE_INTEGER, CONF_VALUE_16_BIT(1), @@ -2067,6 +2076,27 @@ static void ActivateLevelTemplate(void) } } +static boolean checkForPackageFromBasename_BD(char *basename) +{ + // check for native BD level file extensions + if (!strSuffixLower(basename, ".bd") && + !strSuffixLower(basename, ".bdr") && + !strSuffixLower(basename, ".brc") && + !strSuffixLower(basename, ".gds")) + return FALSE; + + // check for standard single-level BD files (like "001.bd") + if (strSuffixLower(basename, ".bd") && + strlen(basename) == 6 && + basename[0] >= '0' && basename[0] <= '9' && + basename[1] >= '0' && basename[1] <= '9' && + basename[2] >= '0' && basename[2] <= '9') + return FALSE; + + // this is a level package in native BD file format + return TRUE; +} + static char *getLevelFilenameFromBasename(char *basename) { static char *filename = NULL; @@ -2102,10 +2132,7 @@ static int getFileTypeFromBasename(char *basename) return LEVEL_FILE_TYPE_SB; // check for typical filename of a Boulder Dash (GDash) level package file - if (strSuffixLower(basename, ".bd") || - strSuffixLower(basename, ".bdr") || - strSuffixLower(basename, ".brc") || - strSuffixLower(basename, ".gds")) + if (checkForPackageFromBasename_BD(basename)) return LEVEL_FILE_TYPE_BD; // ---------- try to determine file type from filesize ---------- @@ -2367,6 +2394,11 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) if (fileExists(lfi->filename)) return; + // check for native Boulder Dash level file + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_BD, "%03d.bd", nr); + if (fileExists(lfi->filename)) + return; + // check for Emerald Mine level file (V1) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "a%c%c", 'a' + (nr / 10) % 26, '0' + nr % 10); @@ -3687,6 +3719,8 @@ static void CopyNativeLevel_RND_to_BD(struct LevelInfo *level) cave->level_speed[0] = 160; // set cave speed + cave->diagonal_movements = level->bd_diagonal_movements; + strncpy(cave->name, level->name, sizeof(GdString)); cave->name[sizeof(GdString) - 1] = '\0'; @@ -3712,6 +3746,8 @@ static void CopyNativeLevel_BD_to_RND(struct LevelInfo *level) level->score[SC_TIME_BONUS] = cave->level_timevalue[bd_level_nr]; level->score[SC_DIAMOND] = cave->diamond_value; + level->bd_diagonal_movements = cave->diagonal_movements; + strncpy(level->name, cave->name, MAX_LEVEL_NAME_LEN); level->name[MAX_LEVEL_NAME_LEN] = '\0'; @@ -6196,7 +6232,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level, boolean invalid_playfield_char = FALSE; boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces"); int file_level_nr = 0; - int line_nr = 0; int x = 0, y = 0; // initialized to make compilers happy last_comment[0] = '\0'; @@ -6238,10 +6273,6 @@ static void LoadLevelFromFileInfo_SB(struct LevelInfo *level, if (!getStringFromFile(file, line, MAX_LINE_LEN)) break; - // check if line was completely read and is terminated by line break - if (strlen(line) > 0 && line[strlen(line) - 1] == '\n') - line_nr++; - // cut trailing line break (this can be newline and/or carriage return) for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--) if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0') @@ -6496,16 +6527,40 @@ void CopyNativeLevel_Native_to_RND(struct LevelInfo *level) void SaveNativeLevel(struct LevelInfo *level) { - if (level->game_engine_type == GAME_ENGINE_TYPE_SP) + // saving native level files only supported for some game engines + if (level->game_engine_type != GAME_ENGINE_TYPE_BD && + level->game_engine_type != GAME_ENGINE_TYPE_SP) + return; + + char *file_ext = (level->game_engine_type == GAME_ENGINE_TYPE_BD ? "bd" : + level->game_engine_type == GAME_ENGINE_TYPE_SP ? "sp" : ""); + char *basename = getSingleLevelBasenameExt(level->file_info.nr, file_ext); + char *filename = getLevelFilenameFromBasename(basename); + + if (fileExists(filename) && !Request("Native level file already exists! Overwrite it?", REQ_ASK)) + return; + + boolean success = FALSE; + + if (level->game_engine_type == GAME_ENGINE_TYPE_BD) { - char *basename = getSingleLevelBasenameExt(level->file_info.nr, "sp"); - char *filename = getLevelFilenameFromBasename(basename); + CopyNativeLevel_RND_to_BD(level); + // CopyNativeTape_RND_to_BD(level); + success = SaveNativeLevel_BD(filename); + } + else if (level->game_engine_type == GAME_ENGINE_TYPE_SP) + { CopyNativeLevel_RND_to_SP(level); CopyNativeTape_RND_to_SP(level); - SaveNativeLevel_SP(filename); + success = SaveNativeLevel_SP(filename); } + + if (success) + Request("Native level file saved!", REQ_CONFIRM); + else + Request("Failed to save native level file!", REQ_CONFIRM); } @@ -6563,6 +6618,9 @@ static void LoadLevelFromFileInfo(struct LevelInfo *level, if (level->no_valid_file) setLevelInfoToDefaults(level, level_info_only, FALSE); + if (check_special_flags("use_native_bd_game_engine")) + level->game_engine_type = GAME_ENGINE_TYPE_BD; + if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN) level->game_engine_type = GAME_ENGINE_TYPE_RND; @@ -9810,6 +9868,14 @@ static struct TokenInfo global_setup_tokens[] = TYPE_SWITCH, &setup.bd_skip_hatching, "bd_skip_hatching" }, + { + TYPE_SWITCH, + &setup.bd_scroll_delay, "bd_scroll_delay" + }, + { + TYPE_SWITCH3, + &setup.bd_smooth_movements, "bd_smooth_movements" + }, { TYPE_SWITCH, &setup.sp_show_border_elements, "sp_show_border_elements" @@ -10628,6 +10694,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->game_frame_delay = GAME_FRAME_DELAY; si->bd_skip_uncovering = FALSE; si->bd_skip_hatching = FALSE; + si->bd_scroll_delay = TRUE; + si->bd_smooth_movements = AUTO; si->sp_show_border_elements = FALSE; si->small_game_graphics = FALSE; si->show_load_save_buttons = FALSE; @@ -11974,7 +12042,7 @@ static int get_anim_action_parameter_value(char *token) { if (isURL(token)) { - result = get_hash_from_key(token); // unsigned int => int + result = get_hash_from_string(token); // unsigned int => int result = ABS(result); // may be negative now result += (result < MAX_IMAGE_FILES ? MAX_IMAGE_FILES : 0); @@ -12076,7 +12144,7 @@ int get_parameter_value(char *value_raw, char *suffix, int type) else if (strEqual(suffix, ".class")) { result = (strEqual(value, ARG_UNDEFINED) ? ARG_UNDEFINED_VALUE : - get_hash_from_key(value)); + get_hash_from_string(value)); } else if (strEqual(suffix, ".style")) {