X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=e78c1cdb271102049a81b6c596a7bab2bcfbe854;hp=a0389f4353bec975aedd718cb059a7f718bca2e5;hb=56814df201c2d86273cf54e0e94c0448ce9bdd0f;hpb=eb09b9aa5521e286723c668030825cd0e3470c3c diff --git a/src/files.c b/src/files.c index a0389f43..e78c1cdb 100644 --- a/src/files.c +++ b/src/files.c @@ -264,6 +264,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(6), &li.continuous_snapping, TRUE }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(12), + &li.shifted_relocation, FALSE + }, /* (these values are different for each player) */ { @@ -1688,6 +1693,11 @@ static int getFileTypeFromBasename(char *basename) strncmp(basename, "LEVELS.D", 8) == 0)) return LEVEL_FILE_TYPE_SP; + /* check for typical filename of a Diamond Caves II level package file */ + if (strSuffix(basename, ".dc") || + strSuffix(basename, ".dc2")) + return LEVEL_FILE_TYPE_DC; + /* ---------- try to determine file type from filesize ---------- */ checked_free(filename); @@ -3921,7 +3931,7 @@ static void LoadLevelFromFileInfo_SP(struct LevelInfo *level, { level->no_valid_file = TRUE; - Error(ERR_WARN, "cannot fseek level '%s' -- using empty level", filename); + Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename); return; } @@ -5541,6 +5551,286 @@ int getMappedElement_DC(int element) return getMappedElement(element); } +#if 1 + +static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, + int nr) +{ + byte header[DC_LEVEL_HEADER_SIZE]; + int envelope_size; + int envelope_header_pos = 62; + int envelope_content_pos = 94; + int level_name_pos = 251; + int level_author_pos = 292; + int envelope_header_len; + int envelope_content_len; + int level_name_len; + int level_author_len; + int fieldx, fieldy; + int num_yamyam_contents; + int i, x, y; + + getDecodedWord_DC(0, TRUE); /* initialize DC2 decoding engine */ + + for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++) + { + unsigned short header_word = getDecodedWord_DC(getFile16BitBE(file), FALSE); + + header[i * 2 + 0] = header_word >> 8; + header[i * 2 + 1] = header_word & 0xff; + } + + /* read some values from level header to check level decoding integrity */ + fieldx = header[6] | (header[7] << 8); + fieldy = header[8] | (header[9] << 8); + num_yamyam_contents = header[60] | (header[61] << 8); + + /* do some simple sanity checks to ensure that level was correctly decoded */ + if (fieldx < 1 || fieldx > 256 || + fieldy < 1 || fieldy > 256 || + num_yamyam_contents < 1 || num_yamyam_contents > 8) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot decode level from stream -- using empty level"); + + return; + } + + /* maximum envelope header size is 31 bytes */ + envelope_header_len = header[envelope_header_pos]; + /* maximum envelope content size is 110 (156?) bytes */ + envelope_content_len = header[envelope_content_pos]; + + /* maximum level title size is 40 bytes */ + level_name_len = MIN(header[level_name_pos], MAX_LEVEL_NAME_LEN); + /* maximum level author size is 30 (51?) bytes */ + level_author_len = MIN(header[level_author_pos], MAX_LEVEL_AUTHOR_LEN); + + envelope_size = 0; + + for (i = 0; i < envelope_header_len; i++) + if (envelope_size < MAX_ENVELOPE_TEXT_LEN) + level->envelope[0].text[envelope_size++] = + header[envelope_header_pos + 1 + i]; + + if (envelope_header_len > 0 && envelope_content_len > 0) + { + if (envelope_size < MAX_ENVELOPE_TEXT_LEN) + level->envelope[0].text[envelope_size++] = '\n'; + if (envelope_size < MAX_ENVELOPE_TEXT_LEN) + level->envelope[0].text[envelope_size++] = '\n'; + } + + for (i = 0; i < envelope_content_len; i++) + if (envelope_size < MAX_ENVELOPE_TEXT_LEN) + level->envelope[0].text[envelope_size++] = + header[envelope_content_pos + 1 + i]; + + level->envelope[0].text[envelope_size] = '\0'; + + level->envelope[0].xsize = MAX_ENVELOPE_XSIZE; + level->envelope[0].ysize = 10; + level->envelope[0].autowrap = TRUE; + level->envelope[0].centered = TRUE; + + for (i = 0; i < level_name_len; i++) + level->name[i] = header[level_name_pos + 1 + i]; + level->name[level_name_len] = '\0'; + + for (i = 0; i < level_author_len; i++) + level->author[i] = header[level_author_pos + 1 + i]; + level->author[level_author_len] = '\0'; + + num_yamyam_contents = header[60] | (header[61] << 8); + level->num_yamyam_contents = + MIN(MAX(MIN_ELEMENT_CONTENTS, num_yamyam_contents), MAX_ELEMENT_CONTENTS); + + for (i = 0; i < num_yamyam_contents; i++) + { + for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) + { + unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE); +#if 1 + int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff); +#else + int element_dc = word; +#endif + + if (i < MAX_ELEMENT_CONTENTS) + level->yamyam_content[i].e[x][y] = getMappedElement_DC(element_dc); + } + } + + fieldx = header[6] | (header[7] << 8); + fieldy = header[8] | (header[9] << 8); + level->fieldx = MIN(MAX(MIN_LEV_FIELDX, fieldx), MAX_LEV_FIELDX); + level->fieldy = MIN(MAX(MIN_LEV_FIELDY, fieldy), MAX_LEV_FIELDY); + + for (y = 0; y < fieldy; y++) for (x = 0; x < fieldx; x++) + { + unsigned short word = getDecodedWord_DC(getFile16BitBE(file), FALSE); +#if 1 + int element_dc = ((word & 0xff) << 8) | ((word >> 8) & 0xff); +#else + int element_dc = word; +#endif + + if (x < MAX_LEV_FIELDX && y < MAX_LEV_FIELDY) + level->field[x][y] = getMappedElement_DC(element_dc); + } + + x = MIN(MAX(0, (header[10] | (header[11] << 8)) - 1), MAX_LEV_FIELDX - 1); + y = MIN(MAX(0, (header[12] | (header[13] << 8)) - 1), MAX_LEV_FIELDY - 1); + level->field[x][y] = EL_PLAYER_1; + + x = MIN(MAX(0, (header[14] | (header[15] << 8)) - 1), MAX_LEV_FIELDX - 1); + y = MIN(MAX(0, (header[16] | (header[17] << 8)) - 1), MAX_LEV_FIELDY - 1); + level->field[x][y] = EL_PLAYER_2; + + level->gems_needed = header[18] | (header[19] << 8); + + level->score[SC_EMERALD] = header[20] | (header[21] << 8); + level->score[SC_DIAMOND] = header[22] | (header[23] << 8); + level->score[SC_PEARL] = header[24] | (header[25] << 8); + level->score[SC_CRYSTAL] = header[26] | (header[27] << 8); + level->score[SC_NUT] = header[28] | (header[29] << 8); + level->score[SC_ROBOT] = header[30] | (header[31] << 8); + level->score[SC_SPACESHIP] = header[32] | (header[33] << 8); + level->score[SC_BUG] = header[34] | (header[35] << 8); + level->score[SC_YAMYAM] = header[36] | (header[37] << 8); + level->score[SC_DYNAMITE] = header[38] | (header[39] << 8); + level->score[SC_KEY] = header[40] | (header[41] << 8); + level->score[SC_TIME_BONUS] = header[42] | (header[43] << 8); + + level->time = header[44] | (header[45] << 8); + + level->amoeba_speed = header[46] | (header[47] << 8); + level->time_light = header[48] | (header[49] << 8); + level->time_timegate = header[50] | (header[51] << 8); + level->time_wheel = header[52] | (header[53] << 8); + level->time_magic_wall = header[54] | (header[55] << 8); + level->extra_time = header[56] | (header[57] << 8); + level->shield_normal_time = header[58] | (header[59] << 8); + + /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems + can slip down from flat walls, like normal walls and steel walls */ + level->em_slippery_gems = TRUE; + +#if 0 + /* Diamond Caves II levels are always surrounded by indestructible wall, but + not necessarily in a rectangular way -- fill with invisible steel wall */ + + /* !!! not always true !!! keep level and set BorderElement instead !!! */ + + for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) + { +#if 1 + if ((x == 0 || x == level->fieldx - 1 || + y == 0 || y == level->fieldy - 1) && + level->field[x][y] == EL_EMPTY) + level->field[x][y] = EL_INVISIBLE_STEELWALL; +#else + if ((x == 0 || x == level->fieldx - 1 || + y == 0 || y == level->fieldy - 1) && + level->field[x][y] == EL_EMPTY) + FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL, + level->field, level->fieldx, level->fieldy); +#endif + } +#endif +} + +static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) +{ + char *filename = level_file_info->filename; + FILE *file; + int num_magic_bytes = 8; + char magic_bytes[num_magic_bytes + 1]; + int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level; + + if (!(file = fopen(filename, MODE_READ))) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + + return; + } + + // fseek(file, 0x0000, SEEK_SET); + + if (level_file_info->packed) + { + /* read "magic bytes" from start of file */ + fgets(magic_bytes, num_magic_bytes + 1, file); + + /* check "magic bytes" for correct file format */ + if (!strPrefix(magic_bytes, "DC2")) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "unknown DC level file '%s' -- using empty level", + filename); + + return; + } + + if (strPrefix(magic_bytes, "DC2Win95") || + strPrefix(magic_bytes, "DC2Win98")) + { + int position_first_level = 0x00fa; + int extra_bytes = 4; + int skip_bytes; + + /* advance file stream to first level inside the level package */ + skip_bytes = position_first_level - num_magic_bytes - extra_bytes; + + /* each block of level data is followed by block of non-level data */ + num_levels_to_skip *= 2; + + /* at least skip header bytes, therefore use ">= 0" instead of "> 0" */ + while (num_levels_to_skip >= 0) + { + /* advance file stream to next level inside the level package */ + if (fseek(file, skip_bytes, SEEK_CUR) != 0) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", + filename); + + return; + } + + /* skip apparently unused extra bytes following each level */ + ReadUnusedBytesFromFile(file, extra_bytes); + + /* read size of next level in level package */ + skip_bytes = getFile32BitLE(file); + + num_levels_to_skip--; + } + } + else + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "unknown DC2 level file '%s' -- using empty level", + filename); + + return; + } + } + + LoadLevelFromFileStream_DC(file, level, level_file_info->nr); + + fclose(file); +} + +#else + static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, struct LevelFileInfo *level_file_info) { @@ -5578,7 +5868,7 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, { level->no_valid_file = TRUE; - Error(ERR_WARN, "cannot fseek level '%s' -- using empty level", filename); + Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename); return; } @@ -5594,6 +5884,24 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, header[i * 2 + 1] = header_word & 0xff; } + /* read some values from level header to check level decoding integrity */ + fieldx = header[6] | (header[7] << 8); + fieldy = header[8] | (header[9] << 8); + num_yamyam_contents = header[60] | (header[61] << 8); + + /* do some simple sanity checks to ensure that level was correctly decoded */ + if (fieldx < 1 || fieldx > 256 || + fieldy < 1 || fieldy > 256 || + num_yamyam_contents < 1 || num_yamyam_contents > 8) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot read level from file '%s' -- using empty level", + filename); + + return; + } + /* maximum envelope header size is 31 bytes */ envelope_header_len = header[envelope_header_pos]; /* maximum envelope content size is 110 (156?) bytes */ @@ -5740,6 +6048,8 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, #endif } +#endif + /* ------------------------------------------------------------------------- */ /* functions for loading generic level */ @@ -5948,6 +6258,10 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) change->target_element == EL_SOKOBAN_FIELD_PLAYER) change->target_element = EL_PLAYER_1; } + + /* not centering level after relocating player was default only in 3.2.3 */ + if (level->game_version == VERSION_IDENT(3,2,3,0)) /* (no pre-releases) */ + level->shifted_relocation = TRUE; } static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) @@ -7675,31 +7989,33 @@ void SaveScore(int nr) #define SETUP_TOKEN_SOUND_SIMPLE 4 #define SETUP_TOKEN_TOONS 5 #define SETUP_TOKEN_SCROLL_DELAY 6 -#define SETUP_TOKEN_SOFT_SCROLLING 7 -#define SETUP_TOKEN_FADE_SCREENS 8 -#define SETUP_TOKEN_AUTORECORD 9 -#define SETUP_TOKEN_SHOW_TITLESCREEN 10 -#define SETUP_TOKEN_QUICK_DOORS 11 -#define SETUP_TOKEN_TEAM_MODE 12 -#define SETUP_TOKEN_HANDICAP 13 -#define SETUP_TOKEN_SKIP_LEVELS 14 -#define SETUP_TOKEN_TIME_LIMIT 15 -#define SETUP_TOKEN_FULLSCREEN 16 -#define SETUP_TOKEN_FULLSCREEN_MODE 17 -#define SETUP_TOKEN_ASK_ON_ESCAPE 18 -#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 19 -#define SETUP_TOKEN_QUICK_SWITCH 20 -#define SETUP_TOKEN_INPUT_ON_FOCUS 21 -#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 22 -#define SETUP_TOKEN_GAME_FRAME_DELAY 23 -#define SETUP_TOKEN_GRAPHICS_SET 24 -#define SETUP_TOKEN_SOUNDS_SET 25 -#define SETUP_TOKEN_MUSIC_SET 26 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 27 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 28 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 29 - -#define NUM_GLOBAL_SETUP_TOKENS 30 +#define SETUP_TOKEN_SCROLL_DELAY_VALUE 7 +#define SETUP_TOKEN_SOFT_SCROLLING 8 +#define SETUP_TOKEN_FADE_SCREENS 9 +#define SETUP_TOKEN_AUTORECORD 10 +#define SETUP_TOKEN_SHOW_TITLESCREEN 11 +#define SETUP_TOKEN_QUICK_DOORS 12 +#define SETUP_TOKEN_TEAM_MODE 13 +#define SETUP_TOKEN_HANDICAP 14 +#define SETUP_TOKEN_SKIP_LEVELS 15 +#define SETUP_TOKEN_TIME_LIMIT 16 +#define SETUP_TOKEN_FULLSCREEN 17 +#define SETUP_TOKEN_FULLSCREEN_MODE 18 +#define SETUP_TOKEN_ASK_ON_ESCAPE 19 +#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 20 +#define SETUP_TOKEN_QUICK_SWITCH 21 +#define SETUP_TOKEN_INPUT_ON_FOCUS 22 +#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 23 +#define SETUP_TOKEN_GAME_FRAME_DELAY 24 +#define SETUP_TOKEN_GRAPHICS_SET 25 +#define SETUP_TOKEN_SOUNDS_SET 26 +#define SETUP_TOKEN_MUSIC_SET 27 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 28 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 29 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 30 +#define SETUP_TOKEN_OVERRIDE_CLASSIC_ARTWORK 31 + +#define NUM_GLOBAL_SETUP_TOKENS 32 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -7803,6 +8119,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, { TYPE_SWITCH, &si.toons, "toons" }, { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, + { TYPE_INTEGER,&si.scroll_delay_value,"scroll_delay_value" }, { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, { TYPE_SWITCH, &si.fade_screens, "fade_screens" }, { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, @@ -7826,6 +8143,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.override_level_graphics, "override_level_graphics" }, { TYPE_SWITCH, &si.override_level_sounds, "override_level_sounds" }, { TYPE_SWITCH, &si.override_level_music, "override_level_music" }, + { TYPE_SWITCH, &si.override_classic_artwork,"override_classic_artwork"}, }; static boolean not_used = FALSE; @@ -7954,9 +8272,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->sound_music = TRUE; si->sound_simple = TRUE; si->toons = TRUE; - si->double_buffering = TRUE; - si->direct_draw = !si->double_buffering; si->scroll_delay = TRUE; + si->scroll_delay_value = STD_SCROLL_DELAY; si->soft_scrolling = TRUE; si->fade_screens = TRUE; si->autorecord = TRUE; @@ -7981,6 +8298,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->override_level_graphics = FALSE; si->override_level_sounds = FALSE; si->override_level_music = FALSE; + si->override_classic_artwork = FALSE; si->editor.el_boulderdash = TRUE; si->editor.el_emerald_mine = TRUE; @@ -8152,14 +8470,23 @@ void LoadSetup() checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP")); decodeSetupFileHash(setup_file_hash); - setup.direct_draw = !setup.double_buffering; - freeSetupFileHash(setup_file_hash); /* needed to work around problems with fixed length strings */ player_name_new = get_corrected_login_name(setup.player_name); free(setup.player_name); setup.player_name = player_name_new; + + /* "scroll_delay: on(3) / off(0)" was replaced by scroll delay value */ + if (setup.scroll_delay == FALSE) + { + setup.scroll_delay_value = MIN_SCROLL_DELAY; + setup.scroll_delay = TRUE; /* now always "on" */ + } + + /* make sure that scroll delay value stays inside valid range */ + setup.scroll_delay_value = + MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY); } else Error(ERR_WARN, "using default setup values"); @@ -8321,6 +8648,27 @@ void LoadCustomElementDescriptions() freeSetupFileHash(setup_file_hash); } +static int getElementFromToken(char *token) +{ +#if 1 + char *value = getHashEntry(element_token_hash, token); + + if (value != NULL) + return atoi(value); +#else + int i; + + /* !!! OPTIMIZE THIS BY USING HASH !!! */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + if (strEqual(token, element_info[i].token_name)) + return i; +#endif + + Error(ERR_WARN, "unknown element token '%s'", token); + + return EL_UNDEFINED; +} + static int get_token_parameter_value(char *token, char *value_raw) { char *suffix; @@ -8332,6 +8680,12 @@ static int get_token_parameter_value(char *token, char *value_raw) if (suffix == NULL) suffix = token; +#if 1 + if (strEqual(suffix, ".element")) + return getElementFromToken(value_raw); +#endif + +#if 0 if (strncmp(suffix, ".font", 5) == 0) { int i; @@ -8344,11 +8698,98 @@ static int get_token_parameter_value(char *token, char *value_raw) /* if font not found, use reliable default value */ return FONT_INITIAL_1; } +#endif + /* !!! USE CORRECT VALUE TYPE (currently works also for TYPE_BOOLEAN) !!! */ return get_parameter_value(value_raw, suffix, TYPE_INTEGER); } -static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) +void InitMenuDesignSettings_Static() +{ +#if 0 + static SetupFileHash *image_config_hash = NULL; +#endif + int i; + +#if 0 + if (image_config_hash == NULL) + { + image_config_hash = newSetupFileHash(); + + for (i = 0; image_config[i].token != NULL; i++) + setHashEntry(image_config_hash, + image_config[i].token, + image_config[i].value); + } +#endif + +#if 1 + /* always start with reliable default values from static default config */ + for (i = 0; image_config_vars[i].token != NULL; i++) + { + char *value = getHashEntry(image_config_hash, image_config_vars[i].token); + + if (value != NULL) + *image_config_vars[i].value = + get_token_parameter_value(image_config_vars[i].token, value); + } + +#else + + int j; + + /* always start with reliable default values from static default config */ + for (i = 0; image_config_vars[i].token != NULL; i++) + for (j = 0; image_config[j].token != NULL; j++) + if (strEqual(image_config_vars[i].token, image_config[j].token)) + *image_config_vars[i].value = + get_token_parameter_value(image_config_vars[i].token, + image_config[j].value); +#endif +} + +static void InitMenuDesignSettings_SpecialPreProcessing() +{ + int i; + + /* the following initializes hierarchical values from static configuration */ + + /* special case: initialize "ARG_DEFAULT" values in static default config */ + /* (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") */ + titlemessage_initial_default.fade_mode = title_initial_default.fade_mode; + titlemessage_initial_default.fade_delay = title_initial_default.fade_delay; + titlemessage_initial_default.post_delay = title_initial_default.post_delay; + titlemessage_initial_default.auto_delay = title_initial_default.auto_delay; + titlemessage_default.fade_mode = title_default.fade_mode; + titlemessage_default.fade_delay = title_default.fade_delay; + titlemessage_default.post_delay = title_default.post_delay; + titlemessage_default.auto_delay = title_default.auto_delay; + + /* special case: initialize "ARG_DEFAULT" values in static default config */ + /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ + for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++) + { + titlemessage_initial[i] = titlemessage_initial_default; + titlemessage[i] = titlemessage_default; + } + + /* special case: initialize "ARG_DEFAULT" values in static default config */ + /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */ + for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) + { + menu.enter_screen[i] = menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT]; + menu.leave_screen[i] = menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT]; + } +} + +static void InitMenuDesignSettings_SpecialPostProcessing() +{ + /* special case: initialize later added SETUP list size from LEVELS value */ + if (menu.list_size[GAME_MODE_SETUP] == -1) + menu.list_size[GAME_MODE_SETUP] = menu.list_size[GAME_MODE_LEVELS]; +} + +static void LoadMenuDesignSettingsFromFilename(char *filename) { static struct TitleMessageInfo tmi; static struct TokenInfo titlemessage_tokens[] = @@ -8364,8 +8805,12 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) { TYPE_INTEGER, &tmi.font, ".font" }, { TYPE_BOOLEAN, &tmi.autowrap, ".autowrap" }, { TYPE_BOOLEAN, &tmi.centered, ".centered" }, - { TYPE_BOOLEAN, &tmi.skip_comments, ".skip_comments" }, + { TYPE_BOOLEAN, &tmi.parse_comments, ".parse_comments" }, { TYPE_INTEGER, &tmi.sort_priority, ".sort_priority" }, + { TYPE_INTEGER, &tmi.fade_mode, ".fade_mode" }, + { TYPE_INTEGER, &tmi.fade_delay, ".fade_delay" }, + { TYPE_INTEGER, &tmi.post_delay, ".post_delay" }, + { TYPE_INTEGER, &tmi.auto_delay, ".auto_delay" }, { -1, NULL, NULL } }; @@ -8385,13 +8830,16 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) int i, j, k; #if 0 - printf("LoadSpecialMenuDesignSettings from file '%s' ...\n", filename); + printf("LoadMenuDesignSettings from file '%s' ...\n", filename); #endif if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; + /* the following initializes hierarchical values from dynamic configuration */ + /* special case: initialize with default values that may be overwritten */ + /* (e.g., init "menu.draw_xoffset.INFO" from "menu.draw_xoffset") */ for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) { char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset"); @@ -8407,6 +8855,7 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) } /* special case: initialize with default values that may be overwritten */ + /* (eg, init "menu.draw_xoffset.INFO[XXX]" from "menu.draw_xoffset.INFO") */ for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++) { char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset.INFO"); @@ -8419,6 +8868,57 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) } /* special case: initialize with default values that may be overwritten */ + /* (eg, init "menu.draw_xoffset.SETUP[XXX]" from "menu.draw_xoffset.SETUP") */ + for (i = 0; i < NUM_SPECIAL_GFX_SETUP_ARGS; i++) + { + char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset.SETUP"); + char *value_2 = getHashEntry(setup_file_hash, "menu.draw_yoffset.SETUP"); + + if (value_1 != NULL) + menu.draw_xoffset_setup[i] = get_integer_from_string(value_1); + if (value_2 != NULL) + menu.draw_yoffset_setup[i] = get_integer_from_string(value_2); + } + + /* special case: initialize with default values that may be overwritten */ + /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */ + for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) + { + char *token_1 = "menu.enter_screen.fade_mode"; + char *token_2 = "menu.enter_screen.fade_delay"; + char *token_3 = "menu.enter_screen.post_delay"; + char *token_4 = "menu.leave_screen.fade_mode"; + char *token_5 = "menu.leave_screen.fade_delay"; + char *token_6 = "menu.leave_screen.post_delay"; + char *value_1 = getHashEntry(setup_file_hash, token_1); + char *value_2 = getHashEntry(setup_file_hash, token_2); + char *value_3 = getHashEntry(setup_file_hash, token_3); + char *value_4 = getHashEntry(setup_file_hash, token_4); + char *value_5 = getHashEntry(setup_file_hash, token_5); + char *value_6 = getHashEntry(setup_file_hash, token_6); + + if (value_1 != NULL) + menu.enter_screen[i].fade_mode = get_token_parameter_value(token_1, + value_1); + if (value_2 != NULL) + menu.enter_screen[i].fade_delay = get_token_parameter_value(token_2, + value_2); + if (value_3 != NULL) + menu.enter_screen[i].post_delay = get_token_parameter_value(token_3, + value_3); + if (value_4 != NULL) + menu.leave_screen[i].fade_mode = get_token_parameter_value(token_4, + value_4); + if (value_5 != NULL) + menu.leave_screen[i].fade_delay = get_token_parameter_value(token_5, + value_5); + if (value_6 != NULL) + menu.leave_screen[i].post_delay = get_token_parameter_value(token_6, + value_6); + } + + /* special case: initialize with default values that may be overwritten */ + /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ for (i = 0; titlemessage_arrays[i].array != NULL; i++) { struct TitleMessageInfo *array = titlemessage_arrays[i].array; @@ -8455,7 +8955,8 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) { char *value = getHashEntry(setup_file_hash, image_config_vars[i].token); - if (value != NULL) + /* (ignore definitions set to "[DEFAULT]" which are already initialized) */ + if (value != NULL && !strEqual(value, ARG_DEFAULT)) *image_config_vars[i].value = get_token_parameter_value(image_config_vars[i].token, value); } @@ -8463,32 +8964,32 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) freeSetupFileHash(setup_file_hash); } -void LoadSpecialMenuDesignSettings() +void LoadMenuDesignSettings() { char *filename_base = UNDEFINED_FILENAME, *filename_local; - int i, j; - /* always start with reliable default values from default config */ - for (i = 0; image_config_vars[i].token != NULL; i++) - for (j = 0; image_config[j].token != NULL; j++) - if (strEqual(image_config_vars[i].token, image_config[j].token)) - *image_config_vars[i].value = - get_token_parameter_value(image_config_vars[i].token, - image_config[j].value); + InitMenuDesignSettings_Static(); + InitMenuDesignSettings_SpecialPreProcessing(); +#if 1 + if (!GFX_OVERRIDE_ARTWORK(ARTWORK_TYPE_GRAPHICS)) +#else if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS)) +#endif { /* first look for special settings configured in level series config */ filename_base = getCustomArtworkLevelConfigFilename(ARTWORK_TYPE_GRAPHICS); if (fileExists(filename_base)) - LoadSpecialMenuDesignSettingsFromFilename(filename_base); + LoadMenuDesignSettingsFromFilename(filename_base); } filename_local = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS); if (filename_local != NULL && !strEqual(filename_base, filename_local)) - LoadSpecialMenuDesignSettingsFromFilename(filename_local); + LoadMenuDesignSettingsFromFilename(filename_local); + + InitMenuDesignSettings_SpecialPostProcessing(); } void LoadUserDefinedEditorElementList(int **elements, int *num_elements) @@ -8646,7 +9147,7 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, /* ---------- music file info found ---------- */ - memset(&tmp_music_file_info, 0, sizeof(struct MusicFileInfo)); + clear_mem(&tmp_music_file_info, sizeof(struct MusicFileInfo)); for (i = 0; token_to_value_ptr[i].token != NULL; i++) {