X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=b8ba6aa3af0fd8929dd4e5421257508039c7f8dd;hp=5f5b1fbb0517d71c2c03b5a089a4c79c36d3cde2;hb=8511bdf9d8df009aae3e4abd68ac5b5f18970237;hpb=f719b7331067a46dc013dcab78dceeafcaeefdab diff --git a/src/files.c b/src/files.c index 5f5b1fbb..b8ba6aa3 100644 --- a/src/files.c +++ b/src/files.c @@ -1,7 +1,7 @@ /*********************************************************** * Rocks'n'Diamonds -- McDuffin Strikes Back! * *----------------------------------------------------------* -* (c) 1995-2002 Artsoft Entertainment * +* (c) 1995-2006 Artsoft Entertainment * * Holger Schemel * * Detmolder Strasse 189 * * 33604 Bielefeld * @@ -227,8 +227,8 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = { -1, -1, -1, -1, - NULL, -1, - }, + NULL, -1 + } }; static struct LevelFileConfigInfo chunk_config_ELEM[] = @@ -722,8 +722,8 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = { -1, -1, -1, -1, - NULL, -1, - }, + NULL, -1 + } }; static struct LevelFileConfigInfo chunk_config_NOTE[] = @@ -750,8 +750,8 @@ static struct LevelFileConfigInfo chunk_config_NOTE[] = { -1, -1, -1, -1, - NULL, -1, - }, + NULL, -1 + } }; static struct LevelFileConfigInfo chunk_config_CUSX_base[] = @@ -956,7 +956,7 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] = -1, -1, NULL, -1, NULL - }, + } }; static struct LevelFileConfigInfo chunk_config_CUSX_change[] = @@ -1094,8 +1094,8 @@ static struct LevelFileConfigInfo chunk_config_CUSX_change[] = { -1, -1, -1, -1, - NULL, -1, - }, + NULL, -1 + } }; static struct LevelFileConfigInfo chunk_config_GRPX[] = @@ -1135,8 +1135,63 @@ static struct LevelFileConfigInfo chunk_config_GRPX[] = { -1, -1, -1, -1, - NULL, -1, + NULL, -1 + } +}; + +static struct LevelFileConfigInfo chunk_config_CONF[] = /* (OBSOLETE) */ +{ + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(9), + &li.block_snap_field, TRUE + }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(13), + &li.continuous_snapping, TRUE + }, + { + EL_PLAYER_1, -1, + TYPE_INTEGER, CONF_VALUE_8_BIT(1), + &li.initial_player_stepsize[0], STEPSIZE_NORMAL }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(10), + &li.use_start_element[0], FALSE + }, + { + EL_PLAYER_1, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(1), + &li.start_element[0], EL_PLAYER_1 + }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(11), + &li.use_artwork_element[0], FALSE + }, + { + EL_PLAYER_1, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(2), + &li.artwork_element[0], EL_PLAYER_1 + }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(12), + &li.use_explosion_element[0], FALSE + }, + { + EL_PLAYER_1, -1, + TYPE_ELEMENT, CONF_VALUE_16_BIT(3), + &li.explosion_element[0], EL_PLAYER_1 + }, + + { + -1, -1, + -1, -1, + NULL, -1 + } }; static struct @@ -1194,7 +1249,11 @@ static void setEventFlagsFromEventBits(struct ElementChangeInfo *change) { int i; - /* important: only change event flag if corresponding event bit is set */ + /* important: only change event flag if corresponding event bit is set + (this is because all xx_event_bits[] values are loaded separately, + and all xx_event_bits[] values are set back to zero before loading + another value xx_event_bits[x] (each value representing 32 flags)) */ + for (i = 0; i < NUM_CHANGE_EVENTS; i++) if (xx_event_bits[CH_EVENT_BITFIELD_NR(i)] & CH_EVENT_BIT(i)) change->has_event[i] = TRUE; @@ -1204,7 +1263,11 @@ static void setEventBitsFromEventFlags(struct ElementChangeInfo *change) { int i; - /* important: only change event bit if corresponding event flag is set */ + /* in contrast to the above function setEventFlagsFromEventBits(), it + would also be possible to set all bits in xx_event_bits[] to 0 or 1 + depending on the corresponding change->has_event[i] values here, as + all xx_event_bits[] values are reset in resetEventBits() before */ + for (i = 0; i < NUM_CHANGE_EVENTS; i++) if (change->has_event[i]) xx_event_bits[CH_EVENT_BITFIELD_NR(i)] |= CH_EVENT_BIT(i); @@ -1343,16 +1406,10 @@ static void copyConfigFromConfigList(struct LevelFileConfigInfo *conf) } } -#if 1 void copyElementInfo(struct ElementInfo *ei_from, struct ElementInfo *ei_to) { -#if 1 int i; -#else - int i, x, y; -#endif -#if 1 xx_ei = *ei_from; /* copy element data into temporary buffer */ yy_ei = *ei_to; /* copy element data into temporary buffer */ @@ -1360,56 +1417,6 @@ void copyElementInfo(struct ElementInfo *ei_from, struct ElementInfo *ei_to) *ei_from = xx_ei; *ei_to = yy_ei; -#endif - -#if 0 - /* ---------- copy element description ---------- */ - for (i = 0; i < MAX_ELEMENT_NAME_LEN + 1; i++) - ei_to->description[i] = ei_from->description[i]; - - /* ---------- copy element base properties ---------- */ - ei_to->properties[EP_BITFIELD_BASE_NR] = - ei_from->properties[EP_BITFIELD_BASE_NR]; - - /* ---------- copy custom property values ---------- */ - - ei_to->use_gfx_element = ei_from->use_gfx_element; - ei_to->gfx_element = ei_from->gfx_element; - - ei_to->access_direction = ei_from->access_direction; - - ei_to->collect_score_initial = ei_from->collect_score_initial; - ei_to->collect_count_initial = ei_from->collect_count_initial; - - ei_to->ce_value_fixed_initial = ei_from->ce_value_fixed_initial; - ei_to->ce_value_random_initial = ei_from->ce_value_random_initial; - ei_to->use_last_ce_value = ei_from->use_last_ce_value; - - ei_to->push_delay_fixed = ei_from->push_delay_fixed; - ei_to->push_delay_random = ei_from->push_delay_random; - ei_to->drop_delay_fixed = ei_from->drop_delay_fixed; - ei_to->drop_delay_random = ei_from->drop_delay_random; - ei_to->move_delay_fixed = ei_from->move_delay_fixed; - ei_to->move_delay_random = ei_from->move_delay_random; - - ei_to->move_pattern = ei_from->move_pattern; - ei_to->move_direction_initial = ei_from->move_direction_initial; - ei_to->move_stepsize = ei_from->move_stepsize; - - ei_to->move_enter_element = ei_from->move_enter_element; - ei_to->move_leave_element = ei_from->move_leave_element; - ei_to->move_leave_type = ei_from->move_leave_type; - - ei_to->slippery_type = ei_from->slippery_type; - - ei_to->explosion_type = ei_from->explosion_type; - ei_to->explosion_delay = ei_from->explosion_delay; - ei_to->ignition_delay = ei_from->ignition_delay; - - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - ei_to->content.e[x][y] = ei_from->content.e[x][y]; -#endif /* ---------- reinitialize and copy change pages ---------- */ @@ -1428,7 +1435,6 @@ void copyElementInfo(struct ElementInfo *ei_from, struct ElementInfo *ei_to) /* mark this custom element as modified */ ei_to->modified_settings = TRUE; } -#endif void setElementChangePages(struct ElementInfo *ei, int change_pages) { @@ -1447,55 +1453,18 @@ void setElementChangePages(struct ElementInfo *ei, int change_pages) void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) { -#if 0 - int i, x, y; -#endif - -#if 1 xx_change = *change; /* copy change data into temporary buffer */ + +#if 0 + /* (not needed; set by setConfigToDefaultsFromConfigList()) */ xx_num_contents = 1; +#endif setConfigToDefaultsFromConfigList(chunk_config_CUSX_change); *change = xx_change; resetEventFlags(change); -#endif - -#if 0 - change->can_change = FALSE; - - for (i = 0; i < NUM_CHANGE_EVENTS; i++) - change->has_event[i] = FALSE; - - change->trigger_player = CH_PLAYER_ANY; - change->trigger_side = CH_SIDE_ANY; - change->trigger_page = CH_PAGE_ANY; - - change->target_element = EL_EMPTY_SPACE; - - change->delay_fixed = 0; - change->delay_random = 0; - change->delay_frames = FRAMES_PER_SECOND; - - change->trigger_element = EL_EMPTY_SPACE; - - change->explode = FALSE; - 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; - - change->has_action = FALSE; - change->action_type = CA_NO_ACTION; - change->action_mode = CA_MODE_UNDEFINED; - change->action_arg = CA_ARG_UNDEFINED; - - for (x = 0; x < 3; x++) - for (y = 0; y < 3; y++) - change->target_content.e[x][y] = EL_EMPTY_SPACE; -#endif change->direct_action = 0; change->other_action = 0; @@ -1508,142 +1477,34 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) static void setLevelInfoToDefaults(struct LevelInfo *level) { static boolean clipboard_elements_initialized = FALSE; -#if 0 - int i, j, x, y; -#else int i, x, y; -#endif -#if 1 InitElementPropertiesStatic(); -#endif -#if 1 li = *level; /* copy level data into temporary buffer */ setConfigToDefaultsFromConfigList(chunk_config_INFO); setConfigToDefaultsFromConfigList(chunk_config_ELEM); *level = li; /* copy temporary buffer back to level data */ -#endif setLevelInfoToDefaults_EM(); level->native_em_level = &native_em_level; -#if 0 - level->game_engine_type = GAME_ENGINE_TYPE_RND; -#endif - level->file_version = FILE_VERSION_ACTUAL; level->game_version = GAME_VERSION_ACTUAL; level->creation_date = getCurrentDate(); -#if 1 level->encoding_16bit_field = TRUE; level->encoding_16bit_yamyam = TRUE; level->encoding_16bit_amoeba = TRUE; -#else - level->encoding_16bit_field = FALSE; /* default: only 8-bit elements */ - level->encoding_16bit_yamyam = FALSE; /* default: only 8-bit elements */ - level->encoding_16bit_amoeba = FALSE; /* default: only 8-bit elements */ -#endif - -#if 0 - level->fieldx = STD_LEV_FIELDX; - level->fieldy = STD_LEV_FIELDY; -#endif for (x = 0; x < MAX_LEV_FIELDX; x++) for (y = 0; y < MAX_LEV_FIELDY; y++) level->field[x][y] = EL_SAND; -#if 0 - level->time = 100; - level->gems_needed = 0; - - level->amoeba_speed = 10; - - level->time_magic_wall = 10; - level->time_wheel = 10; -#endif -#if 0 - level->time_light = 10; - level->time_timegate = 10; -#endif - -#if 0 - level->amoeba_content = EL_DIAMOND; -#endif - -#if 0 - level->game_of_life[0] = 2; - level->game_of_life[1] = 3; - level->game_of_life[2] = 3; - level->game_of_life[3] = 3; - - level->biomaze[0] = 2; - level->biomaze[1] = 3; - level->biomaze[2] = 3; - level->biomaze[3] = 3; -#endif - -#if 0 - level->double_speed = FALSE; -#endif -#if 0 - level->initial_gravity = FALSE; - level->em_slippery_gems = FALSE; - level->instant_relocation = FALSE; - level->can_pass_to_walkable = FALSE; - level->grow_into_diggable = TRUE; -#endif - -#if 0 - level->block_snap_field = TRUE; -#endif - -#if 0 - level->block_last_field = FALSE; /* EM does not block by default */ - level->sp_block_last_field = TRUE; /* SP blocks the last field */ - - level->can_move_into_acid_bits = ~0; /* everything can move into acid */ - level->dont_collide_with_bits = ~0; /* always deadly when colliding */ - - level->use_spring_bug = FALSE; - level->use_time_orb_bug = FALSE; - - level->use_step_counter = FALSE; -#endif - - /* values for the new EMC elements */ -#if 0 - level->android_move_time = 10; - level->android_clone_time = 10; - level->ball_time = 10; - level->lenses_score = 10; - level->lenses_time = 10; - level->magnify_score = 10; - level->magnify_time = 10; - level->slurp_score = 10; - level->wind_direction_initial = MV_NONE; - level->ball_random = FALSE; - level->ball_state_initial = FALSE; - - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (x = 0; x < 3; x++) - for (y = 0; y < 3; y++) - level->ball_content[i].e[x][y] = EL_EMPTY; - - for (i = 0; i < 16; i++) - level->android_array[i] = FALSE; -#endif - -#if 0 - level->use_custom_template = FALSE; -#endif - for (i = 0; i < MAX_LEVEL_NAME_LEN; i++) level->name[i] = '\0'; for (i = 0; i < MAX_LEVEL_AUTHOR_LEN; i++) @@ -1652,29 +1513,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) strcpy(level->name, NAMELESS_LEVEL_NAME); strcpy(level->author, ANONYMOUS_NAME); -#if 0 - for (i = 0; i < 4; i++) - { - level->envelope_text[i][0] = '\0'; - level->envelope_xsize[i] = MAX_ENVELOPE_XSIZE; - level->envelope_ysize[i] = MAX_ENVELOPE_YSIZE; - } -#endif - -#if 0 - for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++) - level->score[i] = (i == SC_TIME_BONUS ? 1 : 10); -#endif - -#if 0 - level->num_yamyam_contents = STD_ELEMENT_CONTENTS; - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (x = 0; x < 3; x++) - for (y = 0; y < 3; y++) - level->yamyam_content[i].e[x][y] = - (i < STD_ELEMENT_CONTENTS ? EL_ROCK : EL_EMPTY); -#endif - level->field[0][0] = EL_PLAYER_1; level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; @@ -1683,6 +1521,11 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) int element = i; struct ElementInfo *ei = &element_info[element]; + /* never initialize clipboard elements after the very first time */ + /* (to be able to use clipboard elements between several levels) */ + if (IS_CLIPBOARD_ELEMENT(element) && clipboard_elements_initialized) + continue; + if (IS_ENVELOPE(element)) { int envelope_nr = element - EL_ENVELOPE_1; @@ -1692,7 +1535,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->envelope[envelope_nr] = xx_envelope; } -#if 1 if (IS_CUSTOM_ELEMENT(element) || IS_GROUP_ELEMENT(element) || IS_INTERNAL_ELEMENT(element)) @@ -1703,12 +1545,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) *ei = xx_ei; } -#endif - - /* never initialize clipboard elements after the very first time */ - /* (to be able to use clipboard elements between several levels) */ - if (IS_CLIPBOARD_ELEMENT(element) && clipboard_elements_initialized) - continue; setElementChangePages(ei, 1); setElementChangeInfoToDefaults(ei->change); @@ -1717,22 +1553,7 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) IS_GROUP_ELEMENT(element) || IS_INTERNAL_ELEMENT(element)) { -#if 1 setElementDescriptionToDefault(ei); -#else - for (j = 0; j < MAX_ELEMENT_NAME_LEN + 1; j++) - ei->description[j] = '\0'; - - if (ei->custom_description != NULL) - strncpy(ei->description, ei->custom_description,MAX_ELEMENT_NAME_LEN); - else - strcpy(ei->description, ei->editor_description); -#endif - -#if 0 - ei->use_gfx_element = FALSE; - ei->gfx_element = EL_EMPTY_SPACE; -#endif ei->modified_settings = FALSE; } @@ -1740,46 +1561,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) if (IS_CUSTOM_ELEMENT(element) || IS_INTERNAL_ELEMENT(element)) { -#if 0 - ei->access_direction = MV_ALL_DIRECTIONS; - - ei->collect_score_initial = 10; /* special default */ - ei->collect_count_initial = 1; /* special default */ - - ei->ce_value_fixed_initial = 0; - ei->ce_value_random_initial = 0; - ei->use_last_ce_value = FALSE; - -#endif -#if 0 - ei->push_delay_fixed = -1; /* initialize later */ - ei->push_delay_random = -1; /* initialize later */ -#endif -#if 0 - ei->drop_delay_fixed = 0; - ei->drop_delay_random = 0; - ei->move_delay_fixed = 0; - ei->move_delay_random = 0; - - ei->move_pattern = MV_ALL_DIRECTIONS; - ei->move_direction_initial = MV_START_AUTOMATIC; - ei->move_stepsize = TILEX / 8; - - ei->move_enter_element = EL_EMPTY_SPACE; - ei->move_leave_element = EL_EMPTY_SPACE; - ei->move_leave_type = LEAVE_TYPE_UNLIMITED; - - ei->slippery_type = SLIPPERY_ANY_RANDOM; - - ei->explosion_type = EXPLODES_3X3; - ei->explosion_delay = 16; - ei->ignition_delay = 8; - - for (x = 0; x < 3; x++) - for (y = 0; y < 3; y++) - ei->content.e[x][y] = EL_EMPTY_SPACE; -#endif - /* internal values used in level editor */ ei->access_type = 0; @@ -1794,24 +1575,6 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) ei->can_explode_impact = FALSE; ei->current_change_page = 0; - -#if 0 - /* !!! now done in InitElementPropertiesStatic() (see above) !!! */ - /* !!! (else properties set there will be overwritten here) !!! */ - /* start with no properties at all */ -#if 1 - for (j = 0; j < NUM_EP_BITFIELDS; j++) - ei->properties[j] = EP_BITMASK_DEFAULT; -#else - for (j = 0; j < NUM_EP_BITFIELDS; j++) - Properties[element][j] = EP_BITMASK_DEFAULT; -#endif -#endif - -#if 0 - /* now set default properties */ - SET_PROPERTY(element, EP_CAN_MOVE_INTO_ACID, TRUE); -#endif } if (IS_GROUP_ELEMENT(element) || @@ -1825,23 +1588,11 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) group = ei->group; -#if 1 xx_group = *group; /* copy group data into temporary buffer */ setConfigToDefaultsFromConfigList(chunk_config_GRPX); *group = xx_group; -#endif - -#if 0 - for (j = 0; j < MAX_ELEMENTS_IN_GROUP; j++) - group->element[j] = EL_EMPTY_SPACE; - - /* default: only one element in group */ - group->num_elements = 1; - - group->choice_mode = ANIM_RANDOM; -#endif } } @@ -1898,15 +1649,9 @@ static void setFileInfoToDefaults(struct LevelFileInfo *level_file_info) static void ActivateLevelTemplate() { -#if 1 /* Currently there is no special action needed to activate the template data, because 'element_info' property settings overwrite the original level data, while all other variables do not change. */ -#else - /* Currently there is no special action needed to activate the template - data, because 'element_info' and 'Properties' overwrite the original - level data, while all other variables do not change. */ -#endif } static char *getLevelFilenameFromBasename(char *basename) @@ -2299,12 +2044,12 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) STEPSIZE_NORMAL); for (i = 0; i < MAX_PLAYERS; i++) - level->initial_player_stepsize[0] = initial_player_stepsize; + level->initial_player_stepsize[i] = initial_player_stepsize; initial_player_gravity = (getFile8Bit(file) == 1 ? TRUE : FALSE); for (i = 0; i < MAX_PLAYERS; i++) - level->initial_player_gravity[0] = initial_player_gravity; + level->initial_player_gravity[i] = initial_player_gravity; level->encoding_16bit_field = (getFile8Bit(file) == 1 ? TRUE : FALSE); level->em_slippery_gems = (getFile8Bit(file) == 1 ? TRUE : FALSE); @@ -2514,28 +2259,15 @@ static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level) int element = getMappedElement(getFile16BitBE(file)); int properties = getFile32BitBE(file); -#if 1 if (IS_CUSTOM_ELEMENT(element)) element_info[element].properties[EP_BITFIELD_BASE_NR] = properties; else Error(ERR_WARN, "invalid custom element number %d", element); -#else - if (IS_CUSTOM_ELEMENT(element)) - Properties[element][EP_BITFIELD_BASE_NR] = properties; - else - Error(ERR_WARN, "invalid custom element number %d", element); -#endif -#if 1 /* older game versions that wrote level files with CUS1 chunks used different default push delay values (not yet stored in level file) */ element_info[element].push_delay_fixed = 2; element_info[element].push_delay_random = 8; -#else - /* needed for older levels (see src/init.c for details) */ - element_info[element].push_delay_fixed = -1; /* initialize later */ - element_info[element].push_delay_random = -1; /* initialize later */ -#endif } return chunk_size; @@ -2596,11 +2328,7 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) ei->description[j] = getFile8Bit(file); ei->description[MAX_ELEMENT_NAME_LEN] = 0; -#if 1 ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file); -#else - Properties[element][EP_BITFIELD_BASE_NR] = getFile32BitBE(file); -#endif /* some free bytes for future properties and padding */ ReadUnusedBytesFromFile(file, 7); @@ -2687,11 +2415,8 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->description[i] = getFile8Bit(file); ei->description[MAX_ELEMENT_NAME_LEN] = 0; -#if 1 ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file); -#else - Properties[element][EP_BITFIELD_BASE_NR] = getFile32BitBE(file); -#endif + ReadUnusedBytesFromFile(file, 4); /* reserved for more base properties */ ei->num_change_pages = getFile8Bit(file); @@ -2873,10 +2598,6 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, int num_bytes = getFile16BitBE(file); byte *buffer = checked_malloc(num_bytes); -#if 0 - printf("::: - found multi bytes\n"); -#endif - ReadBytesFromFile(file, buffer, num_bytes); for (i = 0; conf[i].data_type != -1; i++) @@ -2897,7 +2618,21 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, num_entities = max_num_entities; } - *(int *)(conf[i].num_entities) = num_entities; + if (num_entities == 0 && (data_type == TYPE_ELEMENT_LIST || + data_type == TYPE_CONTENT_LIST)) + { + /* for element and content lists, zero entities are not allowed */ + Error(ERR_WARN, "found empty list of entities for element %d", + element); + + /* do not set "num_entities" here to prevent reading behind buffer */ + + *(int *)(conf[i].num_entities) = 1; /* at least one is required */ + } + else + { + *(int *)(conf[i].num_entities) = num_entities; + } element_found = TRUE; @@ -2946,10 +2681,6 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, byte_mask == CONF_MASK_2_BYTE ? getFile16BitBE(file) : byte_mask == CONF_MASK_4_BYTE ? getFile32BitBE(file) : 0); -#if 0 - printf("::: - found single bytes\n"); -#endif - for (i = 0; conf[i].data_type != -1; i++) { if (conf[i].element == element && @@ -3010,135 +2741,46 @@ static int LoadLevel_INFO(FILE *file, int chunk_size, struct LevelInfo *level) return real_chunk_size; } -static int LoadLevel_ELEM(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CONF(FILE *file, int chunk_size, struct LevelInfo *level) { int real_chunk_size = 0; -#if 1 li = *level; /* copy level data into temporary buffer */ -#endif while (!feof(file)) { int element = getMappedElement(getFile16BitBE(file)); -#if 1 + real_chunk_size += 2; - real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_ELEM, + real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CONF, element, element); -#else - int conf_type = getFile8Bit(file); - int byte_mask = conf_type & CONF_MASK_BYTES; - boolean element_found = FALSE; - int i; - - real_chunk_size += 3; - -#if 0 - li = *level; /* copy level data into temporary buffer */ -#endif - - if (byte_mask == CONF_MASK_MULTI_BYTES) - { - int num_bytes = getFile16BitBE(file); - byte *buffer = checked_malloc(num_bytes); - - ReadBytesFromFile(file, buffer, num_bytes); - - for (i = 0; chunk_config_ELEM[i].data_type != -1; i++) - { - if (chunk_config_ELEM[i].element == element && - chunk_config_ELEM[i].conf_type == conf_type) - { - int data_type = chunk_config_ELEM[i].data_type; - int num_entities = num_bytes / CONF_ENTITY_NUM_BYTES(data_type); - int max_num_entities = chunk_config_ELEM[i].max_num_entities; - - if (num_entities > max_num_entities) - { - Error(ERR_WARN, - "truncating number of entities for element %d from %d to %d", - element, num_entities, max_num_entities); - - num_entities = max_num_entities; - } - - *(int *)(chunk_config_ELEM[i].num_entities) = num_entities; - - element_found = TRUE; - - if (data_type == TYPE_ELEMENT_LIST) - { - int *element_array = (int *)(chunk_config_ELEM[i].value); - int j; - - for (j = 0; j < num_entities; j++) - element_array[j] = - getMappedElement(CONF_ELEMENTS_ELEMENT(buffer, j)); - } - else if (data_type == TYPE_CONTENT_LIST) - { - struct Content *content= (struct Content *)(chunk_config_ELEM[i].value); - int c, x, y; - - for (c = 0; c < num_entities; c++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - content[c].e[x][y] = - getMappedElement(CONF_CONTENTS_ELEMENT(buffer, c, x, y)); - } - else - element_found = FALSE; - - break; - } - } - - checked_free(buffer); - - real_chunk_size += 2 + num_bytes; - } - else /* constant size configuration data (1, 2 or 4 bytes) */ - { - int value = (byte_mask == CONF_MASK_1_BYTE ? getFile8Bit (file) : - byte_mask == CONF_MASK_2_BYTE ? getFile16BitBE(file) : - byte_mask == CONF_MASK_4_BYTE ? getFile32BitBE(file) : 0); - - for (i = 0; chunk_config_ELEM[i].data_type != -1; i++) - { - if (chunk_config_ELEM[i].element == element && - chunk_config_ELEM[i].conf_type == conf_type) - { - int data_type = chunk_config_ELEM[i].data_type; - - if (data_type == TYPE_BOOLEAN) - *(boolean *)(chunk_config_ELEM[i].value) = value; - else - *(int *) (chunk_config_ELEM[i].value) = value; + if (real_chunk_size >= chunk_size) + break; + } - element_found = TRUE; + *level = li; /* copy temporary buffer back to level data */ - break; - } - } + return real_chunk_size; +} - real_chunk_size += CONF_VALUE_NUM_BYTES(byte_mask); - } +static int LoadLevel_ELEM(FILE *file, int chunk_size, struct LevelInfo *level) +{ + int real_chunk_size = 0; - if (!element_found) - Error(ERR_WARN, "cannot load CONF value for element %d", element); -#endif + li = *level; /* copy level data into temporary buffer */ -#if 0 - *level = li; /* copy temporary buffer back to level data */ -#endif + while (!feof(file)) + { + int element = getMappedElement(getFile16BitBE(file)); + real_chunk_size += 2; + real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_ELEM, + element, element); if (real_chunk_size >= chunk_size) break; } -#if 1 *level = li; /* copy temporary buffer back to level data */ -#endif return real_chunk_size; } @@ -3170,10 +2812,6 @@ static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level) struct ElementInfo *ei = &element_info[element]; int i; -#if 0 - printf("::: CUSX: loading element '%s' ...\n", EL_NAME(element)); -#endif - xx_ei = *ei; /* copy element data into temporary buffer */ xx_ei.num_change_pages = -1; @@ -3182,11 +2820,6 @@ static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level) { real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CUSX_base, -1, element); - -#if 0 - printf("::: - real_chunk_size now %d\n", real_chunk_size); -#endif - if (xx_ei.num_change_pages != -1) break; @@ -3358,6 +2991,7 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, { "CUS3", -1, LoadLevel_CUS3 }, { "CUS4", -1, LoadLevel_CUS4 }, { "GRP1", -1, LoadLevel_GRP1 }, + { "CONF", -1, LoadLevel_CONF }, { "ELEM", -1, LoadLevel_ELEM }, { "NOTE", -1, LoadLevel_NOTE }, { "CUSX", -1, LoadLevel_CUSX }, @@ -3852,14 +3486,6 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) struct PLAYER **ply = level_em->ply; int i, j, x, y; -#if 0 - printf("::: A\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif - lev->width = MIN(level->fieldx, EM_MAX_CAVE_WIDTH); lev->height = MIN(level->fieldy, EM_MAX_CAVE_HEIGHT); @@ -3912,41 +3538,13 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) map_element_RND_to_EM(level-> ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#if 0 - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif - map_android_clone_elements_RND_to_EM(level); -#if 0 - for (i = 0; i < 16; i++) - lev->android_array[i] = FALSE; /* !!! YET TO COME !!! */ -#endif - /* first fill the complete playfield with the default border element */ for (y = 0; y < EM_MAX_CAVE_HEIGHT; y++) for (x = 0; x < EM_MAX_CAVE_WIDTH; x++) level_em->cave[x][y] = ZBORDER; -#if 1 - -#if 0 -#if 1 - LoadLevel_InitPlayfield(); -#else - lev_fieldx = lev->width; /* !!! also in LoadLevel_InitPlayfield() !!! */ - lev_fieldy = lev->height; /* !!! also in LoadLevel_InitPlayfield() !!! */ - SetBorderElement(); /* !!! also in LoadLevel_InitPlayfield() !!! */ -#endif -#endif - -#if 0 - printf("::: BorderElement == %d\n", BorderElement); -#endif - if (BorderElement == EL_STEELWALL) { for (y = 0; y < lev->height + 2; y++) @@ -3968,44 +3566,15 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) level_em->cave[xx][yy] = new_element; } -#else - - /* then copy the real level contents from level file into the playfield */ - for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++) - { - int new_element = map_element_RND_to_EM(level->field[x][y]); - - if (level->field[x][y] == EL_AMOEBA_DEAD) - new_element = map_element_RND_to_EM(EL_AMOEBA_WET); - - level_em->cave[x + 1][y + 1] = new_element; - } - -#endif - -#if 1 - for (i = 0; i < MAX_PLAYERS; i++) { ply[i]->x_initial = 0; ply[i]->y_initial = 0; } -#else - - ply1->x_initial = 0; - ply1->y_initial = 0; - - ply2->x_initial = 0; - ply2->y_initial = 0; - -#endif - /* initialize player positions and delete players from the playfield */ for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++) { - -#if 1 if (ELEM_IS_PLAYER(level->field[x][y])) { int player_nr = GET_PLAYER_NR(level->field[x][y]); @@ -4018,43 +3587,12 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) level_em->cave[xx][yy] = map_element_RND_to_EM(EL_EMPTY); } - -#else - -#if 1 - /* !!! CURRENTLY ONLY SUPPORT FOR ONE PLAYER !!! */ - if (ELEM_IS_PLAYER(level->field[x][y])) - { - ply1->x_initial = x + 1; - ply1->y_initial = y + 1; - level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); - } -#else - /* !!! ADD SUPPORT FOR MORE THAN ONE PLAYER !!! */ - if (level->field[x][y] == EL_PLAYER_1) - { - ply1->x_initial = x + 1; - ply1->y_initial = y + 1; - level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); - } - else if (level->field[x][y] == EL_PLAYER_2) - { - ply2->x_initial = x + 1; - ply2->y_initial = y + 1; - level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); - } -#endif - -#endif - } if (BorderElement == EL_STEELWALL) { -#if 1 lev->width += 2; lev->height += 2; -#endif } } @@ -4124,34 +3662,13 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->wind_direction_initial = map_direction_EM_to_RND(lev->wind_direction_initial); -#if 0 - printf("::: foo\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) for (j = 0; j < 8; j++) level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]] = map_element_EM_to_RND(lev->ball_array[i][j]); -#if 0 - printf("::: bar\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif - map_android_clone_elements_EM_to_RND(level); -#if 0 - for (i = 0; i < 16; i++) - level->android_array[i] = FALSE; /* !!! YET TO COME !!! */ -#endif - /* convert the playfield (some elements need special treatment) */ for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) { @@ -4163,16 +3680,6 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->field[x][y] = new_element; } -#if 0 - printf("::: bar 0\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif - -#if 1 - for (i = 0; i < MAX_PLAYERS; i++) { /* in case of all players set to the same field, use the first player */ @@ -4180,33 +3687,9 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) int jx = ply[nr]->x_initial - 1; int jy = ply[nr]->y_initial - 1; -#if 0 - printf("::: player %d: %d, %d\n", nr, jx, jy); -#endif - if (jx != -1 && jy != -1) level->field[jx][jy] = EL_PLAYER_1 + nr; } - -#else - - /* in case of both players set to the same field, use the first player */ - level->field[ply2->x_initial - 1][ply2->y_initial - 1] = EL_PLAYER_2; - level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; - -#endif - -#if 0 - printf("::: native Emerald Mine file version: %d\n", level_em->file_version); -#endif - -#if 0 - printf("::: bar 2\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); -#endif } static void LoadLevelFromFileInfo_EM(struct LevelInfo *level, @@ -4224,30 +3707,6 @@ void CopyNativeLevel_RND_to_Native(struct LevelInfo *level) void CopyNativeLevel_Native_to_RND(struct LevelInfo *level) { - -#if 0 - { - static int ball_xy[8][2] = - { - { 0, 0 }, - { 1, 0 }, - { 2, 0 }, - { 0, 1 }, - { 2, 1 }, - { 0, 2 }, - { 1, 2 }, - { 2, 2 }, - }; - int i, j; - - printf("::: A6\n"); - for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) - for (j = 0; j < 8; j++) - printf("::: ball %d, %d: %d\n", i, j, - level->ball_content[i].e[ball_xy[j][0]][ball_xy[j][1]]); - } -#endif - if (level->game_engine_type == GAME_ENGINE_TYPE_EM) CopyNativeLevel_EM_to_RND(level); } @@ -4412,7 +3871,7 @@ static void LoadLevelFromFileStream_SP(FILE *file, struct LevelInfo *level, /* original Supaplex does not use score values -- use default values */ #else for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++) - level->score[i] = 0; /* !!! CORRECT THIS !!! */ + level->score[i] = 0; #endif /* there are no yamyams in supaplex levels */ @@ -4486,7 +3945,7 @@ static void LoadLevelFromFileInfo_SP(struct LevelInfo *level, level->name[i] = '-'; /* correct trailing multipart level meta information in level name */ - for (i = SP_LEVEL_NAME_LEN - 1; i>=0 && level->name[i] == name_last; i--) + for (i = SP_LEVEL_NAME_LEN - 1; i >= 0 && level->name[i] == name_last; i--) level->name[i] = '-'; /* ---------- check for normal single level ---------- */ @@ -4601,29 +4060,1671 @@ static void LoadLevelFromFileInfo_SP(struct LevelInfo *level, *level = multipart_level; } -/* ------------------------------------------------------------------------- */ -/* functions for loading generic level */ -/* ------------------------------------------------------------------------- */ -void LoadLevelFromFileInfo(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) +#define DC_LEVEL_HEADER_SIZE 344 + +unsigned short getDecodedWord_DC(unsigned short data_encoded, boolean init) { - /* always start with reliable default values */ - setLevelInfoToDefaults(level); + static int last_data_encoded; + static int offset1; + static int offset2; + int diff; + int diff_hi, diff_lo; + int data_hi, data_lo; + unsigned short data_decoded; - switch (level_file_info->type) + if (init) { - case LEVEL_FILE_TYPE_RND: - LoadLevelFromFileInfo_RND(level, level_file_info); + last_data_encoded = 0; + offset1 = -1; + offset2 = 0; + + return 0; + } + + diff = data_encoded - last_data_encoded; + diff_hi = diff & ~0xff; + diff_lo = diff & 0xff; + + offset2 += diff_lo; + + data_hi = diff_hi - (offset1 << 8) + (offset2 & 0xff00); + data_lo = (diff_lo + (data_hi >> 16)) & 0x00ff; + data_hi = data_hi & 0xff00; + + data_decoded = data_hi | data_lo; + + last_data_encoded = data_encoded; + + offset1 = (offset1 + 1) % 31; + offset2 = offset2 & 0xff; + + return data_decoded; +} + +int getMappedElement_DC(int element) +{ + switch (element) + { + case 0x0000: + element = EL_ROCK; break; - case LEVEL_FILE_TYPE_EM: - LoadLevelFromFileInfo_EM(level, level_file_info); - level->game_engine_type = GAME_ENGINE_TYPE_EM; + /* 0x0117 - 0x036e: (?) */ + /* EL_DIAMOND */ + + /* 0x042d - 0x0684: (?) */ + /* EL_EMERALD */ + + case 0x06f1: + element = EL_NUT; break; - case LEVEL_FILE_TYPE_SP: - LoadLevelFromFileInfo_SP(level, level_file_info); + case 0x074c: + element = EL_BOMB; + break; + + case 0x07a4: + element = EL_PEARL; + break; + + case 0x0823: + element = EL_CRYSTAL; + break; + + case 0x0e77: /* quicksand (boulder) */ + element = EL_QUICKSAND_FULL; + break; + + case 0x0e99: /* slow quicksand (boulder) */ + element = EL_QUICKSAND_FULL; + break; + + case 0x0ed2: + element = EL_EXIT_OPEN; + break; + + case 0x0ee3: + element = EL_EXIT_CLOSED; + break; + + case 0x0eeb: + element = EL_STEEL_EXIT_OPEN; + break; + + case 0x0efc: + element = EL_STEEL_EXIT_CLOSED; + break; + + case 0x0f4f: /* dynamite (lit 1) */ + element = EL_DYNAMITE_ACTIVE; + break; + + case 0x0f57: /* dynamite (lit 2) */ + element = EL_DYNAMITE_ACTIVE; + break; + + case 0x0f5f: /* dynamite (lit 3) */ + element = EL_DYNAMITE_ACTIVE; + break; + + case 0x0f67: /* dynamite (lit 4) */ + element = EL_DYNAMITE_ACTIVE; + break; + + case 0x0f81: + case 0x0f82: + case 0x0f83: + case 0x0f84: + element = EL_AMOEBA_WET; + break; + + case 0x0f85: + element = EL_AMOEBA_DROP; + break; + + case 0x0fb9: + element = EL_MAGIC_WALL; + break; + + case 0x0fd0: + element = EL_SPACESHIP_UP; + break; + + case 0x0fd9: + element = EL_SPACESHIP_DOWN; + break; + + case 0x0ff1: + element = EL_SPACESHIP_LEFT; + break; + + case 0x0ff9: + element = EL_SPACESHIP_RIGHT; + break; + + case 0x1057: + element = EL_BUG_UP; + break; + + case 0x1060: + element = EL_BUG_DOWN; + break; + + case 0x1078: + element = EL_BUG_LEFT; + break; + + case 0x1080: + element = EL_BUG_RIGHT; + break; + + case 0x10de: + element = EL_MOLE_UP; + break; + + case 0x10e7: + element = EL_MOLE_DOWN; + break; + + case 0x10ff: + element = EL_MOLE_LEFT; + break; + + case 0x1107: + element = EL_MOLE_RIGHT; + break; + + case 0x11c0: + element = EL_ROBOT; + break; + + case 0x13f5: + element = EL_YAMYAM; + break; + + case 0x1425: + element = EL_SWITCHGATE_OPEN; + break; + + case 0x1426: + element = EL_SWITCHGATE_CLOSED; + break; + + case 0x1437: + element = EL_SWITCHGATE_SWITCH_UP; + break; + + case 0x143a: + element = EL_TIMEGATE_CLOSED; + break; + + case 0x144c: /* conveyor belt switch (green) */ + element = EL_CONVEYOR_BELT_3_SWITCH_MIDDLE; + break; + + case 0x144f: /* conveyor belt switch (red) */ + element = EL_CONVEYOR_BELT_1_SWITCH_MIDDLE; + break; + + case 0x1452: /* conveyor belt switch (blue) */ + element = EL_CONVEYOR_BELT_4_SWITCH_MIDDLE; + break; + + case 0x145b: + element = EL_CONVEYOR_BELT_3_MIDDLE; + break; + + case 0x1463: + element = EL_CONVEYOR_BELT_3_LEFT; + break; + + case 0x146b: + element = EL_CONVEYOR_BELT_3_RIGHT; + break; + + case 0x1473: + element = EL_CONVEYOR_BELT_1_MIDDLE; + break; + + case 0x147b: + element = EL_CONVEYOR_BELT_1_LEFT; + break; + + case 0x1483: + element = EL_CONVEYOR_BELT_1_RIGHT; + break; + + case 0x148b: + element = EL_CONVEYOR_BELT_4_MIDDLE; + break; + + case 0x1493: + element = EL_CONVEYOR_BELT_4_LEFT; + break; + + case 0x149b: + element = EL_CONVEYOR_BELT_4_RIGHT; + break; + + case 0x14ac: + element = EL_EXPANDABLE_WALL_HORIZONTAL; + break; + + case 0x14bd: + element = EL_EXPANDABLE_WALL_VERTICAL; + break; + + case 0x14c6: + element = EL_EXPANDABLE_WALL_ANY; + break; + + case 0x14ce: /* growing steel wall (left/right) */ + element = EL_EXPANDABLE_WALL_HORIZONTAL; + break; + + case 0x14df: /* growing steel wall (up/down) */ + element = EL_EXPANDABLE_WALL_VERTICAL; + break; + + case 0x14e8: /* growing steel wall (up/down/left/right) */ + element = EL_EXPANDABLE_WALL_ANY; + break; + + case 0x14e9: + element = EL_SHIELD_NORMAL; + break; + + case 0x1501: + element = EL_EXTRA_TIME; + break; + + case 0x154f: + element = EL_ACID; + break; + + case 0x1577: + element = EL_EMPTY_SPACE; + break; + + case 0x1578: /* quicksand (empty) */ + element = EL_QUICKSAND_EMPTY; + break; + + case 0x1579: /* slow quicksand (empty) */ + element = EL_QUICKSAND_EMPTY; + break; + + /* 0x157c - 0x158b: */ + /* EL_SAND */ + + /* 0x1590 - 0x159f: */ + /* EL_LANDMINE */ + + case 0x15a0: + element = EL_DYNAMITE; + break; + + case 0x15a1: /* key (red) */ + element = EL_EM_KEY_1; + break; + + case 0x15a2: /* key (yellow) */ + element = EL_EM_KEY_2; + break; + + case 0x15a3: /* key (blue) */ + element = EL_EM_KEY_4; + break; + + case 0x15a4: /* key (green) */ + element = EL_EM_KEY_3; + break; + + case 0x15a5: /* key (white) */ + element = EL_KEY_WHITE; + break; + + case 0x15a6: + element = EL_WALL_SLIPPERY; + break; + + case 0x15a7: + element = EL_WALL; + break; + + case 0x15a8: /* wall (not round) */ + element = EL_WALL; + break; + + case 0x15a9: /* (blue) */ + element = EL_CHAR_A; + break; + + case 0x15aa: /* (blue) */ + element = EL_CHAR_B; + break; + + case 0x15ab: /* (blue) */ + element = EL_CHAR_C; + break; + + case 0x15ac: /* (blue) */ + element = EL_CHAR_D; + break; + + case 0x15ad: /* (blue) */ + element = EL_CHAR_E; + break; + + case 0x15ae: /* (blue) */ + element = EL_CHAR_F; + break; + + case 0x15af: /* (blue) */ + element = EL_CHAR_G; + break; + + case 0x15b0: /* (blue) */ + element = EL_CHAR_H; + break; + + case 0x15b1: /* (blue) */ + element = EL_CHAR_I; + break; + + case 0x15b2: /* (blue) */ + element = EL_CHAR_J; + break; + + case 0x15b3: /* (blue) */ + element = EL_CHAR_K; + break; + + case 0x15b4: /* (blue) */ + element = EL_CHAR_L; + break; + + case 0x15b5: /* (blue) */ + element = EL_CHAR_M; + break; + + case 0x15b6: /* (blue) */ + element = EL_CHAR_N; + break; + + case 0x15b7: /* (blue) */ + element = EL_CHAR_O; + break; + + case 0x15b8: /* (blue) */ + element = EL_CHAR_P; + break; + + case 0x15b9: /* (blue) */ + element = EL_CHAR_Q; + break; + + case 0x15ba: /* (blue) */ + element = EL_CHAR_R; + break; + + case 0x15bb: /* (blue) */ + element = EL_CHAR_S; + break; + + case 0x15bc: /* (blue) */ + element = EL_CHAR_T; + break; + + case 0x15bd: /* (blue) */ + element = EL_CHAR_U; + break; + + case 0x15be: /* (blue) */ + element = EL_CHAR_V; + break; + + case 0x15bf: /* (blue) */ + element = EL_CHAR_W; + break; + + case 0x15c0: /* (blue) */ + element = EL_CHAR_X; + break; + + case 0x15c1: /* (blue) */ + element = EL_CHAR_Y; + break; + + case 0x15c2: /* (blue) */ + element = EL_CHAR_Z; + break; + + case 0x15c3: /* (blue) */ + element = EL_CHAR_AUMLAUT; + break; + + case 0x15c4: /* (blue) */ + element = EL_CHAR_OUMLAUT; + break; + + case 0x15c5: /* (blue) */ + element = EL_CHAR_UUMLAUT; + break; + + case 0x15c6: /* (blue) */ + element = EL_CHAR_0; + break; + + case 0x15c7: /* (blue) */ + element = EL_CHAR_1; + break; + + case 0x15c8: /* (blue) */ + element = EL_CHAR_2; + break; + + case 0x15c9: /* (blue) */ + element = EL_CHAR_3; + break; + + case 0x15ca: /* (blue) */ + element = EL_CHAR_4; + break; + + case 0x15cb: /* (blue) */ + element = EL_CHAR_5; + break; + + case 0x15cc: /* (blue) */ + element = EL_CHAR_6; + break; + + case 0x15cd: /* (blue) */ + element = EL_CHAR_7; + break; + + case 0x15ce: /* (blue) */ + element = EL_CHAR_8; + break; + + case 0x15cf: /* (blue) */ + element = EL_CHAR_9; + break; + + case 0x15d0: /* (blue) */ + element = EL_CHAR_PERIOD; + break; + + case 0x15d1: /* (blue) */ + element = EL_CHAR_EXCLAM; + break; + + case 0x15d2: /* (blue) */ + element = EL_CHAR_COLON; + break; + + case 0x15d3: /* (blue) */ + element = EL_CHAR_LESS; + break; + + case 0x15d4: /* (blue) */ + element = EL_CHAR_GREATER; + break; + + case 0x15d5: /* (blue) */ + element = EL_CHAR_QUESTION; + break; + + case 0x15d6: /* (blue) */ + element = EL_CHAR_COPYRIGHT; + break; + + case 0x15d7: /* (blue) */ + element = EL_CHAR_UP; + break; + + case 0x15d8: /* (blue) */ + element = EL_CHAR_DOWN; + break; + + case 0x15d9: /* (blue) */ + element = EL_CHAR_BUTTON; + break; + + case 0x15da: /* (blue) */ + element = EL_CHAR_PLUS; + break; + + case 0x15db: /* (blue) */ + element = EL_CHAR_MINUS; + break; + + case 0x15dc: /* (blue) */ + element = EL_CHAR_APOSTROPHE; + break; + + case 0x15dd: /* (blue) */ + element = EL_CHAR_PARENLEFT; + break; + + case 0x15de: /* (blue) */ + element = EL_CHAR_PARENRIGHT; + break; + + case 0x15df: /* (green) */ + element = EL_CHAR_A; + break; + + case 0x15e0: /* (green) */ + element = EL_CHAR_B; + break; + + case 0x15e1: /* (green) */ + element = EL_CHAR_C; + break; + + case 0x15e2: /* (green) */ + element = EL_CHAR_D; + break; + + case 0x15e3: /* (green) */ + element = EL_CHAR_E; + break; + + case 0x15e4: /* (green) */ + element = EL_CHAR_F; + break; + + case 0x15e5: /* (green) */ + element = EL_CHAR_G; + break; + + case 0x15e6: /* (green) */ + element = EL_CHAR_H; + break; + + case 0x15e7: /* (green) */ + element = EL_CHAR_I; + break; + + case 0x15e8: /* (green) */ + element = EL_CHAR_J; + break; + + case 0x15e9: /* (green) */ + element = EL_CHAR_K; + break; + + case 0x15ea: /* (green) */ + element = EL_CHAR_L; + break; + + case 0x15eb: /* (green) */ + element = EL_CHAR_M; + break; + + case 0x15ec: /* (green) */ + element = EL_CHAR_N; + break; + + case 0x15ed: /* (green) */ + element = EL_CHAR_O; + break; + + case 0x15ee: /* (green) */ + element = EL_CHAR_P; + break; + + case 0x15ef: /* (green) */ + element = EL_CHAR_Q; + break; + + case 0x15f0: /* (green) */ + element = EL_CHAR_R; + break; + + case 0x15f1: /* (green) */ + element = EL_CHAR_S; + break; + + case 0x15f2: /* (green) */ + element = EL_CHAR_T; + break; + + case 0x15f3: /* (green) */ + element = EL_CHAR_U; + break; + + case 0x15f4: /* (green) */ + element = EL_CHAR_V; + break; + + case 0x15f5: /* (green) */ + element = EL_CHAR_W; + break; + + case 0x15f6: /* (green) */ + element = EL_CHAR_X; + break; + + case 0x15f7: /* (green) */ + element = EL_CHAR_Y; + break; + + case 0x15f8: /* (green) */ + element = EL_CHAR_Z; + break; + + case 0x15f9: /* (green) */ + element = EL_CHAR_AUMLAUT; + break; + + case 0x15fa: /* (green) */ + element = EL_CHAR_OUMLAUT; + break; + + case 0x15fb: /* (green) */ + element = EL_CHAR_UUMLAUT; + break; + + case 0x15fc: /* (green) */ + element = EL_CHAR_0; + break; + + case 0x15fd: /* (green) */ + element = EL_CHAR_1; + break; + + case 0x15fe: /* (green) */ + element = EL_CHAR_2; + break; + + case 0x15ff: /* (green) */ + element = EL_CHAR_3; + break; + + case 0x1600: /* (green) */ + element = EL_CHAR_4; + break; + + case 0x1601: /* (green) */ + element = EL_CHAR_5; + break; + + case 0x1602: /* (green) */ + element = EL_CHAR_6; + break; + + case 0x1603: /* (green) */ + element = EL_CHAR_7; + break; + + case 0x1604: /* (green) */ + element = EL_CHAR_8; + break; + + case 0x1605: /* (green) */ + element = EL_CHAR_9; + break; + + case 0x1606: /* (green) */ + element = EL_CHAR_PERIOD; + break; + + case 0x1607: /* (green) */ + element = EL_CHAR_EXCLAM; + break; + + case 0x1608: /* (green) */ + element = EL_CHAR_COLON; + break; + + case 0x1609: /* (green) */ + element = EL_CHAR_LESS; + break; + + case 0x160a: /* (green) */ + element = EL_CHAR_GREATER; + break; + + case 0x160b: /* (green) */ + element = EL_CHAR_QUESTION; + break; + + case 0x160c: /* (green) */ + element = EL_CHAR_COPYRIGHT; + break; + + case 0x160d: /* (green) */ + element = EL_CHAR_UP; + break; + + case 0x160e: /* (green) */ + element = EL_CHAR_DOWN; + break; + + case 0x160f: /* (green) */ + element = EL_CHAR_BUTTON; + break; + + case 0x1610: /* (green) */ + element = EL_CHAR_PLUS; + break; + + case 0x1611: /* (green) */ + element = EL_CHAR_MINUS; + break; + + case 0x1612: /* (green) */ + element = EL_CHAR_APOSTROPHE; + break; + + case 0x1613: /* (green) */ + element = EL_CHAR_PARENLEFT; + break; + + case 0x1614: /* (green) */ + element = EL_CHAR_PARENRIGHT; + break; + + case 0x1615: /* (blue steel) */ + element = EL_STEELCHAR_A; + break; + + case 0x1616: /* (blue steel) */ + element = EL_STEELCHAR_B; + break; + + case 0x1617: /* (blue steel) */ + element = EL_STEELCHAR_C; + break; + + case 0x1618: /* (blue steel) */ + element = EL_STEELCHAR_D; + break; + + case 0x1619: /* (blue steel) */ + element = EL_STEELCHAR_E; + break; + + case 0x161a: /* (blue steel) */ + element = EL_STEELCHAR_F; + break; + + case 0x161b: /* (blue steel) */ + element = EL_STEELCHAR_G; + break; + + case 0x161c: /* (blue steel) */ + element = EL_STEELCHAR_H; + break; + + case 0x161d: /* (blue steel) */ + element = EL_STEELCHAR_I; + break; + + case 0x161e: /* (blue steel) */ + element = EL_STEELCHAR_J; + break; + + case 0x161f: /* (blue steel) */ + element = EL_STEELCHAR_K; + break; + + case 0x1620: /* (blue steel) */ + element = EL_STEELCHAR_L; + break; + + case 0x1621: /* (blue steel) */ + element = EL_STEELCHAR_M; + break; + + case 0x1622: /* (blue steel) */ + element = EL_STEELCHAR_N; + break; + + case 0x1623: /* (blue steel) */ + element = EL_STEELCHAR_O; + break; + + case 0x1624: /* (blue steel) */ + element = EL_STEELCHAR_P; + break; + + case 0x1625: /* (blue steel) */ + element = EL_STEELCHAR_Q; + break; + + case 0x1626: /* (blue steel) */ + element = EL_STEELCHAR_R; + break; + + case 0x1627: /* (blue steel) */ + element = EL_STEELCHAR_S; + break; + + case 0x1628: /* (blue steel) */ + element = EL_STEELCHAR_T; + break; + + case 0x1629: /* (blue steel) */ + element = EL_STEELCHAR_U; + break; + + case 0x162a: /* (blue steel) */ + element = EL_STEELCHAR_V; + break; + + case 0x162b: /* (blue steel) */ + element = EL_STEELCHAR_W; + break; + + case 0x162c: /* (blue steel) */ + element = EL_STEELCHAR_X; + break; + + case 0x162d: /* (blue steel) */ + element = EL_STEELCHAR_Y; + break; + + case 0x162e: /* (blue steel) */ + element = EL_STEELCHAR_Z; + break; + + case 0x162f: /* (blue steel) */ + element = EL_STEELCHAR_AUMLAUT; + break; + + case 0x1630: /* (blue steel) */ + element = EL_STEELCHAR_OUMLAUT; + break; + + case 0x1631: /* (blue steel) */ + element = EL_STEELCHAR_UUMLAUT; + break; + + case 0x1632: /* (blue steel) */ + element = EL_STEELCHAR_0; + break; + + case 0x1633: /* (blue steel) */ + element = EL_STEELCHAR_1; + break; + + case 0x1634: /* (blue steel) */ + element = EL_STEELCHAR_2; + break; + + case 0x1635: /* (blue steel) */ + element = EL_STEELCHAR_3; + break; + + case 0x1636: /* (blue steel) */ + element = EL_STEELCHAR_4; + break; + + case 0x1637: /* (blue steel) */ + element = EL_STEELCHAR_5; + break; + + case 0x1638: /* (blue steel) */ + element = EL_STEELCHAR_6; + break; + + case 0x1639: /* (blue steel) */ + element = EL_STEELCHAR_7; + break; + + case 0x163a: /* (blue steel) */ + element = EL_STEELCHAR_8; + break; + + case 0x163b: /* (blue steel) */ + element = EL_STEELCHAR_9; + break; + + case 0x163c: /* (blue steel) */ + element = EL_STEELCHAR_PERIOD; + break; + + case 0x163d: /* (blue steel) */ + element = EL_STEELCHAR_EXCLAM; + break; + + case 0x163e: /* (blue steel) */ + element = EL_STEELCHAR_COLON; + break; + + case 0x163f: /* (blue steel) */ + element = EL_STEELCHAR_LESS; + break; + + case 0x1640: /* (blue steel) */ + element = EL_STEELCHAR_GREATER; + break; + + case 0x1641: /* (blue steel) */ + element = EL_STEELCHAR_QUESTION; + break; + + case 0x1642: /* (blue steel) */ + element = EL_STEELCHAR_COPYRIGHT; + break; + + case 0x1643: /* (blue steel) */ + element = EL_STEELCHAR_UP; + break; + + case 0x1644: /* (blue steel) */ + element = EL_STEELCHAR_DOWN; + break; + + case 0x1645: /* (blue steel) */ + element = EL_STEELCHAR_BUTTON; + break; + + case 0x1646: /* (blue steel) */ + element = EL_STEELCHAR_PLUS; + break; + + case 0x1647: /* (blue steel) */ + element = EL_STEELCHAR_MINUS; + break; + + case 0x1648: /* (blue steel) */ + element = EL_STEELCHAR_APOSTROPHE; + break; + + case 0x1649: /* (blue steel) */ + element = EL_STEELCHAR_PARENLEFT; + break; + + case 0x164a: /* (blue steel) */ + element = EL_STEELCHAR_PARENRIGHT; + break; + + case 0x164b: /* (green steel) */ + element = EL_STEELCHAR_A; + break; + + case 0x164c: /* (green steel) */ + element = EL_STEELCHAR_B; + break; + + case 0x164d: /* (green steel) */ + element = EL_STEELCHAR_C; + break; + + case 0x164e: /* (green steel) */ + element = EL_STEELCHAR_D; + break; + + case 0x164f: /* (green steel) */ + element = EL_STEELCHAR_E; + break; + + case 0x1650: /* (green steel) */ + element = EL_STEELCHAR_F; + break; + + case 0x1651: /* (green steel) */ + element = EL_STEELCHAR_G; + break; + + case 0x1652: /* (green steel) */ + element = EL_STEELCHAR_H; + break; + + case 0x1653: /* (green steel) */ + element = EL_STEELCHAR_I; + break; + + case 0x1654: /* (green steel) */ + element = EL_STEELCHAR_J; + break; + + case 0x1655: /* (green steel) */ + element = EL_STEELCHAR_K; + break; + + case 0x1656: /* (green steel) */ + element = EL_STEELCHAR_L; + break; + + case 0x1657: /* (green steel) */ + element = EL_STEELCHAR_M; + break; + + case 0x1658: /* (green steel) */ + element = EL_STEELCHAR_N; + break; + + case 0x1659: /* (green steel) */ + element = EL_STEELCHAR_O; + break; + + case 0x165a: /* (green steel) */ + element = EL_STEELCHAR_P; + break; + + case 0x165b: /* (green steel) */ + element = EL_STEELCHAR_Q; + break; + + case 0x165c: /* (green steel) */ + element = EL_STEELCHAR_R; + break; + + case 0x165d: /* (green steel) */ + element = EL_STEELCHAR_S; + break; + + case 0x165e: /* (green steel) */ + element = EL_STEELCHAR_T; + break; + + case 0x165f: /* (green steel) */ + element = EL_STEELCHAR_U; + break; + + case 0x1660: /* (green steel) */ + element = EL_STEELCHAR_V; + break; + + case 0x1661: /* (green steel) */ + element = EL_STEELCHAR_W; + break; + + case 0x1662: /* (green steel) */ + element = EL_STEELCHAR_X; + break; + + case 0x1663: /* (green steel) */ + element = EL_STEELCHAR_Y; + break; + + case 0x1664: /* (green steel) */ + element = EL_STEELCHAR_Z; + break; + + case 0x1665: /* (green steel) */ + element = EL_STEELCHAR_AUMLAUT; + break; + + case 0x1666: /* (green steel) */ + element = EL_STEELCHAR_OUMLAUT; + break; + + case 0x1667: /* (green steel) */ + element = EL_STEELCHAR_UUMLAUT; + break; + + case 0x1668: /* (green steel) */ + element = EL_STEELCHAR_0; + break; + + case 0x1669: /* (green steel) */ + element = EL_STEELCHAR_1; + break; + + case 0x166a: /* (green steel) */ + element = EL_STEELCHAR_2; + break; + + case 0x166b: /* (green steel) */ + element = EL_STEELCHAR_3; + break; + + case 0x166c: /* (green steel) */ + element = EL_STEELCHAR_4; + break; + + case 0x166d: /* (green steel) */ + element = EL_STEELCHAR_5; + break; + + case 0x166e: /* (green steel) */ + element = EL_STEELCHAR_6; + break; + + case 0x166f: /* (green steel) */ + element = EL_STEELCHAR_7; + break; + + case 0x1670: /* (green steel) */ + element = EL_STEELCHAR_8; + break; + + case 0x1671: /* (green steel) */ + element = EL_STEELCHAR_9; + break; + + case 0x1672: /* (green steel) */ + element = EL_STEELCHAR_PERIOD; + break; + + case 0x1673: /* (green steel) */ + element = EL_STEELCHAR_EXCLAM; + break; + + case 0x1674: /* (green steel) */ + element = EL_STEELCHAR_COLON; + break; + + case 0x1675: /* (green steel) */ + element = EL_STEELCHAR_LESS; + break; + + case 0x1676: /* (green steel) */ + element = EL_STEELCHAR_GREATER; + break; + + case 0x1677: /* (green steel) */ + element = EL_STEELCHAR_QUESTION; + break; + + case 0x1678: /* (green steel) */ + element = EL_STEELCHAR_COPYRIGHT; + break; + + case 0x1679: /* (green steel) */ + element = EL_STEELCHAR_UP; + break; + + case 0x167a: /* (green steel) */ + element = EL_STEELCHAR_DOWN; + break; + + case 0x167b: /* (green steel) */ + element = EL_STEELCHAR_BUTTON; + break; + + case 0x167c: /* (green steel) */ + element = EL_STEELCHAR_PLUS; + break; + + case 0x167d: /* (green steel) */ + element = EL_STEELCHAR_MINUS; + break; + + case 0x167e: /* (green steel) */ + element = EL_STEELCHAR_APOSTROPHE; + break; + + case 0x167f: /* (green steel) */ + element = EL_STEELCHAR_PARENLEFT; + break; + + case 0x1680: /* (green steel) */ + element = EL_STEELCHAR_PARENRIGHT; + break; + + case 0x1681: /* gate (red) */ + element = EL_EM_GATE_1; + break; + + case 0x1682: /* secret gate (red) */ + element = EL_GATE_1_GRAY; + break; + + case 0x1683: /* gate (yellow) */ + element = EL_EM_GATE_2; + break; + + case 0x1684: /* secret gate (yellow) */ + element = EL_GATE_2_GRAY; + break; + + case 0x1685: /* gate (blue) */ + element = EL_EM_GATE_4; + break; + + case 0x1686: /* secret gate (blue) */ + element = EL_GATE_4_GRAY; + break; + + case 0x1687: /* gate (green) */ + element = EL_EM_GATE_3; + break; + + case 0x1688: /* secret gate (green) */ + element = EL_GATE_3_GRAY; + break; + + case 0x1689: /* gate (white) */ + element = EL_DOOR_WHITE; + break; + + case 0x168a: /* secret gate (white) */ + element = EL_DOOR_WHITE_GRAY; + break; + + case 0x168b: /* secret gate (no key) */ + element = EL_UNKNOWN; + break; + + case 0x168c: + element = EL_ROBOT_WHEEL; + break; + + case 0x168d: + element = EL_TIMEGATE_SWITCH; + break; + + case 0x168e: + element = EL_ACID_POOL_BOTTOM; + break; + + case 0x168f: + element = EL_ACID_POOL_TOPLEFT; + break; + + case 0x1690: + element = EL_ACID_POOL_TOPRIGHT; + break; + + case 0x1691: + element = EL_ACID_POOL_BOTTOMLEFT; + break; + + case 0x1692: + element = EL_ACID_POOL_BOTTOMRIGHT; + break; + + case 0x1693: + element = EL_STEELWALL; + break; + + case 0x1694: + element = EL_STEELWALL_SLIPPERY; + break; + + case 0x1695: /* steel wall (not round) */ + element = EL_STEELWALL; + break; + + case 0x1696: /* steel wall (left) */ + element = EL_STEELWALL; + break; + + case 0x1697: /* steel wall (bottom) */ + element = EL_STEELWALL; + break; + + case 0x1698: /* steel wall (right) */ + element = EL_STEELWALL; + break; + + case 0x1699: /* steel wall (top) */ + element = EL_STEELWALL; + break; + + case 0x169a: /* steel wall (left/bottom) */ + element = EL_STEELWALL; + break; + + case 0x169b: /* steel wall (right/bottom) */ + element = EL_STEELWALL; + break; + + case 0x169c: /* steel wall (right/top) */ + element = EL_STEELWALL; + break; + + case 0x169d: /* steel wall (left/top) */ + element = EL_STEELWALL; + break; + + case 0x169e: /* steel wall (right/bottom small) */ + element = EL_STEELWALL; + break; + + case 0x169f: /* steel wall (left/bottom small) */ + element = EL_STEELWALL; + break; + + case 0x16a0: /* steel wall (right/top small) */ + element = EL_STEELWALL; + break; + + case 0x16a1: /* steel wall (left/top small) */ + element = EL_STEELWALL; + break; + + case 0x16a2: /* steel wall (left/right) */ + element = EL_STEELWALL; + break; + + case 0x16a3: /* steel wall (top/bottom) */ + element = EL_STEELWALL; + break; + + case 0x16a4: /* steel wall 2 (left end) */ + element = EL_STEELWALL; + break; + + case 0x16a5: /* steel wall 2 (right end) */ + element = EL_STEELWALL; + break; + + case 0x16a6: /* steel wall 2 (top end) */ + element = EL_STEELWALL; + break; + + case 0x16a7: /* steel wall 2 (bottom end) */ + element = EL_STEELWALL; + break; + + case 0x16a8: /* steel wall 2 (left/right) */ + element = EL_STEELWALL; + break; + + case 0x16a9: /* steel wall 2 (up/down) */ + element = EL_STEELWALL; + break; + + case 0x16aa: /* steel wall 2 (mid) */ + element = EL_STEELWALL; + break; + + case 0x16ab: + element = EL_SIGN_EXCLAMATION; + break; + + case 0x16ac: + element = EL_SIGN_RADIOACTIVITY; + break; + + case 0x16ad: + element = EL_SIGN_STOP; + break; + + case 0x16ae: + element = EL_SIGN_WHEELCHAIR; + break; + + case 0x16af: + element = EL_SIGN_PARKING; + break; + + case 0x16b0: + element = EL_SIGN_NO_ENTRY; + break; + + case 0x16b1: + element = EL_SIGN_HEART; + break; + + case 0x16b2: + element = EL_SIGN_GIVE_WAY; + break; + + case 0x16b3: + element = EL_SIGN_ENTRY_FORBIDDEN; + break; + + case 0x16b4: + element = EL_SIGN_EMERGENCY_EXIT; + break; + + case 0x16b5: + element = EL_SIGN_YIN_YANG; + break; + + case 0x16b6: + element = EL_WALL_EMERALD; + break; + + case 0x16b7: + element = EL_WALL_DIAMOND; + break; + + case 0x16b8: + element = EL_WALL_PEARL; + break; + + case 0x16b9: + element = EL_WALL_CRYSTAL; + break; + + case 0x16ba: + element = EL_INVISIBLE_WALL; + break; + + case 0x16bb: + element = EL_INVISIBLE_STEELWALL; + break; + + /* 0x16bc - 0x16cb: */ + /* EL_INVISIBLE_SAND */ + + case 0x16cc: + element = EL_LIGHT_SWITCH; + break; + + case 0x16cd: + element = EL_ENVELOPE_1; + break; + + default: + if (element >= 0x0117 && element <= 0x036e) /* (?) */ + element = EL_DIAMOND; + else if (element >= 0x042d && element <= 0x0684) /* (?) */ + element = EL_EMERALD; + else if (element >= 0x157c && element <= 0x158b) + element = EL_SAND; + else if (element >= 0x1590 && element <= 0x159f) + element = EL_LANDMINE; + else if (element >= 0x16bc && element <= 0x16cb) + element = EL_INVISIBLE_SAND; + else + { + Error(ERR_WARN, "unknown Diamond Caves element 0x%04x", element); + element = EL_UNKNOWN; + } + break; + } + + return getMappedElement(element); +} + +static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) +{ + char *filename = level_file_info->filename; + FILE *file; +#if 0 + int nr = level_file_info->nr - leveldir_current->first_level; +#endif + 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; + + if (!(file = fopen(filename, MODE_READ))) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + + return; + } + +#if 0 + /* position file stream to the requested level inside the level package */ + if (fseek(file, nr * SP_LEVEL_SIZE, SEEK_SET) != 0) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot fseek level '%s' -- using empty level", filename); + + return; + } +#endif + + 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; + } + + /* 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'; + + 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); + + fclose(file); +} + + +/* ------------------------------------------------------------------------- */ +/* functions for loading generic level */ +/* ------------------------------------------------------------------------- */ + +void LoadLevelFromFileInfo(struct LevelInfo *level, + struct LevelFileInfo *level_file_info) +{ + /* always start with reliable default values */ + setLevelInfoToDefaults(level); + + switch (level_file_info->type) + { + case LEVEL_FILE_TYPE_RND: + LoadLevelFromFileInfo_RND(level, level_file_info); + break; + + case LEVEL_FILE_TYPE_EM: + LoadLevelFromFileInfo_EM(level, level_file_info); + level->game_engine_type = GAME_ENGINE_TYPE_EM; + break; + + case LEVEL_FILE_TYPE_SP: + LoadLevelFromFileInfo_SP(level, level_file_info); + break; + + case LEVEL_FILE_TYPE_DC: + LoadLevelFromFileInfo_DC(level, level_file_info); break; default: @@ -4638,15 +5739,8 @@ void LoadLevelFromFileInfo(struct LevelInfo *level, if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN) level->game_engine_type = GAME_ENGINE_TYPE_RND; -#if 1 if (level_file_info->type != LEVEL_FILE_TYPE_RND) CopyNativeLevel_Native_to_RND(level); -#else - if (level_file_info->type == LEVEL_FILE_TYPE_RND) - CopyNativeLevel_RND_to_Native(level); - else - CopyNativeLevel_Native_to_RND(level); -#endif } void LoadLevelFromFilename(struct LevelInfo *level, char *filename) @@ -4665,19 +5759,17 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename) static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) { - int i; + int i, j; if (leveldir_current == NULL) /* only when dumping level */ return; /* all engine modifications also valid for levels which use latest engine */ -#if 1 if (level->game_version < VERSION_IDENT(3,2,0,5)) { /* time bonus score was given for 10 s instead of 1 s before 3.2.0-5 */ level->score[SC_TIME_BONUS] /= 10; } -#endif #if 0 leveldir_current->latest_engine = TRUE; /* !!! TEST ONLY !!! */ @@ -4762,8 +5854,6 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) /* trigger settings did not exist before 3.1.0; set to default "any" */ if (level->game_version < VERSION_IDENT(3,1,0,0)) { - int i, j; - /* correct "can move into acid" settings (all zero in old levels) */ level->can_move_into_acid_bits = 0; /* nothing can move into acid */ @@ -4793,6 +5883,28 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) } } } + + /* try to detect and fix "Snake Bite" levels, which are broken with 3.2.0 */ + { + int element = EL_CUSTOM_START + 255; + struct ElementInfo *ei = &element_info[element]; + struct ElementChangeInfo *change = &ei->change_page[0]; + + /* This is needed to fix a problem that was caused by a bugfix in function + game.c/CreateFieldExt() introduced with 3.2.0 that corrects the behaviour + when a custom element changes to EL_SOKOBAN_FIELD_PLAYER (before, it did + not replace walkable elements, but instead just placed the player on it, + without placing the Sokoban field under the player). Unfortunately, this + breaks "Snake Bite" style levels when the snake is halfway through a door + that just closes (the snake head is still alive and can be moved in this + case). This can be fixed by replacing the EL_SOKOBAN_FIELD_PLAYER by the + player (without Sokoban element) which then gets killed as designed). */ + + if ((strncmp(leveldir_current->identifier, "snake_bite", 10) == 0 || + strncmp(ei->description, "pause b4 death", 14) == 0) && + change->target_element == EL_SOKOBAN_FIELD_PLAYER) + change->target_element = EL_PLAYER_1; + } } static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) @@ -4854,20 +5966,9 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) if (ei->access_direction == MV_NO_DIRECTION) ei->access_direction = MV_ALL_DIRECTIONS; - -#if 0 - for (j = 0; j < ei->num_change_pages; j++) - { - struct ElementChangeInfo *change = &ei->change_page[j]; - - if (change->trigger_side == CH_SIDE_NONE) - change->trigger_side = CH_SIDE_ANY; - } -#endif } } -#if 1 /* correct custom element values (fix invalid values for all versions) */ if (1) { @@ -4888,7 +5989,6 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } } -#endif /* initialize "can_explode" field for old levels which did not store this */ /* !!! CHECK THIS -- "<= 3,1,0,0" IS PROBABLY WRONG !!! */ @@ -4965,15 +6065,8 @@ static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename) { struct LevelFileInfo *level_file_info = &level->file_info; -#if 1 - if (level_file_info->type == LEVEL_FILE_TYPE_RND) - CopyNativeLevel_RND_to_Native(level); -#else if (level_file_info->type == LEVEL_FILE_TYPE_RND) CopyNativeLevel_RND_to_Native(level); - else - CopyNativeLevel_Native_to_RND(level); -#endif } void LoadLevelTemplate(int nr) @@ -5242,7 +6335,6 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, { int element = EL_CUSTOM_START + i; -#if 1 struct ElementInfo *ei = &element_info[element]; if (ei->properties[EP_BITFIELD_BASE_NR] != EP_BITMASK_DEFAULT) @@ -5255,18 +6347,6 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, check++; } -#else - if (Properties[element][EP_BITFIELD_BASE_NR] != EP_BITMASK_DEFAULT) - { - if (check < num_changed_custom_elements) - { - putFile16BitBE(file, element); - putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE_NR]); - } - - check++; - } -#endif } if (check != num_changed_custom_elements) /* should not happen */ @@ -5325,11 +6405,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, for (j = 0; j < MAX_ELEMENT_NAME_LEN; j++) putFile8Bit(file, ei->description[j]); -#if 1 putFile32BitBE(file, ei->properties[EP_BITFIELD_BASE_NR]); -#else - putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE_NR]); -#endif /* some free bytes for future properties and padding */ WriteUnusedBytesToFile(file, 7); @@ -5403,11 +6479,8 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) for (i = 0; i < MAX_ELEMENT_NAME_LEN; i++) putFile8Bit(file, ei->description[i]); -#if 1 putFile32BitBE(file, ei->properties[EP_BITFIELD_BASE_NR]); -#else - putFile32BitBE(file, Properties[element][EP_BITFIELD_BASE_NR]); -#endif + WriteUnusedBytesToFile(file, 4); /* reserved for more base properties */ putFile8Bit(file, ei->num_change_pages); @@ -5659,116 +6732,6 @@ static int SaveLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *entry, return num_bytes; } -#if 0 - -static int SaveLevel_MicroChunk_SingleValue(FILE *file, - struct LevelFileConfigInfo *entry) -{ - int default_value = entry->default_value; - int element = entry->element; - int data_type = entry->data_type; - int conf_type = entry->conf_type; - int byte_mask = conf_type & CONF_MASK_BYTES; - void *value_ptr = entry->value; - int value = (data_type == TYPE_BOOLEAN ? *(boolean *)value_ptr : - *(int *)value_ptr); - int num_bytes = 0; - boolean modified = FALSE; - - /* check if any settings have been modified before saving them */ - if (value != default_value) - modified = TRUE; - - if (!modified) /* do not save unmodified default settings */ - return 0; - -#if 0 - printf("::: %02x, %d: %d != %d\n", - byte_mask, conf_type & CONF_MASK_TOKEN, - value, default_value); -#endif - - if (element != -1) - num_bytes += putFile16BitBE(file, element); - - num_bytes += putFile8Bit(file, conf_type); - num_bytes += (byte_mask == CONF_MASK_1_BYTE ? putFile8Bit (file, value) : - byte_mask == CONF_MASK_2_BYTE ? putFile16BitBE(file, value) : - byte_mask == CONF_MASK_4_BYTE ? putFile32BitBE(file, value) :0); - - return num_bytes; -} - -static int SaveLevel_MicroChunk_ElementList(FILE *file, - struct LevelFileConfigInfo *entry) -{ - int *element_array = (int *)(entry->value); - int num_elements = *(int *)(entry->num_entities); - int default_value = entry->default_value; - int element = entry->element; - int conf_type = entry->conf_type; - int num_bytes = 0; - boolean modified = FALSE; - int i; - - /* check if any settings have been modified before saving them */ - for (i = 0; i < num_elements; i++) - if (element_array[i] != default_value) - modified = TRUE; - - if (!modified) /* do not save unmodified default settings */ - return 0; - - if (element != -1) - num_bytes += putFile16BitBE(file, element); - - num_bytes += putFile8Bit(file, conf_type); - num_bytes += putFile16BitBE(file, num_elements * CONF_ELEMENT_NUM_BYTES); - - for (i = 0; i < num_elements; i++) - num_bytes += putFile16BitBE(file, element_array[i]); - - return num_bytes; -} - -static int SaveLevel_MicroChunk_ContentList(FILE *file, - struct LevelFileConfigInfo *entry) -{ - struct Content *content = (struct Content *)(entry->value); - int num_contents = *(int *)(entry->num_entities); - int default_value = entry->default_value; - int element = entry->element; - int conf_type = entry->conf_type; - int num_bytes = 0; - boolean modified = FALSE; - int i, x, y; - - /* check if any settings have been modified before saving them */ - for (i = 0; i < num_contents; i++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - if (content[i].e[x][y] != default_value) - modified = TRUE; - - if (!modified) /* do not save unmodified default settings */ - return 0; - - if (element != -1) - num_bytes += putFile16BitBE(file, element); - - num_bytes += putFile8Bit(file, conf_type); - num_bytes += putFile16BitBE(file, num_contents * CONF_CONTENT_NUM_BYTES); - - for (i = 0; i < num_contents; i++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - num_bytes += putFile16BitBE(file, content[i].e[x][y]); - - return num_bytes; -} - -#endif - static int SaveLevel_INFO(FILE *file, struct LevelInfo *level) { int chunk_size = 0; @@ -5790,23 +6753,7 @@ static int SaveLevel_ELEM(FILE *file, struct LevelInfo *level) li = *level; /* copy level data into temporary buffer */ for (i = 0; chunk_config_ELEM[i].data_type != -1; i++) - { -#if 1 chunk_size += SaveLevel_MicroChunk(file, &chunk_config_ELEM[i], TRUE); -#else - struct LevelFileConfigInfo *conf = &chunk_config_ELEM[i]; - int data_type = conf->data_type; - int conf_type = conf->conf_type; - int byte_mask = conf_type & CONF_MASK_BYTES; - - if (byte_mask != CONF_MASK_MULTI_BYTES) - chunk_size += SaveLevel_MicroChunk_SingleValue(file, conf); - else if (data_type == TYPE_ELEMENT_LIST) - chunk_size += SaveLevel_MicroChunk_ElementList(file, conf); - else if (data_type == TYPE_CONTENT_LIST) - chunk_size += SaveLevel_MicroChunk_ContentList(file, conf); -#endif - } return chunk_size; } @@ -5841,20 +6788,15 @@ static int SaveLevel_CUSX(FILE *file, struct LevelInfo *level, int element) /* set default description string for this specific element */ strcpy(xx_default_description, getDefaultElementDescription(ei)); - /* set (fixed) number of content areas (may have been overwritten earlier) */ - xx_num_contents = 1; - #if 0 - printf("::: - element config\n"); + /* set (fixed) number of content areas (may be wrong by broken level file) */ + /* (this is now directly corrected for broken level files after loading) */ + xx_num_contents = 1; #endif for (i = 0; chunk_config_CUSX_base[i].data_type != -1; i++) chunk_size += SaveLevel_MicroChunk(file, &chunk_config_CUSX_base[i], FALSE); -#if 0 - printf("::: - change pages\n"); -#endif - for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; @@ -5863,25 +6805,12 @@ static int SaveLevel_CUSX(FILE *file, struct LevelInfo *level, int element) xx_change = *change; /* copy change data into temporary buffer */ -#if 0 - printf("::: %d: xx_change.action_mode == %d\n", - i, xx_change.action_mode); - printf("::: %d: xx_change.action_arg == %d\n", - i, xx_change.action_arg); -#endif - resetEventBits(); setEventBitsFromEventFlags(change); for (j = 0; chunk_config_CUSX_change[j].data_type != -1; j++) chunk_size += SaveLevel_MicroChunk(file, &chunk_config_CUSX_change[j], FALSE); - -#if 0 - if (element == EL_CUSTOM_START) - printf("::: - saving change page %d / %d (%d bytes)\n", - i, ei->num_change_pages, chunk_size); -#endif } return chunk_size; @@ -5911,11 +6840,7 @@ static int SaveLevel_GRPX(FILE *file, struct LevelInfo *level, int element) static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) { int chunk_size; -#if 1 int i; -#else - int i, x, y; -#endif FILE *file; if (!(file = fopen(filename, MODE_WRITE))) @@ -5929,38 +6854,6 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) level->creation_date = getCurrentDate(); -#if 0 - /* check level field for 16-bit elements */ - level->encoding_16bit_field = FALSE; - for (y = 0; y < level->fieldy; y++) - for (x = 0; x < level->fieldx; x++) - if (level->field[x][y] > 255) - level->encoding_16bit_field = TRUE; -#endif - -#if 0 - /* check yamyam content for 16-bit elements */ - level->encoding_16bit_yamyam = FALSE; - for (i = 0; i < level->num_yamyam_contents; i++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - if (level->yamyam_content[i].e[x][y] > 255) - level->encoding_16bit_yamyam = TRUE; -#endif - -#if 0 - /* check amoeba content for 16-bit elements */ - level->encoding_16bit_amoeba = FALSE; - if (level->amoeba_content > 255) - level->encoding_16bit_amoeba = TRUE; -#endif - -#if 0 - /* calculate size of "BODY" chunk */ - body_chunk_size = - level->fieldx * level->fieldy * (level->encoding_16bit_field ? 2 : 1); -#endif - putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED); putFileChunkBE(file, "CAVE", CHUNK_SIZE_NONE); @@ -5972,11 +6865,6 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) putFileChunkBE(file, "DATE", chunk_size); SaveLevel_DATE(file, level); -#if 0 - putFileChunkBE(file, "HEAD", LEVEL_CHUNK_HEAD_SIZE); - SaveLevel_HEAD(file, level); -#endif - chunk_size = SaveLevel_NAME(NULL, level); putFileChunkBE(file, "NAME", chunk_size); SaveLevel_NAME(file, level); @@ -5993,65 +6881,6 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) putFileChunkBE(file, "BODY", chunk_size); SaveLevel_BODY(file, level); -#if 0 - if (level->encoding_16bit_yamyam || - level->num_yamyam_contents != STD_ELEMENT_CONTENTS) - { - putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); - SaveLevel_CNT2(file, level, EL_YAMYAM); - } - - if (level->encoding_16bit_amoeba) - { - putFileChunkBE(file, "CNT2", LEVEL_CHUNK_CNT2_SIZE); - SaveLevel_CNT2(file, level, EL_BD_AMOEBA); - } -#endif - -#if 0 - /* check for envelope content */ - for (i = 0; i < 4; i++) - { - if (strlen(level->envelope_text[i]) > 0) - { - int envelope_len = strlen(level->envelope_text[i]) + 1; - - putFileChunkBE(file, "CNT3", LEVEL_CHUNK_CNT3_SIZE(envelope_len)); - SaveLevel_CNT3(file, level, EL_ENVELOPE_1 + i); - } - } -#endif - -#if 0 - /* if not using template level, check for non-default custom/group elements */ - if (!level->use_custom_template) - { - for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) - { - int element = EL_CUSTOM_START + i; - - if (element_info[element].modified_settings) - { - int num_change_pages = element_info[element].num_change_pages; - - putFileChunkBE(file, "CUS4", LEVEL_CHUNK_CUS4_SIZE(num_change_pages)); - SaveLevel_CUS4(file, level, element); - } - } - - for (i = 0; i < NUM_GROUP_ELEMENTS; i++) - { - int element = EL_GROUP_START + i; - - if (element_info[element].modified_settings) - { - putFileChunkBE(file, "GRP1", LEVEL_CHUNK_GRP1_SIZE); - SaveLevel_GRP1(file, level, element); - } - } - } -#endif - chunk_size = SaveLevel_ELEM(NULL, level); if (chunk_size > LEVEL_CHUNK_ELEM_UNCHANGED) /* save if changed */ { @@ -6059,7 +6888,6 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) SaveLevel_ELEM(file, level); } -#if 1 for (i = 0; i < NUM_ENVELOPES; i++) { int element = EL_ENVELOPE_1 + i; @@ -6071,9 +6899,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) SaveLevel_NOTE(file, level, element); } } -#endif -#if 1 /* if not using template level, check for non-default custom/group elements */ if (!level->use_custom_template) { @@ -6101,7 +6927,6 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) } } } -#endif fclose(file); @@ -6122,6 +6947,25 @@ void SaveLevelTemplate() SaveLevelFromFilename(&level, filename); } +boolean SaveLevelChecked(int nr) +{ + char *filename = getDefaultLevelFilename(nr); + boolean new_level = !fileExists(filename); + boolean level_saved = FALSE; + + if (new_level || Request("Save this level and kill the old ?", REQ_ASK)) + { + SaveLevel(nr); + + if (new_level) + Request("Level saved !", REQ_CONFIRM); + + level_saved = TRUE; + } + + return level_saved; +} + void DumpLevel(struct LevelInfo *level) { if (level->no_valid_file) @@ -6152,11 +6996,6 @@ void DumpLevel(struct LevelInfo *level) printf("Amoeba speed: %d\n", level->amoeba_speed); printf("\n"); -#if 0 - printf("Initial gravity: %s\n", (level->initial_gravity ? "yes" : "no")); - printf("Initial player stepsize: %d\n", level->initial_player_stepsize); -#endif - printf("EM style slippery gems: %s\n", (level->em_slippery_gems ? "yes" : "no")); printf("Player blocks last field: %s\n", (level->block_last_field ? "yes" : "no")); printf("SP player blocks last field: %s\n", (level->sp_block_last_field ? "yes" : "no")); @@ -6555,7 +7394,9 @@ void SaveTape(int nr) { char *filename = getTapeFilename(nr); FILE *file; +#if 0 boolean new_tape = TRUE; +#endif int num_participating_players = 0; int info_chunk_size; int body_chunk_size; @@ -6563,6 +7404,7 @@ void SaveTape(int nr) InitTapeDirectory(leveldir_current->subdir); +#if 0 /* if a tape still exists, ask to overwrite it */ if (fileExists(filename)) { @@ -6570,6 +7412,7 @@ void SaveTape(int nr) if (!Request("Replace old tape ?", REQ_ASK)) return; } +#endif if (!(file = fopen(filename, MODE_WRITE))) { @@ -6609,8 +7452,29 @@ void SaveTape(int nr) tape.changed = FALSE; +#if 0 if (new_tape) Request("Tape saved !", REQ_CONFIRM); +#endif +} + +boolean SaveTapeChecked(int nr) +{ + char *filename = getTapeFilename(nr); + boolean new_tape = !fileExists(filename); + boolean tape_saved = FALSE; + + if (new_tape || Request("Replace old tape ?", REQ_ASK)) + { + SaveTape(nr); + + if (new_tape) + Request("Tape saved !", REQ_CONFIRM); + + tape_saved = TRUE; + } + + return tape_saved; } void DumpTape(struct TapeInfo *tape) @@ -6766,7 +7630,7 @@ void SaveScore(int nr) #define SETUP_TOKEN_TOONS 5 #define SETUP_TOKEN_SCROLL_DELAY 6 #define SETUP_TOKEN_SOFT_SCROLLING 7 -#define SETUP_TOKEN_FADING 8 +#define SETUP_TOKEN_FADE_SCREENS 8 #define SETUP_TOKEN_AUTORECORD 9 #define SETUP_TOKEN_SHOW_TITLESCREEN 10 #define SETUP_TOKEN_QUICK_DOORS 11 @@ -6775,19 +7639,20 @@ void SaveScore(int nr) #define SETUP_TOKEN_SKIP_LEVELS 14 #define SETUP_TOKEN_TIME_LIMIT 15 #define SETUP_TOKEN_FULLSCREEN 16 -#define SETUP_TOKEN_ASK_ON_ESCAPE 17 -#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 18 -#define SETUP_TOKEN_QUICK_SWITCH 19 -#define SETUP_TOKEN_INPUT_ON_FOCUS 20 -#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 21 -#define SETUP_TOKEN_GRAPHICS_SET 22 -#define SETUP_TOKEN_SOUNDS_SET 23 -#define SETUP_TOKEN_MUSIC_SET 24 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 25 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 26 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 27 - -#define NUM_GLOBAL_SETUP_TOKENS 28 +#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_GRAPHICS_SET 23 +#define SETUP_TOKEN_SOUNDS_SET 24 +#define SETUP_TOKEN_MUSIC_SET 25 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 26 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 27 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 28 + +#define NUM_GLOBAL_SETUP_TOKENS 29 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 @@ -6799,13 +7664,16 @@ void SaveScore(int nr) #define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES 6 #define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH 7 #define SETUP_TOKEN_EDITOR_EL_CHARS 8 -#define SETUP_TOKEN_EDITOR_EL_CUSTOM 9 -#define SETUP_TOKEN_EDITOR_EL_HEADLINES 10 -#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 11 -#define SETUP_TOKEN_EDITOR_EL_DYNAMIC 12 -#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN 13 +#define SETUP_TOKEN_EDITOR_EL_STEELCHARS 9 +#define SETUP_TOKEN_EDITOR_EL_CUSTOM 10 +#define SETUP_TOKEN_EDITOR_EL_HEADLINES 11 +#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 12 +#define SETUP_TOKEN_EDITOR_EL_DYNAMIC 13 +#define SETUP_TOKEN_EDITOR_EL_BY_GAME 14 +#define SETUP_TOKEN_EDITOR_EL_BY_TYPE 15 +#define SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN 16 -#define NUM_EDITOR_SETUP_TOKENS 14 +#define NUM_EDITOR_SETUP_TOKENS 17 /* editor cascade setup */ #define SETUP_TOKEN_EDITOR_CASCADE_BD 0 @@ -6817,13 +7685,14 @@ void SaveScore(int nr) #define SETUP_TOKEN_EDITOR_CASCADE_DC 6 #define SETUP_TOKEN_EDITOR_CASCADE_DX 7 #define SETUP_TOKEN_EDITOR_CASCADE_TEXT 8 -#define SETUP_TOKEN_EDITOR_CASCADE_CE 9 -#define SETUP_TOKEN_EDITOR_CASCADE_GE 10 -#define SETUP_TOKEN_EDITOR_CASCADE_USER 11 -#define SETUP_TOKEN_EDITOR_CASCADE_GENERIC 12 -#define SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC 13 +#define SETUP_TOKEN_EDITOR_CASCADE_STEELTEXT 9 +#define SETUP_TOKEN_EDITOR_CASCADE_CE 10 +#define SETUP_TOKEN_EDITOR_CASCADE_GE 11 +#define SETUP_TOKEN_EDITOR_CASCADE_REF 12 +#define SETUP_TOKEN_EDITOR_CASCADE_USER 13 +#define SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC 14 -#define NUM_EDITOR_CASCADE_SETUP_TOKENS 14 +#define NUM_EDITOR_CASCADE_SETUP_TOKENS 15 /* shortcut setup */ #define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 @@ -6887,7 +7756,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.toons, "toons" }, { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, - { TYPE_SWITCH, &si.fading, "screen_fading" }, + { TYPE_SWITCH, &si.fade_screens, "fade_screens" }, { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, { TYPE_SWITCH, &si.show_titlescreen, "show_titlescreen" }, { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, @@ -6896,6 +7765,7 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.skip_levels, "skip_levels" }, { TYPE_SWITCH, &si.time_limit, "time_limit" }, { TYPE_SWITCH, &si.fullscreen, "fullscreen" }, + { TYPE_STRING, &si.fullscreen_mode, "fullscreen_mode" }, { TYPE_SWITCH, &si.ask_on_escape, "ask_on_escape" }, { TYPE_SWITCH, &si.ask_on_escape_editor, "ask_on_escape_editor" }, { TYPE_SWITCH, &si.quick_switch, "quick_player_switch" }, @@ -6909,8 +7779,19 @@ static struct TokenInfo global_setup_tokens[] = { TYPE_SWITCH, &si.override_level_music, "override_level_music" }, }; +static boolean not_used = FALSE; static struct TokenInfo editor_setup_tokens[] = { +#if 1 + { TYPE_SWITCH, ¬_used, "editor.el_boulderdash" }, + { TYPE_SWITCH, ¬_used, "editor.el_emerald_mine" }, + { TYPE_SWITCH, ¬_used, "editor.el_emerald_mine_club" }, + { TYPE_SWITCH, ¬_used, "editor.el_more" }, + { TYPE_SWITCH, ¬_used, "editor.el_sokoban" }, + { TYPE_SWITCH, ¬_used, "editor.el_supaplex" }, + { TYPE_SWITCH, ¬_used, "editor.el_diamond_caves" }, + { TYPE_SWITCH, ¬_used, "editor.el_dx_boulderdash" }, +#else { TYPE_SWITCH, &sei.el_boulderdash, "editor.el_boulderdash" }, { TYPE_SWITCH, &sei.el_emerald_mine, "editor.el_emerald_mine" }, { TYPE_SWITCH, &sei.el_emerald_mine_club,"editor.el_emerald_mine_club"}, @@ -6919,11 +7800,19 @@ static struct TokenInfo editor_setup_tokens[] = { TYPE_SWITCH, &sei.el_supaplex, "editor.el_supaplex" }, { TYPE_SWITCH, &sei.el_diamond_caves, "editor.el_diamond_caves" }, { TYPE_SWITCH, &sei.el_dx_boulderdash,"editor.el_dx_boulderdash" }, +#endif { TYPE_SWITCH, &sei.el_chars, "editor.el_chars" }, + { TYPE_SWITCH, &sei.el_steelchars, "editor.el_steelchars" }, { TYPE_SWITCH, &sei.el_custom, "editor.el_custom" }, +#if 1 + { TYPE_SWITCH, ¬_used, "editor.el_headlines" }, +#else { TYPE_SWITCH, &sei.el_headlines, "editor.el_headlines" }, +#endif { TYPE_SWITCH, &sei.el_user_defined, "editor.el_user_defined" }, { TYPE_SWITCH, &sei.el_dynamic, "editor.el_dynamic" }, + { TYPE_SWITCH, &sei.el_by_game, "editor.el_by_game" }, + { TYPE_SWITCH, &sei.el_by_type, "editor.el_by_type" }, { TYPE_SWITCH, &sei.show_element_token,"editor.show_element_token" }, }; @@ -6938,8 +7827,10 @@ static struct TokenInfo editor_cascade_setup_tokens[] = { TYPE_SWITCH, &seci.el_dc, "editor.cascade.el_dc" }, { TYPE_SWITCH, &seci.el_dx, "editor.cascade.el_dx" }, { TYPE_SWITCH, &seci.el_chars, "editor.cascade.el_chars" }, + { TYPE_SWITCH, &seci.el_steelchars, "editor.cascade.el_steelchars" }, { TYPE_SWITCH, &seci.el_ce, "editor.cascade.el_ce" }, { TYPE_SWITCH, &seci.el_ge, "editor.cascade.el_ge" }, + { TYPE_SWITCH, &seci.el_ref, "editor.cascade.el_ref" }, { TYPE_SWITCH, &seci.el_user, "editor.cascade.el_user" }, { TYPE_SWITCH, &seci.el_dynamic, "editor.cascade.el_dynamic" }, }; @@ -7017,7 +7908,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->direct_draw = !si->double_buffering; si->scroll_delay = TRUE; si->soft_scrolling = TRUE; - si->fading = FALSE; + si->fade_screens = TRUE; si->autorecord = TRUE; si->show_titlescreen = TRUE; si->quick_doors = FALSE; @@ -7026,6 +7917,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->skip_levels = TRUE; si->time_limit = TRUE; si->fullscreen = FALSE; + si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE); si->ask_on_escape = TRUE; si->ask_on_escape_editor = TRUE; si->quick_switch = FALSE; @@ -7048,6 +7940,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->editor.el_diamond_caves = TRUE; si->editor.el_dx_boulderdash = TRUE; si->editor.el_chars = TRUE; + si->editor.el_steelchars = TRUE; si->editor.el_custom = TRUE; si->editor.el_headlines = TRUE; @@ -7094,20 +7987,22 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) { - si->editor_cascade.el_bd = TRUE; - si->editor_cascade.el_em = TRUE; - si->editor_cascade.el_emc = TRUE; - si->editor_cascade.el_rnd = TRUE; - si->editor_cascade.el_sb = TRUE; - si->editor_cascade.el_sp = TRUE; - si->editor_cascade.el_dc = TRUE; - si->editor_cascade.el_dx = TRUE; + si->editor_cascade.el_bd = TRUE; + si->editor_cascade.el_em = TRUE; + si->editor_cascade.el_emc = TRUE; + si->editor_cascade.el_rnd = TRUE; + si->editor_cascade.el_sb = TRUE; + si->editor_cascade.el_sp = TRUE; + si->editor_cascade.el_dc = TRUE; + si->editor_cascade.el_dx = TRUE; - si->editor_cascade.el_chars = FALSE; - si->editor_cascade.el_ce = FALSE; - si->editor_cascade.el_ge = FALSE; - si->editor_cascade.el_user = FALSE; - si->editor_cascade.el_dynamic = FALSE; + si->editor_cascade.el_chars = FALSE; + si->editor_cascade.el_steelchars = FALSE; + si->editor_cascade.el_ce = FALSE; + si->editor_cascade.el_ge = FALSE; + si->editor_cascade.el_ref = FALSE; + si->editor_cascade.el_user = FALSE; + si->editor_cascade.el_dynamic = FALSE; } static void decodeSetupFileHash(SetupFileHash *setup_file_hash) @@ -7332,7 +8227,7 @@ void SaveSetup_EditorCascade() seci = setup.editor_cascade; fprintf(file, "\n"); - for (i = 0; i < NUM_EDITOR_SETUP_TOKENS; i++) + for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++) fprintf(file, "%s\n", getSetupLine(editor_cascade_setup_tokens, "", i)); fclose(file); @@ -7401,6 +8296,18 @@ static void LoadSpecialMenuDesignSettingsFromFilename(char *filename) menu.list_size[i] = get_integer_from_string(list_size); } + /* special case: initialize with default values that may be overwritten */ + for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++) + { + char *value_x = getHashEntry(setup_file_hash, "menu.draw_xoffset.INFO"); + char *value_y = getHashEntry(setup_file_hash, "menu.draw_yoffset.INFO"); + + if (value_x != NULL) + menu.draw_xoffset_info[i] = get_integer_from_string(value_x); + if (value_y != NULL) + menu.draw_yoffset_info[i] = get_integer_from_string(value_y); + } + /* read (and overwrite with) values that may be specified in config file */ for (i = 0; image_config_vars[i].token != NULL; i++) { @@ -7427,7 +8334,6 @@ void LoadSpecialMenuDesignSettings() get_auto_parameter_value(image_config_vars[i].token, image_config[j].value); -#if 1 if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS)) { /* first look for special settings configured in level series config */ @@ -7441,13 +8347,6 @@ void LoadSpecialMenuDesignSettings() if (filename_local != NULL && !strEqual(filename_base, filename_local)) LoadSpecialMenuDesignSettingsFromFilename(filename_local); - -#else - - filename_local = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS); - - LoadSpecialMenuDesignSettingsFromFilename(filename_local); -#endif } void LoadUserDefinedEditorElementList(int **elements, int *num_elements)