X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Ffiles.c;h=6382467a7cace58ca39ef89e9eab7b4e4b13e2ea;hp=e71ca2a26a34b72b86c04e5b0684e4135db4efbb;hb=10f5a64c95da4ae6a90396be5ec6457f6642aebf;hpb=83a31e12a79ab21deddbbb7533998a1a54a989dd diff --git a/src/files.c b/src/files.c index e71ca2a2..f6cc1731 100644 --- a/src/files.c +++ b/src/files.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Rocks'n'Diamonds -- McDuffin Strikes Back! * -*----------------------------------------------------------* -* (c) 1995-2006 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* files.c * -***********************************************************/ +// ============================================================================ +// Rocks'n'Diamonds - McDuffin Strikes Back! +// ---------------------------------------------------------------------------- +// (c) 1995-2014 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// files.c +// ============================================================================ #include #include @@ -20,58 +18,63 @@ #include "files.h" #include "init.h" +#include "screens.h" #include "tools.h" #include "tape.h" +#include "config.h" +#define ENABLE_UNUSED_CODE 0 // currently unused functions +#define ENABLE_HISTORIC_CHUNKS 0 // only for historic reference +#define ENABLE_RESERVED_CODE 0 // reserved for later use -#define CHUNK_ID_LEN 4 /* IFF style chunk id length */ -#define CHUNK_SIZE_UNDEFINED 0 /* undefined chunk size == 0 */ -#define CHUNK_SIZE_NONE -1 /* do not write chunk size */ +#define CHUNK_ID_LEN 4 // IFF style chunk id length +#define CHUNK_SIZE_UNDEFINED 0 // undefined chunk size == 0 +#define CHUNK_SIZE_NONE -1 // do not write chunk size #define LEVEL_CHUNK_NAME_SIZE MAX_LEVEL_NAME_LEN #define LEVEL_CHUNK_AUTH_SIZE MAX_LEVEL_AUTHOR_LEN -#define LEVEL_CHUNK_VERS_SIZE 8 /* size of file version chunk */ -#define LEVEL_CHUNK_DATE_SIZE 4 /* size of file date chunk */ -#define LEVEL_CHUNK_HEAD_SIZE 80 /* size of level file header */ -#define LEVEL_CHUNK_HEAD_UNUSED 0 /* unused level header bytes */ -#define LEVEL_CHUNK_CNT2_SIZE 160 /* size of level CNT2 chunk */ -#define LEVEL_CHUNK_CNT2_UNUSED 11 /* unused CNT2 chunk bytes */ -#define LEVEL_CHUNK_CNT3_HEADER 16 /* size of level CNT3 header */ -#define LEVEL_CHUNK_CNT3_UNUSED 10 /* unused CNT3 chunk bytes */ -#define LEVEL_CPART_CUS3_SIZE 134 /* size of CUS3 chunk part */ -#define LEVEL_CPART_CUS3_UNUSED 15 /* unused CUS3 bytes / part */ -#define LEVEL_CHUNK_GRP1_SIZE 74 /* size of level GRP1 chunk */ - -/* (element number, number of change pages, change page number) */ +#define LEVEL_CHUNK_VERS_SIZE 8 // size of file version chunk +#define LEVEL_CHUNK_DATE_SIZE 4 // size of file date chunk +#define LEVEL_CHUNK_HEAD_SIZE 80 // size of level file header +#define LEVEL_CHUNK_HEAD_UNUSED 0 // unused level header bytes +#define LEVEL_CHUNK_CNT2_SIZE 160 // size of level CNT2 chunk +#define LEVEL_CHUNK_CNT2_UNUSED 11 // unused CNT2 chunk bytes +#define LEVEL_CHUNK_CNT3_HEADER 16 // size of level CNT3 header +#define LEVEL_CHUNK_CNT3_UNUSED 10 // unused CNT3 chunk bytes +#define LEVEL_CPART_CUS3_SIZE 134 // size of CUS3 chunk part +#define LEVEL_CPART_CUS3_UNUSED 15 // unused CUS3 bytes / part +#define LEVEL_CHUNK_GRP1_SIZE 74 // size of level GRP1 chunk + +// (element number, number of change pages, change page number) #define LEVEL_CHUNK_CUSX_UNCHANGED (2 + (1 + 1) + (1 + 1)) -/* (element number only) */ +// (element number only) #define LEVEL_CHUNK_GRPX_UNCHANGED 2 #define LEVEL_CHUNK_NOTE_UNCHANGED 2 -/* (nothing at all if unchanged) */ +// (nothing at all if unchanged) #define LEVEL_CHUNK_ELEM_UNCHANGED 0 -#define TAPE_CHUNK_VERS_SIZE 8 /* size of file version chunk */ -#define TAPE_CHUNK_HEAD_SIZE 20 /* size of tape file header */ -#define TAPE_CHUNK_HEAD_UNUSED 3 /* unused tape header bytes */ +#define TAPE_CHUNK_VERS_SIZE 8 // size of file version chunk +#define TAPE_CHUNK_HEAD_SIZE 20 // size of tape file header +#define TAPE_CHUNK_HEAD_UNUSED 2 // unused tape header bytes #define LEVEL_CHUNK_CNT3_SIZE(x) (LEVEL_CHUNK_CNT3_HEADER + (x)) #define LEVEL_CHUNK_CUS3_SIZE(x) (2 + (x) * LEVEL_CPART_CUS3_SIZE) #define LEVEL_CHUNK_CUS4_SIZE(x) (96 + (x) * 48) -/* file identifier strings */ +// file identifier strings #define LEVEL_COOKIE_TMPL "ROCKSNDIAMONDS_LEVEL_FILE_VERSION_x.x" #define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x" #define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" -/* values for deciding when (not) to save configuration data */ +// values for deciding when (not) to save configuration data #define SAVE_CONF_NEVER 0 #define SAVE_CONF_ALWAYS 1 #define SAVE_CONF_WHEN_CHANGED -1 -/* values for chunks using micro chunks */ +// values for chunks using micro chunks #define CONF_MASK_1_BYTE 0x00 #define CONF_MASK_2_BYTE 0x40 #define CONF_MASK_4_BYTE 0x80 @@ -85,7 +88,7 @@ #define CONF_VALUE_4_BYTE(x) (CONF_MASK_4_BYTE | (x)) #define CONF_VALUE_MULTI_BYTES(x) (CONF_MASK_MULTI_BYTES | (x)) -/* these definitions are just for convenience of use and readability */ +// these definitions are just for convenience of use and readability #define CONF_VALUE_8_BIT(x) CONF_VALUE_1_BYTE(x) #define CONF_VALUE_16_BIT(x) CONF_VALUE_2_BYTE(x) #define CONF_VALUE_32_BIT(x) CONF_VALUE_4_BYTE(x) @@ -117,7 +120,7 @@ #define CONF_CONTENTS_ELEMENT(b,c,x,y) ((b[CONF_CONTENT_BYTE_POS(c,x,y)]<< 8)|\ (b[CONF_CONTENT_BYTE_POS(c,x,y) + 1])) -/* temporary variables used to store pointers to structure members */ +// temporary variables used to store pointers to structure members static struct LevelInfo li; static struct ElementInfo xx_ei, yy_ei; static struct ElementChangeInfo xx_change; @@ -132,26 +135,26 @@ static int xx_string_length_unused; struct LevelFileConfigInfo { - int element; /* element for which data is to be stored */ - int save_type; /* save data always, never or when changed */ - int data_type; /* data type (used internally, not stored) */ - int conf_type; /* micro chunk identifier (stored in file) */ - - /* (mandatory) */ - void *value; /* variable that holds the data to be stored */ - int default_value; /* initial default value for this variable */ - - /* (optional) */ - void *value_copy; /* variable that holds the data to be copied */ - void *num_entities; /* number of entities for multi-byte data */ - int default_num_entities; /* default number of entities for this data */ - int max_num_entities; /* maximal number of entities for this data */ - char *default_string; /* optional default string for string data */ + int element; // element for which data is to be stored + int save_type; // save data always, never or when changed + int data_type; // data type (used internally, not stored) + int conf_type; // micro chunk identifier (stored in file) + + // (mandatory) + void *value; // variable that holds the data to be stored + int default_value; // initial default value for this variable + + // (optional) + void *value_copy; // variable that holds the data to be copied + void *num_entities; // number of entities for multi-byte data + int default_num_entities; // default number of entities for this data + int max_num_entities; // maximal number of entities for this data + char *default_string; // optional default string for string data }; static struct LevelFileConfigInfo chunk_config_INFO[] = { - /* ---------- values not related to single elements ----------------------- */ + // ---------- values not related to single elements ------------------------- { -1, SAVE_CONF_ALWAYS, @@ -215,13 +218,13 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = { -1, -1, TYPE_BITFIELD, CONF_VALUE_32_BIT(1), - &li.can_move_into_acid_bits, ~0 /* default: everything can */ + &li.can_move_into_acid_bits, ~0 // default: everything can }, { -1, -1, TYPE_BITFIELD, CONF_VALUE_8_BIT(7), - &li.dont_collide_with_bits, ~0 /* default: always deadly */ + &li.dont_collide_with_bits, ~0 // default: always deadly }, { @@ -236,6 +239,24 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = &li.score[SC_TIME_BONUS], 1 }, + { + -1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(9), + &li.auto_exit_sokoban, FALSE + }, + + { + -1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(10), + &li.auto_count_gems, FALSE + }, + + { + -1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(11), + &li.solved_by_one_player, FALSE + }, + { -1, -1, -1, -1, @@ -245,16 +266,16 @@ static struct LevelFileConfigInfo chunk_config_INFO[] = static struct LevelFileConfigInfo chunk_config_ELEM[] = { - /* (these values are the same for each player) */ + // (these values are the same for each player) { EL_PLAYER_1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), - &li.block_last_field, FALSE /* default case for EM levels */ + &li.block_last_field, FALSE // default case for EM levels }, { EL_PLAYER_1, -1, TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), - &li.sp_block_last_field, TRUE /* default case for SP levels */ + &li.sp_block_last_field, TRUE // default case for SP levels }, { EL_PLAYER_1, -1, @@ -281,8 +302,13 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_BOOLEAN, CONF_VALUE_8_BIT(12), &li.shifted_relocation, FALSE }, + { + EL_PLAYER_1, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(15), + &li.lazy_relocation, FALSE + }, - /* (these values are different for each player) */ + // (these values are different for each player) { EL_PLAYER_1, -1, TYPE_INTEGER, CONF_VALUE_8_BIT(7), @@ -642,6 +668,11 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = TYPE_INTEGER, CONF_VALUE_8_BIT(4), &li.game_of_life[3], 3 }, + { + EL_GAME_OF_LIFE, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(5), + &li.use_life_bugs, FALSE + }, { EL_BIOMAZE, -1, @@ -787,16 +818,81 @@ static struct LevelFileConfigInfo chunk_config_ELEM[] = &li.num_ball_contents, 4, MAX_ELEMENT_CONTENTS }, - /* ---------- unused values ----------------------------------------------- */ + { + EL_SOKOBAN_FIELD_EMPTY, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.sb_fields_needed, TRUE + }, + + { + EL_SOKOBAN_OBJECT, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.sb_objects_needed, TRUE + }, { - EL_UNKNOWN, SAVE_CONF_NEVER, + EL_MM_MCDUFFIN, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.mm_laser_red, FALSE + }, + { + EL_MM_MCDUFFIN, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.mm_laser_green, FALSE + }, + { + EL_MM_MCDUFFIN, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(3), + &li.mm_laser_blue, TRUE + }, + + { + EL_DF_LASER, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(1), + &li.df_laser_red, TRUE + }, + { + EL_DF_LASER, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(2), + &li.df_laser_green, TRUE + }, + { + EL_DF_LASER, -1, + TYPE_BOOLEAN, CONF_VALUE_8_BIT(3), + &li.df_laser_blue, FALSE + }, + + { + EL_MM_FUSE_ACTIVE, -1, + TYPE_INTEGER, CONF_VALUE_16_BIT(1), + &li.mm_time_fuse, 25 + }, + { + EL_MM_BOMB, -1, + TYPE_INTEGER, CONF_VALUE_16_BIT(1), + &li.mm_time_bomb, 75 + }, + { + EL_MM_GRAY_BALL, -1, TYPE_INTEGER, CONF_VALUE_16_BIT(1), - &li.score[SC_UNKNOWN_14], 10 + &li.mm_time_ball, 75 }, + { + EL_MM_STEEL_BLOCK, -1, + TYPE_INTEGER, CONF_VALUE_16_BIT(1), + &li.mm_time_block, 75 + }, + { + EL_MM_LIGHTBALL, -1, + TYPE_INTEGER, CONF_VALUE_16_BIT(1), + &li.score[SC_ELEM_BONUS], 10 + }, + + // ---------- unused values ------------------------------------------------- + { EL_UNKNOWN, SAVE_CONF_NEVER, - TYPE_INTEGER, CONF_VALUE_16_BIT(2), + TYPE_INTEGER, CONF_VALUE_16_BIT(1), &li.score[SC_UNKNOWN_15], 10 }, @@ -863,8 +959,8 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] = &xx_ei.properties[EP_BITFIELD_BASE_NR], EP_BITMASK_BASE_DEFAULT, &yy_ei.properties[EP_BITFIELD_BASE_NR] }, -#if 0 - /* (reserved) */ +#if ENABLE_RESERVED_CODE + // (reserved for later use) { -1, -1, TYPE_BITFIELD, CONF_VALUE_32_BIT(2), @@ -1034,7 +1130,7 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] = &xx_num_contents, 1, 1 }, - /* ---------- "num_change_pages" must be the last entry ------------------- */ + // ---------- "num_change_pages" must be the last entry --------------------- { -1, SAVE_CONF_ALWAYS, @@ -1053,7 +1149,7 @@ static struct LevelFileConfigInfo chunk_config_CUSX_base[] = static struct LevelFileConfigInfo chunk_config_CUSX_change[] = { - /* ---------- "current_change_page" must be the first entry --------------- */ + // ---------- "current_change_page" must be the first entry ----------------- { -1, SAVE_CONF_ALWAYS, @@ -1061,7 +1157,7 @@ static struct LevelFileConfigInfo chunk_config_CUSX_change[] = &xx_current_change_page, -1 }, - /* ---------- (the remaining entries can be in any order) ----------------- */ + // ---------- (the remaining entries can be in any order) ------------------- { -1, -1, @@ -1237,7 +1333,7 @@ static struct LevelFileConfigInfo chunk_config_GRPX[] = } }; -static struct LevelFileConfigInfo chunk_config_CONF[] = /* (OBSOLETE) */ +static struct LevelFileConfigInfo chunk_config_CONF[] = // (OBSOLETE) { { EL_PLAYER_1, -1, @@ -1306,15 +1402,26 @@ filetype_id_list[] = { LEVEL_FILE_TYPE_DX, "DX" }, { LEVEL_FILE_TYPE_SB, "SB" }, { LEVEL_FILE_TYPE_DC, "DC" }, + { LEVEL_FILE_TYPE_MM, "MM" }, + { LEVEL_FILE_TYPE_MM, "DF" }, { -1, NULL }, }; -/* ========================================================================= */ -/* level file functions */ -/* ========================================================================= */ +// ============================================================================ +// level file functions +// ============================================================================ + +static boolean check_special_flags(char *flag) +{ + if (strEqual(options.special_flags, flag) || + strEqual(leveldir_current->special_flags, flag)) + return TRUE; + + return FALSE; +} -static struct DateInfo getCurrentDate() +static struct DateInfo getCurrentDate(void) { time_t epoch_seconds = time(NULL); struct tm *now = localtime(&epoch_seconds); @@ -1324,6 +1431,8 @@ static struct DateInfo getCurrentDate() date.month = now->tm_mon + 1; date.day = now->tm_mday; + date.src = DATE_SRC_CLOCK; + return date; } @@ -1335,7 +1444,7 @@ static void resetEventFlags(struct ElementChangeInfo *change) change->has_event[i] = FALSE; } -static void resetEventBits() +static void resetEventBits(void) { int i; @@ -1379,11 +1488,11 @@ static char *getDefaultElementDescription(struct ElementInfo *ei) ei->editor_description); int i; - /* always start with reliable default values */ + // always start with reliable default values for (i = 0; i < MAX_ELEMENT_NAME_LEN + 1; i++) description[i] = '\0'; - /* truncate element description to MAX_ELEMENT_NAME_LEN bytes */ + // truncate element description to MAX_ELEMENT_NAME_LEN bytes strncpy(description, default_description, MAX_ELEMENT_NAME_LEN); return &description[0]; @@ -1442,7 +1551,7 @@ static void setConfigToDefaultsFromConfigList(struct LevelFileConfigInfo *conf) content[c].e[x][y] = default_value; } } - else /* constant size configuration data (1, 2 or 4 bytes) */ + else // constant size configuration data (1, 2 or 4 bytes) { if (data_type == TYPE_BOOLEAN) *(boolean *)(conf[i].value) = default_value; @@ -1494,7 +1603,7 @@ static void copyConfigFromConfigList(struct LevelFileConfigInfo *conf) content_copy[c].e[x][y] = content[c].e[x][y]; } } - else /* constant size configuration data (1, 2 or 4 bytes) */ + else // constant size configuration data (1, 2 or 4 bytes) { if (data_type == TYPE_BOOLEAN) *(boolean *)(conf[i].value_copy) = *(boolean *)(conf[i].value); @@ -1508,15 +1617,15 @@ void copyElementInfo(struct ElementInfo *ei_from, struct ElementInfo *ei_to) { int i; - xx_ei = *ei_from; /* copy element data into temporary buffer */ - yy_ei = *ei_to; /* copy element data into temporary buffer */ + xx_ei = *ei_from; // copy element data into temporary buffer + yy_ei = *ei_to; // copy element data into temporary buffer copyConfigFromConfigList(chunk_config_CUSX_base); *ei_from = xx_ei; *ei_to = yy_ei; - /* ---------- reinitialize and copy change pages ---------- */ + // ---------- reinitialize and copy change pages ---------- ei_to->num_change_pages = ei_from->num_change_pages; ei_to->current_change_page = ei_from->current_change_page; @@ -1526,11 +1635,11 @@ void copyElementInfo(struct ElementInfo *ei_from, struct ElementInfo *ei_to) for (i = 0; i < ei_to->num_change_pages; i++) ei_to->change_page[i] = ei_from->change_page[i]; - /* ---------- copy group element info ---------- */ - if (ei_from->group != NULL && ei_to->group != NULL) /* group or internal */ + // ---------- copy group element info ---------- + if (ei_from->group != NULL && ei_to->group != NULL) // group or internal *ei_to->group = *ei_from->group; - /* mark this custom element as modified */ + // mark this custom element as modified ei_to->modified_settings = TRUE; } @@ -1551,12 +1660,7 @@ void setElementChangePages(struct ElementInfo *ei, int change_pages) void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) { - xx_change = *change; /* copy change data into temporary buffer */ - -#if 0 - /* (not needed; set by setConfigToDefaultsFromConfigList()) */ - xx_num_contents = 1; -#endif + xx_change = *change; // copy change data into temporary buffer setConfigToDefaultsFromConfigList(chunk_config_CUSX_change); @@ -1572,25 +1676,21 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) change->post_change_function = NULL; } -static void setLevelInfoToDefaults(struct LevelInfo *level) +static void setLevelInfoToDefaults_Level(struct LevelInfo *level) { - static boolean clipboard_elements_initialized = FALSE; int i, x, y; - InitElementPropertiesStatic(); - - li = *level; /* copy level data into temporary buffer */ - + 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 */ + *level = li; // copy temporary buffer back to level data setLevelInfoToDefaults_EM(); setLevelInfoToDefaults_SP(); + setLevelInfoToDefaults_MM(); level->native_em_level = &native_em_level; level->native_sp_level = &native_sp_level; + level->native_mm_level = &native_mm_level; level->file_version = FILE_VERSION_ACTUAL; level->game_version = GAME_VERSION_ACTUAL; @@ -1601,28 +1701,84 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->encoding_16bit_yamyam = TRUE; level->encoding_16bit_amoeba = TRUE; - for (x = 0; x < MAX_LEV_FIELDX; x++) - for (y = 0; y < MAX_LEV_FIELDY; y++) - level->field[x][y] = EL_SAND; - + // clear level name and level author string buffers for (i = 0; i < MAX_LEVEL_NAME_LEN; i++) level->name[i] = '\0'; for (i = 0; i < MAX_LEVEL_AUTHOR_LEN; i++) level->author[i] = '\0'; + // set level name and level author to default values strcpy(level->name, NAMELESS_LEVEL_NAME); strcpy(level->author, ANONYMOUS_NAME); + // set level playfield to playable default level with player and exit + for (x = 0; x < MAX_LEV_FIELDX; x++) + for (y = 0; y < MAX_LEV_FIELDY; y++) + level->field[x][y] = EL_SAND; + level->field[0][0] = EL_PLAYER_1; level->field[STD_LEV_FIELDX - 1][STD_LEV_FIELDY - 1] = EL_EXIT_CLOSED; + BorderElement = EL_STEELWALL; + + // detect custom elements when loading them + level->file_has_custom_elements = FALSE; + + // set all bug compatibility flags to "false" => do not emulate this bug + level->use_action_after_change_bug = FALSE; + + if (leveldir_current) + { + // try to determine better author name than 'anonymous' + if (!strEqual(leveldir_current->author, ANONYMOUS_NAME)) + { + strncpy(level->author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + } + else + { + switch (LEVELCLASS(leveldir_current)) + { + case LEVELCLASS_TUTORIAL: + strcpy(level->author, PROGRAM_AUTHOR_STRING); + break; + + case LEVELCLASS_CONTRIB: + strncpy(level->author, leveldir_current->name, MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; + + case LEVELCLASS_PRIVATE: + strncpy(level->author, getRealName(), MAX_LEVEL_AUTHOR_LEN); + level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + break; + + default: + // keep default value + break; + } + } + } +} + +static void setLevelInfoToDefaults_Elements(struct LevelInfo *level) +{ + static boolean clipboard_elements_initialized = FALSE; + int i; + + InitElementPropertiesStatic(); + + li = *level; // copy level data into temporary buffer + setConfigToDefaultsFromConfigList(chunk_config_ELEM); + *level = li; // copy temporary buffer back to level data + for (i = 0; i < MAX_NUM_ELEMENTS; i++) { 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) */ + // 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; @@ -1639,7 +1795,7 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) IS_GROUP_ELEMENT(element) || IS_INTERNAL_ELEMENT(element)) { - xx_ei = *ei; /* copy element data into temporary buffer */ + xx_ei = *ei; // copy element data into temporary buffer setConfigToDefaultsFromConfigList(chunk_config_CUSX_base); @@ -1661,7 +1817,7 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) if (IS_CUSTOM_ELEMENT(element) || IS_INTERNAL_ELEMENT(element)) { - /* internal values used in level editor */ + // internal values used in level editor ei->access_type = 0; ei->access_layer = 0; @@ -1682,13 +1838,13 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) { struct ElementGroupInfo *group; - /* initialize memory for list of elements in group */ + // initialize memory for list of elements in group if (ei->group == NULL) ei->group = checked_malloc(sizeof(struct ElementGroupInfo)); group = ei->group; - xx_group = *group; /* copy group data into temporary buffer */ + xx_group = *group; // copy group data into temporary buffer setConfigToDefaultsFromConfigList(chunk_config_GRPX); @@ -1697,48 +1853,24 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) } clipboard_elements_initialized = TRUE; +} - BorderElement = EL_STEELWALL; - - level->no_valid_file = FALSE; - - level->changed = FALSE; - - /* set all bug compatibility flags to "false" => do not emulate this bug */ - level->use_action_after_change_bug = FALSE; +static void setLevelInfoToDefaults(struct LevelInfo *level, + boolean level_info_only, + boolean reset_file_status) +{ + setLevelInfoToDefaults_Level(level); - if (leveldir_current == NULL) /* only when dumping level */ - return; + if (!level_info_only) + setLevelInfoToDefaults_Elements(level); - /* try to determine better author name than 'anonymous' */ - if (!strEqual(leveldir_current->author, ANONYMOUS_NAME)) + if (reset_file_status) { - strncpy(level->author, leveldir_current->author, MAX_LEVEL_AUTHOR_LEN); - level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; + level->no_valid_file = FALSE; + level->no_level_file = FALSE; } - else - { - switch (LEVELCLASS(leveldir_current)) - { - case LEVELCLASS_TUTORIAL: - strcpy(level->author, PROGRAM_AUTHOR_STRING); - break; - - case LEVELCLASS_CONTRIB: - strncpy(level->author, leveldir_current->name, MAX_LEVEL_AUTHOR_LEN); - level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; - break; - - case LEVELCLASS_PRIVATE: - strncpy(level->author, getRealName(), MAX_LEVEL_AUTHOR_LEN); - level->author[MAX_LEVEL_AUTHOR_LEN] = '\0'; - break; - default: - /* keep default value */ - break; - } - } + level->changed = FALSE; } static void setFileInfoToDefaults(struct LevelFileInfo *level_file_info) @@ -1746,15 +1878,85 @@ static void setFileInfoToDefaults(struct LevelFileInfo *level_file_info) level_file_info->nr = 0; level_file_info->type = LEVEL_FILE_TYPE_UNKNOWN; level_file_info->packed = FALSE; - level_file_info->basename = NULL; - level_file_info->filename = NULL; + + setString(&level_file_info->basename, NULL); + setString(&level_file_info->filename, NULL); } -static void ActivateLevelTemplate() +int getMappedElement_SB(int, boolean); + +static void ActivateLevelTemplate(void) { - /* 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. */ + int x, y; + + if (check_special_flags("load_xsb_to_ces")) + { + // fill smaller playfields with padding "beyond border wall" elements + if (level.fieldx < level_template.fieldx || + level.fieldy < level_template.fieldy) + { + short field[level.fieldx][level.fieldy]; + int new_fieldx = MAX(level.fieldx, level_template.fieldx); + int new_fieldy = MAX(level.fieldy, level_template.fieldy); + int pos_fieldx = (new_fieldx - level.fieldx) / 2; + int pos_fieldy = (new_fieldy - level.fieldy) / 2; + + // copy old playfield (which is smaller than the visible area) + for (y = 0; y < level.fieldy; y++) for (x = 0; x < level.fieldx; x++) + field[x][y] = level.field[x][y]; + + // fill new, larger playfield with "beyond border wall" elements + for (y = 0; y < new_fieldy; y++) for (x = 0; x < new_fieldx; x++) + level.field[x][y] = getMappedElement_SB('_', TRUE); + + // copy the old playfield to the middle of the new playfield + for (y = 0; y < level.fieldy; y++) for (x = 0; x < level.fieldx; x++) + level.field[pos_fieldx + x][pos_fieldy + y] = field[x][y]; + + level.fieldx = new_fieldx; + level.fieldy = new_fieldy; + } + } + + // 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. + + // Exception: 'from_level_template' elements in the original level playfield + // are overwritten with the corresponding elements at the same position in + // playfield from the level template. + + for (x = 0; x < level.fieldx; x++) + for (y = 0; y < level.fieldy; y++) + if (level.field[x][y] == EL_FROM_LEVEL_TEMPLATE) + level.field[x][y] = level_template.field[x][y]; + + if (check_special_flags("load_xsb_to_ces")) + { + struct LevelInfo level_backup = level; + + // overwrite all individual level settings from template level settings + level = level_template; + + // restore level file info + level.file_info = level_backup.file_info; + + // restore playfield size + level.fieldx = level_backup.fieldx; + level.fieldy = level_backup.fieldy; + + // restore playfield content + for (x = 0; x < level.fieldx; x++) + for (y = 0; y < level.fieldy; y++) + level.field[x][y] = level_backup.field[x][y]; + + // restore name and author from individual level + strcpy(level.name, level_backup.name); + strcpy(level.author, level_backup.author); + + // restore flag "use_custom_template" + level.use_custom_template = level_backup.use_custom_template; + } } static char *getLevelFilenameFromBasename(char *basename) @@ -1770,29 +1972,35 @@ static char *getLevelFilenameFromBasename(char *basename) static int getFileTypeFromBasename(char *basename) { + // !!! ALSO SEE COMMENT IN checkForPackageFromBasename() !!! + static char *filename = NULL; struct stat file_status; - /* ---------- try to determine file type from filename ---------- */ + // ---------- try to determine file type from filename ---------- - /* check for typical filename of a Supaplex level package file */ - if (strlen(basename) == 10 && (strncmp(basename, "levels.d", 8) == 0 || - strncmp(basename, "LEVELS.D", 8) == 0)) + // check for typical filename of a Supaplex level package file + if (strlen(basename) == 10 && strPrefixLower(basename, "levels.d")) return LEVEL_FILE_TYPE_SP; - /* check for typical filename of a Diamond Caves II level package file */ - if (strSuffix(basename, ".dc") || - strSuffix(basename, ".dc2")) + // check for typical filename of a Diamond Caves II level package file + if (strSuffixLower(basename, ".dc") || + strSuffixLower(basename, ".dc2")) return LEVEL_FILE_TYPE_DC; - /* ---------- try to determine file type from filesize ---------- */ + // check for typical filename of a Sokoban level package file + if (strSuffixLower(basename, ".xsb") && + strchr(basename, '%') == NULL) + return LEVEL_FILE_TYPE_SB; + + // ---------- try to determine file type from filesize ---------- checked_free(filename); filename = getPath2(getCurrentLevelDir(), basename); if (stat(filename, &file_status) == 0) { - /* check for typical filesize of a Supaplex level package file */ + // check for typical filesize of a Supaplex level package file if (file_status.st_size == 170496) return LEVEL_FILE_TYPE_SP; } @@ -1800,40 +2008,73 @@ static int getFileTypeFromBasename(char *basename) return LEVEL_FILE_TYPE_UNKNOWN; } -static char *getSingleLevelBasename(int nr) +static int getFileTypeFromMagicBytes(char *filename, int type) +{ + File *file; + + if ((file = openFile(filename, MODE_READ))) + { + char chunk_name[CHUNK_ID_LEN + 1]; + + getFileChunkBE(file, chunk_name, NULL); + + if (strEqual(chunk_name, "MMII") || + strEqual(chunk_name, "MIRR")) + type = LEVEL_FILE_TYPE_MM; + + closeFile(file); + } + + return type; +} + +static boolean checkForPackageFromBasename(char *basename) +{ + // !!! WON'T WORK ANYMORE IF getFileTypeFromBasename() ALSO DETECTS !!! + // !!! SINGLE LEVELS (CURRENTLY ONLY DETECTS LEVEL PACKAGES !!! + + return (getFileTypeFromBasename(basename) != LEVEL_FILE_TYPE_UNKNOWN); +} + +static char *getSingleLevelBasenameExt(int nr, char *extension) { static char basename[MAX_FILENAME_LEN]; if (nr < 0) - sprintf(basename, "template.%s", LEVELFILE_EXTENSION); + sprintf(basename, "%s", LEVELTEMPLATE_FILENAME); else - sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); + sprintf(basename, "%03d.%s", nr, extension); return basename; } +static char *getSingleLevelBasename(int nr) +{ + return getSingleLevelBasenameExt(nr, LEVELFILE_EXTENSION); +} + static char *getPackedLevelBasename(int type) { static char basename[MAX_FILENAME_LEN]; char *directory = getCurrentLevelDir(); - DIR *dir; - struct dirent *dir_entry; + Directory *dir; + DirectoryEntry *dir_entry; - strcpy(basename, UNDEFINED_FILENAME); /* default: undefined file */ + strcpy(basename, UNDEFINED_FILENAME); // default: undefined file - if ((dir = opendir(directory)) == NULL) + if ((dir = openDirectory(directory)) == NULL) { Error(ERR_WARN, "cannot read current level directory '%s'", directory); return basename; } - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + while ((dir_entry = readDirectory(dir)) != NULL) // loop all entries { - char *entry_basename = dir_entry->d_name; + char *entry_basename = dir_entry->basename; int entry_type = getFileTypeFromBasename(entry_basename); - if (entry_type != LEVEL_FILE_TYPE_UNKNOWN) /* found valid level package */ + if (entry_type != LEVEL_FILE_TYPE_UNKNOWN) // found valid level package { if (type == LEVEL_FILE_TYPE_UNKNOWN || type == entry_type) @@ -1845,7 +2086,7 @@ static char *getPackedLevelBasename(int type) } } - closedir(dir); + closeDirectory(dir); return basename; } @@ -1855,7 +2096,7 @@ static char *getSingleLevelFilename(int nr) return getLevelFilenameFromBasename(getSingleLevelBasename(nr)); } -#if 0 +#if ENABLE_UNUSED_CODE static char *getPackedLevelFilename(int type) { return getLevelFilenameFromBasename(getPackedLevelBasename(type)); @@ -1867,14 +2108,15 @@ char *getDefaultLevelFilename(int nr) return getSingleLevelFilename(nr); } -#if 0 +#if ENABLE_UNUSED_CODE static void setLevelFileInfo_SingleLevelFilename(struct LevelFileInfo *lfi, int type) { lfi->type = type; lfi->packed = FALSE; - lfi->basename = getSingleLevelBasename(lfi->nr, lfi->type); - lfi->filename = getLevelFilenameFromBasename(lfi->basename); + + setString(&lfi->basename, getSingleLevelBasename(lfi->nr, lfi->type)); + setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename)); } #endif @@ -1890,8 +2132,9 @@ static void setLevelFileInfo_FormatLevelFilename(struct LevelFileInfo *lfi, lfi->type = type; lfi->packed = FALSE; - lfi->basename = basename; - lfi->filename = getLevelFilenameFromBasename(lfi->basename); + + setString(&lfi->basename, basename); + setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename)); } static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi, @@ -1899,8 +2142,9 @@ static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi, { lfi->type = type; lfi->packed = TRUE; - lfi->basename = getPackedLevelBasename(lfi->type); - lfi->filename = getLevelFilenameFromBasename(lfi->basename); + + setString(&lfi->basename, getPackedLevelBasename(lfi->type)); + setString(&lfi->filename, getLevelFilenameFromBasename(lfi->basename)); } static int getFiletypeFromID(char *filetype_id) @@ -1932,38 +2176,83 @@ static int getFiletypeFromID(char *filetype_id) return filetype; } +char *getLocalLevelTemplateFilename(void) +{ + return getDefaultLevelFilename(-1); +} + +char *getGlobalLevelTemplateFilename(void) +{ + // global variable "leveldir_current" must be modified in the loop below + LevelDirTree *leveldir_current_last = leveldir_current; + char *filename = NULL; + + // check for template level in path from current to topmost tree node + + while (leveldir_current != NULL) + { + filename = getDefaultLevelFilename(-1); + + if (fileExists(filename)) + break; + + leveldir_current = leveldir_current->node_parent; + } + + // restore global variable "leveldir_current" modified in above loop + leveldir_current = leveldir_current_last; + + return filename; +} + static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) { int nr = lfi->nr; - /* special case: level number is negative => check for level template file */ + // special case: level number is negative => check for level template file if (nr < 0) { setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND, - "template.%s", LEVELFILE_EXTENSION); + getSingleLevelBasename(-1)); + + // replace local level template filename with global template filename + setString(&lfi->filename, getGlobalLevelTemplateFilename()); - /* no fallback if template file not existing */ + // no fallback if template file not existing return; } - /* special case: check for file name/pattern specified in "levelinfo.conf" */ + // special case: check for file name/pattern specified in "levelinfo.conf" if (leveldir_current->level_filename != NULL) { int filetype = getFiletypeFromID(leveldir_current->level_filetype); setLevelFileInfo_FormatLevelFilename(lfi, filetype, leveldir_current->level_filename, nr); + + lfi->packed = checkForPackageFromBasename(leveldir_current->level_filename); + + if (fileExists(lfi->filename)) + return; + } + else if (leveldir_current->level_filetype != NULL) + { + int filetype = getFiletypeFromID(leveldir_current->level_filetype); + + // check for specified native level file with standard file name + setLevelFileInfo_FormatLevelFilename(lfi, filetype, + "%03d.%s", nr, LEVELFILE_EXTENSION); if (fileExists(lfi->filename)) return; } - /* check for native Rocks'n'Diamonds level file */ + // check for native Rocks'n'Diamonds level file setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND, "%03d.%s", nr, LEVELFILE_EXTENSION); if (fileExists(lfi->filename)) return; - /* check for Emerald Mine level file (V1) */ + // check for Emerald Mine level file (V1) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "a%c%c", 'a' + (nr / 10) % 26, '0' + nr % 10); if (fileExists(lfi->filename)) @@ -1973,12 +2262,12 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) if (fileExists(lfi->filename)) return; - /* check for Emerald Mine level file (V2 to V5) */ + // check for Emerald Mine level file (V2 to V5) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%d", nr); if (fileExists(lfi->filename)) return; - /* check for Emerald Mine level file (V6 / single mode) */ + // check for Emerald Mine level file (V6 / single mode) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02ds", nr); if (fileExists(lfi->filename)) return; @@ -1986,7 +2275,7 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) if (fileExists(lfi->filename)) return; - /* check for Emerald Mine level file (V6 / teamwork mode) */ + // check for Emerald Mine level file (V6 / teamwork mode) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02dt", nr); if (fileExists(lfi->filename)) return; @@ -1994,12 +2283,12 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) if (fileExists(lfi->filename)) return; - /* check for various packed level file formats */ + // check for various packed level file formats setLevelFileInfo_PackedLevelFilename(lfi, LEVEL_FILE_TYPE_UNKNOWN); if (fileExists(lfi->filename)) return; - /* no known level file found -- use default values (and fail later) */ + // no known level file found -- use default values (and fail later) setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND, "%03d.%s", nr, LEVELFILE_EXTENSION); } @@ -2008,26 +2297,40 @@ static void determineLevelFileInfo_Filetype(struct LevelFileInfo *lfi) { if (lfi->type == LEVEL_FILE_TYPE_UNKNOWN) lfi->type = getFileTypeFromBasename(lfi->basename); + + if (lfi->type == LEVEL_FILE_TYPE_RND) + lfi->type = getFileTypeFromMagicBytes(lfi->filename, lfi->type); } static void setLevelFileInfo(struct LevelFileInfo *level_file_info, int nr) { - /* always start with reliable default values */ + // always start with reliable default values setFileInfoToDefaults(level_file_info); - level_file_info->nr = nr; /* set requested level number */ + level_file_info->nr = nr; // set requested level number determineLevelFileInfo_Filename(level_file_info); determineLevelFileInfo_Filetype(level_file_info); } -/* ------------------------------------------------------------------------- */ -/* functions for loading R'n'D level */ -/* ------------------------------------------------------------------------- */ +static void copyLevelFileInfo(struct LevelFileInfo *lfi_from, + struct LevelFileInfo *lfi_to) +{ + lfi_to->nr = lfi_from->nr; + lfi_to->type = lfi_from->type; + lfi_to->packed = lfi_from->packed; + + setString(&lfi_to->basename, lfi_from->basename); + setString(&lfi_to->filename, lfi_from->filename); +} + +// ---------------------------------------------------------------------------- +// functions for loading R'n'D level +// ---------------------------------------------------------------------------- -int getMappedElement(int element) +static int getMappedElement(int element) { - /* remap some (historic, now obsolete) elements */ + // remap some (historic, now obsolete) elements switch (element) { @@ -2076,13 +2379,13 @@ int getMappedElement(int element) return element; } -int getMappedElementByVersion(int element, int game_version) +static int getMappedElementByVersion(int element, int game_version) { - /* remap some elements due to certain game version */ + // remap some elements due to certain game version if (game_version <= VERSION_IDENT(2,2,0,0)) { - /* map game font elements */ + // map game font elements element = (element == EL_CHAR('[') ? EL_CHAR_AUMLAUT : element == EL_CHAR('\\') ? EL_CHAR_OUMLAUT : element == EL_CHAR(']') ? EL_CHAR_UUMLAUT : @@ -2091,7 +2394,7 @@ int getMappedElementByVersion(int element, int game_version) if (game_version < VERSION_IDENT(3,0,0,0)) { - /* map Supaplex gravity tube elements */ + // map Supaplex gravity tube elements element = (element == EL_SP_GRAVITY_PORT_LEFT ? EL_SP_PORT_LEFT : element == EL_SP_GRAVITY_PORT_RIGHT ? EL_SP_PORT_RIGHT : element == EL_SP_GRAVITY_PORT_UP ? EL_SP_PORT_UP : @@ -2102,7 +2405,7 @@ int getMappedElementByVersion(int element, int game_version) return element; } -static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_VERS(File *file, int chunk_size, struct LevelInfo *level) { level->file_version = getFileVersion(file); level->game_version = getFileVersion(file); @@ -2110,16 +2413,18 @@ static int LoadLevel_VERS(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_DATE(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_DATE(File *file, int chunk_size, struct LevelInfo *level) { level->creation_date.year = getFile16BitBE(file); level->creation_date.month = getFile8Bit(file); level->creation_date.day = getFile8Bit(file); + level->creation_date.src = DATE_SRC_LEVELFILE; + return chunk_size; } -static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_HEAD(File *file, int chunk_size, struct LevelInfo *level) { int initial_player_stepsize; int initial_player_gravity; @@ -2184,7 +2489,7 @@ static int LoadLevel_HEAD(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_NAME(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_NAME(File *file, int chunk_size, struct LevelInfo *level) { int i; @@ -2195,7 +2500,7 @@ static int LoadLevel_NAME(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_AUTH(File *file, int chunk_size, struct LevelInfo *level) { int i; @@ -2206,7 +2511,7 @@ static int LoadLevel_AUTH(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_BODY(File *file, int chunk_size, struct LevelInfo *level) { int x, y; int chunk_size_expected = level->fieldx * level->fieldy; @@ -2233,7 +2538,7 @@ static int LoadLevel_BODY(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CONT(File *file, int chunk_size, struct LevelInfo *level) { int i, x, y; int header_size = 4; @@ -2259,7 +2564,7 @@ static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) getFile8Bit(file); getFile8Bit(file); - /* correct invalid number of content fields -- should never happen */ + // correct invalid number of content fields -- should never happen if (level->num_yamyam_contents < 1 || level->num_yamyam_contents > MAX_ELEMENT_CONTENTS) level->num_yamyam_contents = STD_ELEMENT_CONTENTS; @@ -2273,17 +2578,18 @@ static int LoadLevel_CONT(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CNT2(File *file, int chunk_size, struct LevelInfo *level) { int i, x, y; int element; - int num_contents, content_xsize, content_ysize; + int num_contents; int content_array[MAX_ELEMENT_CONTENTS][3][3]; element = getMappedElement(getFile16BitBE(file)); num_contents = getFile8Bit(file); - content_xsize = getFile8Bit(file); - content_ysize = getFile8Bit(file); + + getFile8Bit(file); // content x size (unused) + getFile8Bit(file); // content y size (unused) ReadUnusedBytesFromFile(file, LEVEL_CHUNK_CNT2_UNUSED); @@ -2292,7 +2598,7 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) for (x = 0; x < 3; x++) content_array[i][x][y] = getMappedElement(getFile16BitBE(file)); - /* correct invalid number of content fields -- should never happen */ + // correct invalid number of content fields -- should never happen if (num_contents < 1 || num_contents > MAX_ELEMENT_CONTENTS) num_contents = STD_ELEMENT_CONTENTS; @@ -2317,7 +2623,7 @@ static int LoadLevel_CNT2(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_CNT3(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CNT3(File *file, int chunk_size, struct LevelInfo *level) { int i; int element; @@ -2351,7 +2657,7 @@ static int LoadLevel_CNT3(FILE *file, int chunk_size, struct LevelInfo *level) return chunk_size; } -static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CUS1(File *file, int chunk_size, struct LevelInfo *level) { int num_changed_custom_elements = getFile16BitBE(file); int chunk_size_expected = 2 + num_changed_custom_elements * 6; @@ -2373,16 +2679,18 @@ static int LoadLevel_CUS1(FILE *file, int chunk_size, struct LevelInfo *level) else Error(ERR_WARN, "invalid custom element number %d", element); - /* older game versions that wrote level files with CUS1 chunks used - different default push delay values (not yet stored in level file) */ + // 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; } + level->file_has_custom_elements = TRUE; + return chunk_size; } -static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CUS2(File *file, int chunk_size, struct LevelInfo *level) { int num_changed_custom_elements = getFile16BitBE(file); int chunk_size_expected = 2 + num_changed_custom_elements * 4; @@ -2405,10 +2713,12 @@ static int LoadLevel_CUS2(FILE *file, int chunk_size, struct LevelInfo *level) Error(ERR_WARN, "invalid custom element number %d", element); } + level->file_has_custom_elements = TRUE; + return chunk_size; } -static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CUS3(File *file, int chunk_size, struct LevelInfo *level) { int num_changed_custom_elements = getFile16BitBE(file); int chunk_size_expected = LEVEL_CHUNK_CUS3_SIZE(num_changed_custom_elements); @@ -2439,7 +2749,7 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file); - /* some free bytes for future properties and padding */ + // some free bytes for future properties and padding ReadUnusedBytesFromFile(file, 7); ei->use_gfx_element = getFile8Bit(file); @@ -2489,24 +2799,26 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) ei->slippery_type = getFile8Bit(file); - /* some free bytes for future properties and padding */ + // some free bytes for future properties and padding ReadUnusedBytesFromFile(file, LEVEL_CPART_CUS3_UNUSED); - /* mark that this custom element has been modified */ + // mark that this custom element has been modified ei->modified_settings = TRUE; } + level->file_has_custom_elements = TRUE; + return chunk_size; } -static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CUS4(File *file, int chunk_size, struct LevelInfo *level) { struct ElementInfo *ei; int chunk_size_expected; int element; int i, j, x, y; - /* ---------- custom element base property values (96 bytes) ------------- */ + // ---------- custom element base property values (96 bytes) ---------------- element = getMappedElement(getFile16BitBE(file)); @@ -2526,7 +2838,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->properties[EP_BITFIELD_BASE_NR] = getFile32BitBE(file); - ReadUnusedBytesFromFile(file, 4); /* reserved for more base properties */ + ReadUnusedBytesFromFile(file, 4); // reserved for more base properties ei->num_change_pages = getFile8Bit(file); @@ -2554,7 +2866,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->move_delay_fixed = getFile16BitBE(file); ei->move_delay_random = getFile16BitBE(file); - /* bits 0 - 15 of "move_pattern" ... */ + // bits 0 - 15 of "move_pattern" ... ei->move_pattern = getFile16BitBE(file); ei->move_direction_initial = getFile8Bit(file); ei->move_stepsize = getFile8Bit(file); @@ -2569,7 +2881,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->move_leave_element = getMappedElement(getFile16BitBE(file)); ei->move_leave_type = getFile8Bit(file); - /* ... bits 16 - 31 of "move_pattern" (not nice, but downward compatible) */ + // ... bits 16 - 31 of "move_pattern" (not nice, but downward compatible) ei->move_pattern |= (getFile16BitBE(file) << 16); ei->access_direction = getFile8Bit(file); @@ -2578,10 +2890,10 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) ei->ignition_delay = getFile8Bit(file); ei->explosion_type = getFile8Bit(file); - /* some free bytes for future custom property values and padding */ + // some free bytes for future custom property values and padding ReadUnusedBytesFromFile(file, 1); - /* ---------- change page property values (48 bytes) --------------------- */ + // ---------- change page property values (48 bytes) ------------------------ setElementChangePages(ei, ei->num_change_pages); @@ -2590,10 +2902,10 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) struct ElementChangeInfo *change = &ei->change_page[i]; unsigned int event_bits; - /* always start with reliable default values */ + // always start with reliable default values setElementChangeInfoToDefaults(change); - /* bits 0 - 31 of "has_event[]" ... */ + // bits 0 - 31 of "has_event[]" ... event_bits = getFile32BitBE(file); for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++) if (event_bits & (1 << j)) @@ -2634,20 +2946,22 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) change->action_mode = getFile8Bit(file); change->action_arg = getFile16BitBE(file); - /* ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible) */ + // ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible) event_bits = getFile8Bit(file); for (j = 32; j < NUM_CHANGE_EVENTS; j++) if (event_bits & (1 << (j - 32))) change->has_event[j] = TRUE; } - /* mark this custom element as modified */ + // mark this custom element as modified ei->modified_settings = TRUE; + level->file_has_custom_elements = TRUE; + return chunk_size; } -static int LoadLevel_GRP1(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_GRP1(File *file, int chunk_size, struct LevelInfo *level) { struct ElementInfo *ei; struct ElementGroupInfo *group; @@ -2679,19 +2993,21 @@ static int LoadLevel_GRP1(FILE *file, int chunk_size, struct LevelInfo *level) group->choice_mode = getFile8Bit(file); - /* some free bytes for future values and padding */ + // some free bytes for future values and padding ReadUnusedBytesFromFile(file, 3); for (i = 0; i < MAX_ELEMENTS_IN_GROUP; i++) group->element[i] = getMappedElement(getFile16BitBE(file)); - /* mark this group element as modified */ + // mark this group element as modified element_info[element].modified_settings = TRUE; + level->file_has_custom_elements = TRUE; + return chunk_size; } -static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, +static int LoadLevel_MicroChunk(File *file, struct LevelFileConfigInfo *conf, int element, int real_element) { int micro_chunk_size = 0; @@ -2730,13 +3046,13 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, if (num_entities == 0 && (data_type == TYPE_ELEMENT_LIST || data_type == TYPE_CONTENT_LIST)) { - /* for element and content lists, zero entities are not allowed */ + // 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 */ + // do not set "num_entities" here to prevent reading behind buffer - *(int *)(conf[i].num_entities) = 1; /* at least one is required */ + *(int *)(conf[i].num_entities) = 1; // at least one is required } else { @@ -2784,7 +3100,7 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, micro_chunk_size += 2 + num_bytes; } - else /* constant size configuration data (1, 2 or 4 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) : @@ -2831,13 +3147,13 @@ static int LoadLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *conf, return micro_chunk_size; } -static int LoadLevel_INFO(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_INFO(File *file, int chunk_size, struct LevelInfo *level) { int real_chunk_size = 0; - li = *level; /* copy level data into temporary buffer */ + li = *level; // copy level data into temporary buffer - while (!feof(file)) + while (!checkEndOfFile(file)) { real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_INFO, -1, -1); @@ -2845,18 +3161,18 @@ static int LoadLevel_INFO(FILE *file, int chunk_size, struct LevelInfo *level) break; } - *level = li; /* copy temporary buffer back to level data */ + *level = li; // copy temporary buffer back to level data return real_chunk_size; } -static int LoadLevel_CONF(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; - li = *level; /* copy level data into temporary buffer */ + li = *level; // copy level data into temporary buffer - while (!feof(file)) + while (!checkEndOfFile(file)) { int element = getMappedElement(getFile16BitBE(file)); @@ -2867,18 +3183,18 @@ static int LoadLevel_CONF(FILE *file, int chunk_size, struct LevelInfo *level) break; } - *level = li; /* copy temporary buffer back to level data */ + *level = li; // copy temporary buffer back to level data return real_chunk_size; } -static int LoadLevel_ELEM(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_ELEM(File *file, int chunk_size, struct LevelInfo *level) { int real_chunk_size = 0; - li = *level; /* copy level data into temporary buffer */ + li = *level; // copy level data into temporary buffer - while (!feof(file)) + while (!checkEndOfFile(file)) { int element = getMappedElement(getFile16BitBE(file)); @@ -2889,18 +3205,20 @@ static int LoadLevel_ELEM(FILE *file, int chunk_size, struct LevelInfo *level) break; } - *level = li; /* copy temporary buffer back to level data */ + *level = li; // copy temporary buffer back to level data return real_chunk_size; } -static int LoadLevel_NOTE(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_NOTE(File *file, int chunk_size, struct LevelInfo *level) { int element = getMappedElement(getFile16BitBE(file)); int envelope_nr = element - EL_ENVELOPE_1; int real_chunk_size = 2; - while (!feof(file)) + xx_envelope = level->envelope[envelope_nr]; // copy into temporary buffer + + while (!checkEndOfFile(file)) { real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_NOTE, -1, element); @@ -2909,23 +3227,23 @@ static int LoadLevel_NOTE(FILE *file, int chunk_size, struct LevelInfo *level) break; } - level->envelope[envelope_nr] = xx_envelope; + level->envelope[envelope_nr] = xx_envelope; // copy from temporary buffer return real_chunk_size; } -static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_CUSX(File *file, int chunk_size, struct LevelInfo *level) { int element = getMappedElement(getFile16BitBE(file)); int real_chunk_size = 2; struct ElementInfo *ei = &element_info[element]; int i; - xx_ei = *ei; /* copy element data into temporary buffer */ + xx_ei = *ei; // copy element data into temporary buffer xx_ei.num_change_pages = -1; - while (!feof(file)) + while (!checkEndOfFile(file)) { real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CUSX_base, -1, element); @@ -2951,21 +3269,21 @@ static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level) return real_chunk_size; } - /* initialize number of change pages stored for this custom element */ + // initialize number of change pages stored for this custom element setElementChangePages(ei, ei->num_change_pages); for (i = 0; i < ei->num_change_pages; i++) setElementChangeInfoToDefaults(&ei->change_page[i]); - /* start with reading properties for the first change page */ + // start with reading properties for the first change page xx_current_change_page = 0; - while (!feof(file)) + while (!checkEndOfFile(file)) { struct ElementChangeInfo *change = &ei->change_page[xx_current_change_page]; - xx_change = *change; /* copy change data into temporary buffer */ + xx_change = *change; // copy change data into temporary buffer - resetEventBits(); /* reset bits; change page might have changed */ + resetEventBits(); // reset bits; change page might have changed real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_CUSX_change, -1, element); @@ -2978,20 +3296,22 @@ static int LoadLevel_CUSX(FILE *file, int chunk_size, struct LevelInfo *level) break; } + level->file_has_custom_elements = TRUE; + return real_chunk_size; } -static int LoadLevel_GRPX(FILE *file, int chunk_size, struct LevelInfo *level) +static int LoadLevel_GRPX(File *file, int chunk_size, struct LevelInfo *level) { int element = getMappedElement(getFile16BitBE(file)); int real_chunk_size = 2; struct ElementInfo *ei = &element_info[element]; struct ElementGroupInfo *group = ei->group; - xx_ei = *ei; /* copy element data into temporary buffer */ - xx_group = *group; /* copy group data into temporary buffer */ + xx_ei = *ei; // copy element data into temporary buffer + xx_group = *group; // copy group data into temporary buffer - while (!feof(file)) + while (!checkEndOfFile(file)) { real_chunk_size += LoadLevel_MicroChunk(file, chunk_config_GRPX, -1, element); @@ -3003,32 +3323,50 @@ static int LoadLevel_GRPX(FILE *file, int chunk_size, struct LevelInfo *level) *ei = xx_ei; *group = xx_group; + level->file_has_custom_elements = TRUE; + return real_chunk_size; } static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) + struct LevelFileInfo *level_file_info, + boolean level_info_only) { char *filename = level_file_info->filename; char cookie[MAX_LINE_LEN]; char chunk_name[CHUNK_ID_LEN + 1]; int chunk_size; - FILE *file; + File *file; - if (!(file = fopen(filename, MODE_READ))) + if (!(file = openFile(filename, MODE_READ))) { level->no_valid_file = TRUE; + level->no_level_file = TRUE; - if (level != &level_template) - Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + if (level_info_only) + return; - return; + Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + + if (!setup.editor.use_template_for_new_levels) + return; + + // if level file not found, try to initialize level data from template + filename = getGlobalLevelTemplateFilename(); + + if (!(file = openFile(filename, MODE_READ))) + return; + + // default: for empty levels, use level template for custom elements + level->use_custom_template = TRUE; + + level->no_valid_file = FALSE; } getFileChunkBE(file, chunk_name, NULL); if (strEqual(chunk_name, "RND1")) { - getFile32BitBE(file); /* not used */ + getFile32BitBE(file); // not used getFileChunkBE(file, chunk_name, NULL); if (!strEqual(chunk_name, "CAVE")) @@ -3036,14 +3374,17 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, level->no_valid_file = TRUE; Error(ERR_WARN, "unknown format of level file '%s'", filename); - fclose(file); + + closeFile(file); + return; } } - else /* check for pre-2.0 file format with cookie string */ + else // check for pre-2.0 file format with cookie string { strcpy(cookie, chunk_name); - fgets(&cookie[4], MAX_LINE_LEN - 4, file); + if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL) + cookie[4] = '\0'; if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; @@ -3052,7 +3393,9 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, level->no_valid_file = TRUE; Error(ERR_WARN, "unknown format of level file '%s'", filename); - fclose(file); + + closeFile(file); + return; } @@ -3061,17 +3404,19 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, level->no_valid_file = TRUE; Error(ERR_WARN, "unsupported version of level file '%s'", filename); - fclose(file); + + closeFile(file); + return; } - /* pre-2.0 level files have no game version, so use file version here */ + // pre-2.0 level files have no game version, so use file version here level->game_version = level->file_version; } if (level->file_version < FILE_VERSION_1_2) { - /* level files from versions before 1.2.0 without chunk structure */ + // level files from versions before 1.2.0 without chunk structure LoadLevel_HEAD(file, LEVEL_CHUNK_HEAD_SIZE, level); LoadLevel_BODY(file, level->fieldx * level->fieldy, level); } @@ -3081,7 +3426,7 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, { char *name; int size; - int (*loader)(FILE *, int, struct LevelInfo *); + int (*loader)(File *, int, struct LevelInfo *); } chunk_info[] = { @@ -3132,13 +3477,13 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, } else { - /* call function to load this level chunk */ + // call function to load this level chunk int chunk_size_expected = (chunk_info[i].loader)(file, chunk_size, level); - /* the size of some chunks cannot be checked before reading other - chunks first (like "HEAD" and "BODY") that contain some header - information, so check them here */ + // the size of some chunks cannot be checked before reading other + // chunks first (like "HEAD" and "BODY") that contain some header + // information, so check them here if (chunk_size_expected != chunk_size) { Error(ERR_WARN, "wrong size (%d) of chunk '%s' in level file '%s'", @@ -3148,438 +3493,17 @@ static void LoadLevelFromFileInfo_RND(struct LevelInfo *level, } } - fclose(file); + closeFile(file); } -/* ------------------------------------------------------------------------- */ -/* functions for loading EM level */ -/* ------------------------------------------------------------------------- */ -#if 0 +// ---------------------------------------------------------------------------- +// functions for loading EM level +// ---------------------------------------------------------------------------- -static int map_em_element_yam(int element) +static void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) { - switch (element) - { - case 0x00: return EL_EMPTY; - case 0x01: return EL_EMERALD; - case 0x02: return EL_DIAMOND; - case 0x03: return EL_ROCK; - case 0x04: return EL_ROBOT; - case 0x05: return EL_SPACESHIP_UP; - case 0x06: return EL_BOMB; - case 0x07: return EL_BUG_UP; - case 0x08: return EL_AMOEBA_DROP; - case 0x09: return EL_NUT; - case 0x0a: return EL_YAMYAM; - case 0x0b: return EL_QUICKSAND_FULL; - case 0x0c: return EL_SAND; - case 0x0d: return EL_WALL_SLIPPERY; - case 0x0e: return EL_STEELWALL; - case 0x0f: return EL_WALL; - case 0x10: return EL_EM_KEY_1; - case 0x11: return EL_EM_KEY_2; - case 0x12: return EL_EM_KEY_4; - case 0x13: return EL_EM_KEY_3; - case 0x14: return EL_MAGIC_WALL; - case 0x15: return EL_ROBOT_WHEEL; - case 0x16: return EL_DYNAMITE; - - case 0x17: return EL_EM_KEY_1; /* EMC */ - case 0x18: return EL_BUG_UP; /* EMC */ - case 0x1a: return EL_DIAMOND; /* EMC */ - case 0x1b: return EL_EMERALD; /* EMC */ - case 0x25: return EL_NUT; /* EMC */ - case 0x80: return EL_EMPTY; /* EMC */ - case 0x85: return EL_EM_KEY_1; /* EMC */ - case 0x86: return EL_EM_KEY_2; /* EMC */ - case 0x87: return EL_EM_KEY_4; /* EMC */ - case 0x88: return EL_EM_KEY_3; /* EMC */ - case 0x94: return EL_QUICKSAND_EMPTY; /* EMC */ - case 0x9a: return EL_AMOEBA_WET; /* EMC */ - case 0xaf: return EL_DYNAMITE; /* EMC */ - case 0xbd: return EL_SAND; /* EMC */ - - default: - Error(ERR_WARN, "invalid level element %d", element); - return EL_UNKNOWN; - } -} - -static int map_em_element_field(int element) -{ - if (element >= 0xc8 && element <= 0xe1) - return EL_CHAR_A + (element - 0xc8); - else if (element >= 0xe2 && element <= 0xeb) - return EL_CHAR_0 + (element - 0xe2); - - switch (element) - { - case 0x00: return EL_ROCK; - case 0x01: return EL_ROCK; /* EMC */ - case 0x02: return EL_DIAMOND; - case 0x03: return EL_DIAMOND; - case 0x04: return EL_ROBOT; - case 0x05: return EL_ROBOT; /* EMC */ - case 0x06: return EL_EMPTY_SPACE; /* EMC */ - case 0x07: return EL_EMPTY_SPACE; /* EMC */ - case 0x08: return EL_SPACESHIP_UP; - case 0x09: return EL_SPACESHIP_RIGHT; - case 0x0a: return EL_SPACESHIP_DOWN; - case 0x0b: return EL_SPACESHIP_LEFT; - case 0x0c: return EL_SPACESHIP_UP; - case 0x0d: return EL_SPACESHIP_RIGHT; - case 0x0e: return EL_SPACESHIP_DOWN; - case 0x0f: return EL_SPACESHIP_LEFT; - - case 0x10: return EL_BOMB; - case 0x11: return EL_BOMB; /* EMC */ - case 0x12: return EL_EMERALD; - case 0x13: return EL_EMERALD; - case 0x14: return EL_BUG_UP; - case 0x15: return EL_BUG_RIGHT; - case 0x16: return EL_BUG_DOWN; - case 0x17: return EL_BUG_LEFT; - case 0x18: return EL_BUG_UP; - case 0x19: return EL_BUG_RIGHT; - case 0x1a: return EL_BUG_DOWN; - case 0x1b: return EL_BUG_LEFT; - case 0x1c: return EL_AMOEBA_DROP; - case 0x1d: return EL_AMOEBA_DROP; /* EMC */ - case 0x1e: return EL_AMOEBA_DROP; /* EMC */ - case 0x1f: return EL_AMOEBA_DROP; /* EMC */ - - case 0x20: return EL_ROCK; - case 0x21: return EL_BOMB; /* EMC */ - case 0x22: return EL_DIAMOND; /* EMC */ - case 0x23: return EL_EMERALD; /* EMC */ - case 0x24: return EL_MAGIC_WALL; - case 0x25: return EL_NUT; - case 0x26: return EL_NUT; /* EMC */ - case 0x27: return EL_NUT; /* EMC */ - - /* looks like magic wheel, but is _always_ activated */ - case 0x28: return EL_ROBOT_WHEEL; /* EMC */ - - case 0x29: return EL_YAMYAM; /* up */ - case 0x2a: return EL_YAMYAM; /* down */ - case 0x2b: return EL_YAMYAM; /* left */ /* EMC */ - case 0x2c: return EL_YAMYAM; /* right */ /* EMC */ - case 0x2d: return EL_QUICKSAND_FULL; - case 0x2e: return EL_EMPTY_SPACE; /* EMC */ - case 0x2f: return EL_EMPTY_SPACE; /* EMC */ - - case 0x30: return EL_EMPTY_SPACE; /* EMC */ - case 0x31: return EL_SAND; /* EMC */ - case 0x32: return EL_SAND; /* EMC */ - case 0x33: return EL_SAND; /* EMC */ - case 0x34: return EL_QUICKSAND_FULL; /* EMC */ - case 0x35: return EL_QUICKSAND_FULL; /* EMC */ - case 0x36: return EL_QUICKSAND_FULL; /* EMC */ - case 0x37: return EL_SAND; /* EMC */ - case 0x38: return EL_ROCK; /* EMC */ - case 0x39: return EL_EXPANDABLE_WALL_HORIZONTAL; /* EMC */ - case 0x3a: return EL_EXPANDABLE_WALL_VERTICAL; /* EMC */ - case 0x3b: return EL_DYNAMITE_ACTIVE; /* 1 */ - case 0x3c: return EL_DYNAMITE_ACTIVE; /* 2 */ - case 0x3d: return EL_DYNAMITE_ACTIVE; /* 3 */ - case 0x3e: return EL_DYNAMITE_ACTIVE; /* 4 */ - case 0x3f: return EL_ACID_POOL_BOTTOM; - - case 0x40: return EL_EXIT_OPEN; /* 1 */ - case 0x41: return EL_EXIT_OPEN; /* 2 */ - case 0x42: return EL_EXIT_OPEN; /* 3 */ - case 0x43: return EL_BALLOON; /* EMC */ - case 0x44: return EL_UNKNOWN; /* EMC ("plant") */ - case 0x45: return EL_SPRING; /* EMC */ - case 0x46: return EL_SPRING; /* falling */ /* EMC */ - case 0x47: return EL_SPRING; /* left */ /* EMC */ - case 0x48: return EL_SPRING; /* right */ /* EMC */ - case 0x49: return EL_UNKNOWN; /* EMC ("ball 1") */ - case 0x4a: return EL_UNKNOWN; /* EMC ("ball 2") */ - case 0x4b: return EL_UNKNOWN; /* EMC ("android") */ - case 0x4c: return EL_EMPTY_SPACE; /* EMC */ - case 0x4d: return EL_UNKNOWN; /* EMC ("android") */ - case 0x4e: return EL_INVISIBLE_WALL; /* EMC (? "android") */ - case 0x4f: return EL_UNKNOWN; /* EMC ("android") */ - - case 0x50: return EL_UNKNOWN; /* EMC ("android") */ - case 0x51: return EL_UNKNOWN; /* EMC ("android") */ - case 0x52: return EL_UNKNOWN; /* EMC ("android") */ - case 0x53: return EL_UNKNOWN; /* EMC ("android") */ - case 0x54: return EL_UNKNOWN; /* EMC ("android") */ - case 0x55: return EL_EMPTY_SPACE; /* EMC */ - case 0x56: return EL_EMPTY_SPACE; /* EMC */ - case 0x57: return EL_EMPTY_SPACE; /* EMC */ - case 0x58: return EL_EMPTY_SPACE; /* EMC */ - case 0x59: return EL_EMPTY_SPACE; /* EMC */ - case 0x5a: return EL_EMPTY_SPACE; /* EMC */ - case 0x5b: return EL_EMPTY_SPACE; /* EMC */ - case 0x5c: return EL_EMPTY_SPACE; /* EMC */ - case 0x5d: return EL_EMPTY_SPACE; /* EMC */ - case 0x5e: return EL_EMPTY_SPACE; /* EMC */ - case 0x5f: return EL_EMPTY_SPACE; /* EMC */ - - case 0x60: return EL_EMPTY_SPACE; /* EMC */ - case 0x61: return EL_EMPTY_SPACE; /* EMC */ - case 0x62: return EL_EMPTY_SPACE; /* EMC */ - case 0x63: return EL_SPRING; /* left */ /* EMC */ - case 0x64: return EL_SPRING; /* right */ /* EMC */ - case 0x65: return EL_ACID; /* 1 */ /* EMC */ - case 0x66: return EL_ACID; /* 2 */ /* EMC */ - case 0x67: return EL_ACID; /* 3 */ /* EMC */ - case 0x68: return EL_ACID; /* 4 */ /* EMC */ - case 0x69: return EL_ACID; /* 5 */ /* EMC */ - case 0x6a: return EL_ACID; /* 6 */ /* EMC */ - case 0x6b: return EL_ACID; /* 7 */ /* EMC */ - case 0x6c: return EL_ACID; /* 8 */ /* EMC */ - case 0x6d: return EL_EMPTY_SPACE; /* EMC */ - case 0x6e: return EL_EMPTY_SPACE; /* EMC */ - case 0x6f: return EL_EMPTY_SPACE; /* EMC */ - - case 0x70: return EL_EMPTY_SPACE; /* EMC */ - case 0x71: return EL_EMPTY_SPACE; /* EMC */ - case 0x72: return EL_NUT; /* left */ /* EMC */ - case 0x73: return EL_SAND; /* EMC (? "nut") */ - case 0x74: return EL_STEELWALL; - case 0x75: return EL_EMPTY_SPACE; /* EMC */ - case 0x76: return EL_EMPTY_SPACE; /* EMC */ - case 0x77: return EL_BOMB; /* left */ /* EMC */ - case 0x78: return EL_BOMB; /* right */ /* EMC */ - case 0x79: return EL_ROCK; /* left */ /* EMC */ - case 0x7a: return EL_ROCK; /* right */ /* EMC */ - case 0x7b: return EL_ACID; /* (? EMC "blank") */ - case 0x7c: return EL_EMPTY_SPACE; /* EMC */ - case 0x7d: return EL_EMPTY_SPACE; /* EMC */ - case 0x7e: return EL_EMPTY_SPACE; /* EMC */ - case 0x7f: return EL_EMPTY_SPACE; /* EMC */ - - case 0x80: return EL_EMPTY; - case 0x81: return EL_WALL_SLIPPERY; - case 0x82: return EL_SAND; - case 0x83: return EL_STEELWALL; - case 0x84: return EL_WALL; - case 0x85: return EL_EM_KEY_1; - case 0x86: return EL_EM_KEY_2; - case 0x87: return EL_EM_KEY_4; - case 0x88: return EL_EM_KEY_3; - case 0x89: return EL_EM_GATE_1; - case 0x8a: return EL_EM_GATE_2; - case 0x8b: return EL_EM_GATE_4; - case 0x8c: return EL_EM_GATE_3; - case 0x8d: return EL_INVISIBLE_WALL; /* EMC (? "dripper") */ - case 0x8e: return EL_EM_GATE_1_GRAY; - case 0x8f: return EL_EM_GATE_2_GRAY; - - case 0x90: return EL_EM_GATE_4_GRAY; - case 0x91: return EL_EM_GATE_3_GRAY; - case 0x92: return EL_MAGIC_WALL; - case 0x93: return EL_ROBOT_WHEEL; - case 0x94: return EL_QUICKSAND_EMPTY; /* (? EMC "sand") */ - case 0x95: return EL_ACID_POOL_TOPLEFT; - case 0x96: return EL_ACID_POOL_TOPRIGHT; - case 0x97: return EL_ACID_POOL_BOTTOMLEFT; - case 0x98: return EL_ACID_POOL_BOTTOMRIGHT; - case 0x99: return EL_ACID; /* (? EMC "fake blank") */ - case 0x9a: return EL_AMOEBA_DEAD; /* 1 */ - case 0x9b: return EL_AMOEBA_DEAD; /* 2 */ - case 0x9c: return EL_AMOEBA_DEAD; /* 3 */ - case 0x9d: return EL_AMOEBA_DEAD; /* 4 */ - case 0x9e: return EL_EXIT_CLOSED; - case 0x9f: return EL_CHAR_LESS; /* arrow left */ - - /* looks like normal sand, but behaves like wall */ - case 0xa0: return EL_UNKNOWN; /* EMC ("fake grass") */ - case 0xa1: return EL_UNKNOWN; /* EMC ("lenses") */ - case 0xa2: return EL_UNKNOWN; /* EMC ("magnify") */ - case 0xa3: return EL_UNKNOWN; /* EMC ("fake blank") */ - case 0xa4: return EL_UNKNOWN; /* EMC ("fake grass") */ - case 0xa5: return EL_UNKNOWN; /* EMC ("switch") */ - case 0xa6: return EL_UNKNOWN; /* EMC ("switch") */ - case 0xa7: return EL_EMPTY_SPACE; /* EMC */ - case 0xa8: return EL_EMC_WALL_1; /* EMC ("decor 8") */ - case 0xa9: return EL_EMC_WALL_2; /* EMC ("decor 9") */ - case 0xaa: return EL_EMC_WALL_3; /* EMC ("decor 10") */ - case 0xab: return EL_EMC_WALL_7; /* EMC ("decor 5") */ - case 0xac: return EL_CHAR_COMMA; /* EMC */ - case 0xad: return EL_CHAR_QUOTEDBL; /* EMC */ - case 0xae: return EL_CHAR_MINUS; /* EMC */ - case 0xaf: return EL_DYNAMITE; - - case 0xb0: return EL_EMC_STEELWALL_1; /* EMC ("steel 3") */ - case 0xb1: return EL_EMC_WALL_8; /* EMC ("decor 6") */ - case 0xb2: return EL_UNKNOWN; /* EMC ("decor 7") */ - case 0xb3: return EL_STEELWALL; /* 2 */ /* EMC */ - case 0xb4: return EL_WALL_SLIPPERY; /* 2 */ /* EMC */ - case 0xb5: return EL_EMC_WALL_6; /* EMC ("decor 2") */ - case 0xb6: return EL_EMC_WALL_5; /* EMC ("decor 4") */ - case 0xb7: return EL_EMC_WALL_4; /* EMC ("decor 3") */ - case 0xb8: return EL_BALLOON_SWITCH_ANY; /* EMC */ - case 0xb9: return EL_BALLOON_SWITCH_RIGHT; /* EMC */ - case 0xba: return EL_BALLOON_SWITCH_DOWN; /* EMC */ - case 0xbb: return EL_BALLOON_SWITCH_LEFT; /* EMC */ - case 0xbc: return EL_BALLOON_SWITCH_UP; /* EMC */ - case 0xbd: return EL_SAND; /* EMC ("dirt") */ - case 0xbe: return EL_UNKNOWN; /* EMC ("plant") */ - case 0xbf: return EL_UNKNOWN; /* EMC ("key 5") */ - - case 0xc0: return EL_UNKNOWN; /* EMC ("key 6") */ - case 0xc1: return EL_UNKNOWN; /* EMC ("key 7") */ - case 0xc2: return EL_UNKNOWN; /* EMC ("key 8") */ - case 0xc3: return EL_UNKNOWN; /* EMC ("door 5") */ - case 0xc4: return EL_UNKNOWN; /* EMC ("door 6") */ - case 0xc5: return EL_UNKNOWN; /* EMC ("door 7") */ - case 0xc6: return EL_UNKNOWN; /* EMC ("door 8") */ - case 0xc7: return EL_UNKNOWN; /* EMC ("bumper") */ - - /* characters: see above */ - - case 0xec: return EL_CHAR_PERIOD; - case 0xed: return EL_CHAR_EXCLAM; - case 0xee: return EL_CHAR_COLON; - case 0xef: return EL_CHAR_QUESTION; - - case 0xf0: return EL_CHAR_GREATER; /* arrow right */ - case 0xf1: return EL_CHAR_COPYRIGHT; /* EMC: "decor 1" */ - case 0xf2: return EL_UNKNOWN; /* EMC ("fake door 5") */ - case 0xf3: return EL_UNKNOWN; /* EMC ("fake door 6") */ - case 0xf4: return EL_UNKNOWN; /* EMC ("fake door 7") */ - case 0xf5: return EL_UNKNOWN; /* EMC ("fake door 8") */ - case 0xf6: return EL_EMPTY_SPACE; /* EMC */ - case 0xf7: return EL_EMPTY_SPACE; /* EMC */ - - case 0xf8: return EL_EMPTY_SPACE; /* EMC */ - case 0xf9: return EL_EMPTY_SPACE; /* EMC */ - case 0xfa: return EL_EMPTY_SPACE; /* EMC */ - case 0xfb: return EL_EMPTY_SPACE; /* EMC */ - case 0xfc: return EL_EMPTY_SPACE; /* EMC */ - case 0xfd: return EL_EMPTY_SPACE; /* EMC */ - - case 0xfe: return EL_PLAYER_1; /* EMC: "blank" */ - case 0xff: return EL_PLAYER_2; /* EMC: "blank" */ - - default: - /* should never happen (all 8-bit value cases should be handled) */ - Error(ERR_WARN, "invalid level element %d", element); - return EL_UNKNOWN; - } -} - -#define EM_LEVEL_SIZE 2106 -#define EM_LEVEL_XSIZE 64 -#define EM_LEVEL_YSIZE 32 - -static void OLD_LoadLevelFromFileInfo_EM(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) -{ - char *filename = level_file_info->filename; - FILE *file; - unsigned char leveldata[EM_LEVEL_SIZE]; - unsigned char *header = &leveldata[EM_LEVEL_XSIZE * EM_LEVEL_YSIZE]; - int nr = level_file_info->nr; - 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; - } - - for (i = 0; i < EM_LEVEL_SIZE; i++) - leveldata[i] = fgetc(file); - - fclose(file); - - /* check if level data is crypted by testing against known starting bytes - of the few existing crypted level files (from Emerald Mine 1 + 2) */ - - if ((leveldata[0] == 0xf1 || - leveldata[0] == 0xf5) && leveldata[2] == 0xe7 && leveldata[3] == 0xee) - { - unsigned char code0 = 0x65; - unsigned char code1 = 0x11; - - if (leveldata[0] == 0xf5) /* error in crypted Emerald Mine 2 levels */ - leveldata[0] = 0xf1; - - /* decode crypted level data */ - - for (i = 0; i < EM_LEVEL_SIZE; i++) - { - leveldata[i] ^= code0; - leveldata[i] -= code1; - - code0 = (code0 + 7) & 0xff; - } - } - - level->fieldx = EM_LEVEL_XSIZE; - level->fieldy = EM_LEVEL_YSIZE; - - level->time = header[46] * 10; - level->gems_needed = header[47]; - - /* The original Emerald Mine levels have their level number stored - at the second byte of the level file... - Do not trust this information at other level files, e.g. EMC, - but correct it anyway (normally the first row is completely - steel wall, so the correction does not hurt anyway). */ - - if (leveldata[1] == nr) - leveldata[1] = leveldata[2]; /* correct level number field */ - - sprintf(level->name, "Level %d", nr); /* set level name */ - - level->score[SC_EMERALD] = header[36]; - level->score[SC_DIAMOND] = header[37]; - level->score[SC_ROBOT] = header[38]; - level->score[SC_SPACESHIP] = header[39]; - level->score[SC_BUG] = header[40]; - level->score[SC_YAMYAM] = header[41]; - level->score[SC_NUT] = header[42]; - level->score[SC_DYNAMITE] = header[43]; - level->score[SC_TIME_BONUS] = header[44]; - - level->num_yamyam_contents = 4; - - for (i = 0; i < level->num_yamyam_contents; i++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) - level->yamyam_content[i].e[x][y] = - map_em_element_yam(header[i * 9 + y * 3 + x]); - - level->amoeba_speed = (header[52] * 256 + header[53]) % 256; - level->time_magic_wall = (header[54] * 256 + header[55]) * 16 / 100; - level->time_wheel = (header[56] * 256 + header[57]) * 16 / 100; - level->amoeba_content = EL_DIAMOND; - - for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) - { - int new_element = map_em_element_field(leveldata[y * EM_LEVEL_XSIZE + x]); - - if (new_element == EL_AMOEBA_DEAD && level->amoeba_speed) - new_element = EL_AMOEBA_WET; - - level->field[x][y] = new_element; - } - - x = (header[48] * 256 + header[49]) % EM_LEVEL_XSIZE; - y = (header[48] * 256 + header[49]) / EM_LEVEL_XSIZE; - level->field[x][y] = EL_PLAYER_1; - - x = (header[50] * 256 + header[51]) % EM_LEVEL_XSIZE; - y = (header[50] * 256 + header[51]) / EM_LEVEL_XSIZE; - level->field[x][y] = EL_PLAYER_2; -} - -#endif - -void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) -{ - static int ball_xy[8][2] = + static int ball_xy[8][2] = { { 0, 0 }, { 1, 0 }, @@ -3649,7 +3573,7 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) map_android_clone_elements_RND_to_EM(level); - /* first fill the complete playfield with the default border element */ + // 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; @@ -3661,7 +3585,7 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_STEELWALL); } - /* then copy the real level contents from level file into the playfield */ + // 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]); @@ -3681,7 +3605,7 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) ply[i]->y_initial = 0; } - /* initialize player positions and delete players from the playfield */ + // initialize player positions and delete players from the playfield for (y = 0; y < lev->height; y++) for (x = 0; x < lev->width; x++) { if (ELEM_IS_PLAYER(level->field[x][y])) @@ -3705,7 +3629,7 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) } } -void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) +static void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) { static int ball_xy[8][2] = { @@ -3778,7 +3702,7 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) map_android_clone_elements_EM_to_RND(level); - /* convert the playfield (some elements need special treatment) */ + // convert the playfield (some elements need special treatment) for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) { int new_element = map_element_EM_to_RND(level_em->cave[x + 1][y + 1]); @@ -3791,7 +3715,7 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) for (i = 0; i < MAX_PLAYERS; i++) { - /* in case of all players set to the same field, use the first player */ + // in case of all players set to the same field, use the first player int nr = MAX_PLAYERS - i - 1; int jx = ply[nr]->x_initial - 1; int jy = ply[nr]->y_initial - 1; @@ -3802,110 +3726,160 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) } -/* ------------------------------------------------------------------------- */ -/* functions for loading SP level */ -/* ------------------------------------------------------------------------- */ - -#if 0 +// ---------------------------------------------------------------------------- +// functions for loading SP level +// ---------------------------------------------------------------------------- -#define NUM_SUPAPLEX_LEVELS_PER_PACKAGE 111 -#define SP_LEVEL_SIZE 1536 -#define SP_LEVEL_XSIZE 60 -#define SP_LEVEL_YSIZE 24 -#define SP_LEVEL_NAME_LEN 23 - -static void LoadLevelFromFileStream_SP(FILE *file, struct LevelInfo *level, - int nr) +static void CopyNativeLevel_RND_to_SP(struct LevelInfo *level) { - int initial_player_gravity; - int num_special_ports; + struct LevelInfo_SP *level_sp = level->native_sp_level; + LevelInfoType *header = &level_sp->header; int i, x, y; - /* for details of the Supaplex level format, see Herman Perk's Supaplex - documentation file "SPFIX63.DOC" from his Supaplex "SpeedFix" package */ + level_sp->width = level->fieldx; + level_sp->height = level->fieldy; + + for (x = 0; x < level->fieldx; x++) + for (y = 0; y < level->fieldy; y++) + level_sp->playfield[x][y] = map_element_RND_to_SP(level->field[x][y]); + + header->InitialGravity = (level->initial_player_gravity[0] ? 1 : 0); + + for (i = 0; i < SP_LEVEL_NAME_LEN; i++) + header->LevelTitle[i] = level->name[i]; + // !!! NO STRING TERMINATION IN SUPAPLEX VB CODE YET -- FIX THIS !!! + + header->InfotronsNeeded = level->gems_needed; - /* read level body (width * height == 60 * 24 tiles == 1440 bytes) */ - for (y = 0; y < SP_LEVEL_YSIZE; y++) + header->SpecialPortCount = 0; + + for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++) { - for (x = 0; x < SP_LEVEL_XSIZE; x++) + boolean gravity_port_found = FALSE; + boolean gravity_port_valid = FALSE; + int gravity_port_flag; + int gravity_port_base_element; + int element = level->field[x][y]; + + if (element >= EL_SP_GRAVITY_ON_PORT_RIGHT && + element <= EL_SP_GRAVITY_ON_PORT_UP) + { + gravity_port_found = TRUE; + gravity_port_valid = TRUE; + gravity_port_flag = 1; + gravity_port_base_element = EL_SP_GRAVITY_ON_PORT_RIGHT; + } + else if (element >= EL_SP_GRAVITY_OFF_PORT_RIGHT && + element <= EL_SP_GRAVITY_OFF_PORT_UP) + { + gravity_port_found = TRUE; + gravity_port_valid = TRUE; + gravity_port_flag = 0; + gravity_port_base_element = EL_SP_GRAVITY_OFF_PORT_RIGHT; + } + else if (element >= EL_SP_GRAVITY_PORT_RIGHT && + element <= EL_SP_GRAVITY_PORT_UP) { - int element_old = fgetc(file); - int element_new; + // change R'n'D style gravity inverting special port to normal port + // (there are no gravity inverting ports in native Supaplex engine) - if (element_old <= 0x27) - element_new = getMappedElement(EL_SP_START + element_old); - else if (element_old == 0x28) - element_new = EL_INVISIBLE_WALL; + gravity_port_found = TRUE; + gravity_port_valid = FALSE; + gravity_port_base_element = EL_SP_GRAVITY_PORT_RIGHT; + } + + if (gravity_port_found) + { + if (gravity_port_valid && + header->SpecialPortCount < SP_MAX_SPECIAL_PORTS) + { + SpecialPortType *port = &header->SpecialPort[header->SpecialPortCount]; + + port->PortLocation = (y * level->fieldx + x) * 2; + port->Gravity = gravity_port_flag; + + element += EL_SP_GRAVITY_PORT_RIGHT - gravity_port_base_element; + + header->SpecialPortCount++; + } else { - Error(ERR_WARN, "in level %d, at position %d, %d:", nr, x, y); - Error(ERR_WARN, "invalid level element %d", element_old); + // change special gravity port to normal port - element_new = EL_UNKNOWN; + element += EL_SP_PORT_RIGHT - gravity_port_base_element; } - level->field[x][y] = element_new; + level_sp->playfield[x][y] = element - EL_SP_START; } } +} - ReadUnusedBytesFromFile(file, 4); /* (not used by Supaplex engine) */ - - /* initial gravity: 1 == "on", anything else (0) == "off" */ - initial_player_gravity = (fgetc(file) == 1 ? TRUE : FALSE); - - for (i = 0; i < MAX_PLAYERS; i++) - level->initial_player_gravity[i] = initial_player_gravity; +static void CopyNativeLevel_SP_to_RND(struct LevelInfo *level) +{ + struct LevelInfo_SP *level_sp = level->native_sp_level; + LevelInfoType *header = &level_sp->header; + boolean num_invalid_elements = 0; + int i, j, x, y; - ReadUnusedBytesFromFile(file, 1); /* (not used by Supaplex engine) */ + level->fieldx = level_sp->width; + level->fieldy = level_sp->height; - /* level title in uppercase letters, padded with dashes ("-") (23 bytes) */ - for (i = 0; i < SP_LEVEL_NAME_LEN; i++) - level->name[i] = fgetc(file); - level->name[SP_LEVEL_NAME_LEN] = '\0'; + for (x = 0; x < level->fieldx; x++) + { + for (y = 0; y < level->fieldy; y++) + { + int element_old = level_sp->playfield[x][y]; + int element_new = getMappedElement(map_element_SP_to_RND(element_old)); - /* initial "freeze zonks": 2 == "on", anything else (0, 1) == "off" */ - ReadUnusedBytesFromFile(file, 1); /* (not used by R'n'D engine) */ + if (element_new == EL_UNKNOWN) + { + num_invalid_elements++; - /* number of infotrons needed; 0 means that Supaplex will count the total - amount of infotrons in the level and use the low byte of that number - (a multiple of 256 infotrons will result in "0 infotrons needed"!) */ - level->gems_needed = fgetc(file); + Error(ERR_DEBUG, "invalid element %d at position %d, %d", + element_old, x, y); + } - /* number of special ("gravity") port entries below (maximum 10 allowed) */ - num_special_ports = fgetc(file); + level->field[x][y] = element_new; + } + } - /* database of properties of up to 10 special ports (6 bytes per port) */ - for (i = 0; i < 10; i++) - { - int port_location, port_x, port_y, port_element; - int gravity; + if (num_invalid_elements > 0) + Error(ERR_WARN, "found %d invalid elements%s", num_invalid_elements, + (!options.debug ? " (use '--debug' for more details)" : "")); - /* high and low byte of the location of a special port; if (x, y) are the - coordinates of a port in the field and (0, 0) is the top-left corner, - the 16 bit value here calculates as 2 * (x + (y * 60)) (this is twice - of what may be expected: Supaplex works with a game field in memory - which is 2 bytes per tile) */ - port_location = getFile16BitBE(file); + for (i = 0; i < MAX_PLAYERS; i++) + level->initial_player_gravity[i] = + (header->InitialGravity == 1 ? TRUE : FALSE); - /* change gravity: 1 == "turn on", anything else (0) == "turn off" */ - gravity = fgetc(file); + // skip leading spaces + for (i = 0; i < SP_LEVEL_NAME_LEN; i++) + if (header->LevelTitle[i] != ' ') + break; - /* "freeze zonks": 2 == "turn on", anything else (0, 1) == "turn off" */ - ReadUnusedBytesFromFile(file, 1); /* (not used by R'n'D engine) */ + // copy level title + for (j = 0; i < SP_LEVEL_NAME_LEN; i++, j++) + level->name[j] = header->LevelTitle[i]; + level->name[j] = '\0'; - /* "freeze enemies": 1 == "turn on", anything else (0) == "turn off" */ - ReadUnusedBytesFromFile(file, 1); /* (not used by R'n'D engine) */ + // cut trailing spaces + for (; j > 0; j--) + if (level->name[j - 1] == ' ' && level->name[j] == '\0') + level->name[j - 1] = '\0'; - ReadUnusedBytesFromFile(file, 1); /* (not used by Supaplex engine) */ + level->gems_needed = header->InfotronsNeeded; - if (i >= num_special_ports) - continue; + for (i = 0; i < header->SpecialPortCount; i++) + { + SpecialPortType *port = &header->SpecialPort[i]; + int port_location = port->PortLocation; + int gravity = port->Gravity; + int port_x, port_y, port_element; - port_x = (port_location / 2) % SP_LEVEL_XSIZE; - port_y = (port_location / 2) / SP_LEVEL_XSIZE; + port_x = (port_location / 2) % level->fieldx; + port_y = (port_location / 2) / level->fieldx; - if (port_x < 0 || port_x >= SP_LEVEL_XSIZE || - port_y < 0 || port_y >= SP_LEVEL_YSIZE) + if (port_x < 0 || port_x >= level->fieldx || + port_y < 0 || port_y >= level->fieldy) { Error(ERR_WARN, "special port position (%d, %d) out of bounds", port_x, port_y); @@ -3923,388 +3897,221 @@ static void LoadLevelFromFileStream_SP(FILE *file, struct LevelInfo *level, continue; } - /* change previous (wrong) gravity inverting special port to either - gravity enabling special port or gravity disabling special port */ + // change previous (wrong) gravity inverting special port to either + // gravity enabling special port or gravity disabling special port level->field[port_x][port_y] += (gravity == 1 ? EL_SP_GRAVITY_ON_PORT_RIGHT : EL_SP_GRAVITY_OFF_PORT_RIGHT) - EL_SP_GRAVITY_PORT_RIGHT; } - ReadUnusedBytesFromFile(file, 4); /* (not used by Supaplex engine) */ - - /* change special gravity ports without database entries to normal ports */ - for (y = 0; y < SP_LEVEL_YSIZE; y++) - for (x = 0; x < SP_LEVEL_XSIZE; x++) + // change special gravity ports without database entries to normal ports + for (x = 0; x < level->fieldx; x++) + for (y = 0; y < level->fieldy; y++) if (level->field[x][y] >= EL_SP_GRAVITY_PORT_RIGHT && level->field[x][y] <= EL_SP_GRAVITY_PORT_UP) level->field[x][y] += EL_SP_PORT_RIGHT - EL_SP_GRAVITY_PORT_RIGHT; - /* auto-determine number of infotrons if it was stored as "0" -- see above */ - if (level->gems_needed == 0) - { - for (y = 0; y < SP_LEVEL_YSIZE; y++) - for (x = 0; x < SP_LEVEL_XSIZE; x++) - if (level->field[x][y] == EL_SP_INFOTRON) - level->gems_needed++; - - level->gems_needed &= 0xff; /* only use low byte -- see above */ - } - - level->fieldx = SP_LEVEL_XSIZE; - level->fieldy = SP_LEVEL_YSIZE; - - level->time = 0; /* no time limit */ + level->time = 0; // no time limit level->amoeba_speed = 0; level->time_magic_wall = 0; level->time_wheel = 0; level->amoeba_content = EL_EMPTY; #if 1 - /* original Supaplex does not use score values -- use default values */ + // original Supaplex does not use score values -- use default values #else for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++) level->score[i] = 0; #endif - /* there are no yamyams in supaplex levels */ + // there are no yamyams in supaplex levels for (i = 0; i < level->num_yamyam_contents; i++) - for (y = 0; y < 3; y++) - for (x = 0; x < 3; x++) + for (x = 0; x < 3; x++) + for (y = 0; y < 3; y++) level->yamyam_content[i].e[x][y] = EL_EMPTY; } -static void LoadLevelFromFileInfo_SP(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) +static void CopyNativeTape_RND_to_SP(struct LevelInfo *level) { - char *filename = level_file_info->filename; - FILE *file; - int nr = level_file_info->nr - leveldir_current->first_level; - int i, l, x, y; - char name_first, name_last; - struct LevelInfo multipart_level; - int multipart_xpos, multipart_ypos; - boolean is_multipart_level; - boolean is_first_part; - boolean reading_multipart_level = FALSE; - boolean use_empty_level = FALSE; - - if (!(file = fopen(filename, MODE_READ))) - { - level->no_valid_file = TRUE; + struct LevelInfo_SP *level_sp = level->native_sp_level; + struct DemoInfo_SP *demo = &level_sp->demo; + int i, j; - Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + // always start with reliable default values + demo->is_available = FALSE; + demo->length = 0; + if (TAPE_IS_EMPTY(tape)) return; - } - - /* position file stream to the requested level inside the level package */ - if (level_file_info->packed && - fseek(file, nr * SP_LEVEL_SIZE, SEEK_SET) != 0) - { - level->no_valid_file = TRUE; - Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename); + demo->level_nr = tape.level_nr; // (currently not used) - return; - } + level_sp->header.DemoRandomSeed = tape.random_seed; - /* there exist Supaplex level package files with multi-part levels which - can be detected as follows: instead of leading and trailing dashes ('-') - to pad the level name, they have leading and trailing numbers which are - the x and y coordinations of the current part of the multi-part level; - if there are '?' characters instead of numbers on the left or right side - of the level name, the multi-part level consists of only horizontal or - vertical parts */ + demo->length = 0; - for (l = nr; l < NUM_SUPAPLEX_LEVELS_PER_PACKAGE; l++) + for (i = 0; i < tape.length; i++) { - LoadLevelFromFileStream_SP(file, level, l); + int demo_action = map_key_RND_to_SP(tape.pos[i].action[0]); + int demo_repeat = tape.pos[i].delay; + int demo_entries = (demo_repeat + 15) / 16; - /* check if this level is a part of a bigger multi-part level */ - - name_first = level->name[0]; - name_last = level->name[SP_LEVEL_NAME_LEN - 1]; - - is_multipart_level = - ((name_first == '?' || (name_first >= '0' && name_first <= '9')) && - (name_last == '?' || (name_last >= '0' && name_last <= '9'))); - - is_first_part = - ((name_first == '?' || name_first == '1') && - (name_last == '?' || name_last == '1')); - - /* correct leading multipart level meta information in level name */ - for (i = 0; i < SP_LEVEL_NAME_LEN && level->name[i] == name_first; i++) - 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--) - level->name[i] = '-'; - - /* ---------- check for normal single level ---------- */ - - if (!reading_multipart_level && !is_multipart_level) + if (demo->length + demo_entries >= SP_MAX_TAPE_LEN) { - /* the current level is simply a normal single-part level, and we are - not reading a multi-part level yet, so return the level as it is */ + Error(ERR_WARN, "tape truncated: size exceeds maximum SP demo size %d", + SP_MAX_TAPE_LEN); break; } - /* ---------- check for empty level (unused multi-part) ---------- */ + for (j = 0; j < demo_repeat / 16; j++) + demo->data[demo->length++] = 0xf0 | demo_action; - if (!reading_multipart_level && is_multipart_level && !is_first_part) - { - /* this is a part of a multi-part level, but not the first part - (and we are not already reading parts of a multi-part level); - in this case, use an empty level instead of the single part */ - - use_empty_level = TRUE; + if (demo_repeat % 16) + demo->data[demo->length++] = ((demo_repeat % 16 - 1) << 4) | demo_action; + } - break; - } + demo->is_available = TRUE; +} - /* ---------- check for finished multi-part level ---------- */ +static void setTapeInfoToDefaults(void); - if (reading_multipart_level && - (!is_multipart_level || - !strEqual(level->name, multipart_level.name))) - { - /* we are already reading parts of a multi-part level, but this level is - either not a multi-part level, or a part of a different multi-part - level; in both cases, the multi-part level seems to be complete */ +static void CopyNativeTape_SP_to_RND(struct LevelInfo *level) +{ + struct LevelInfo_SP *level_sp = level->native_sp_level; + struct DemoInfo_SP *demo = &level_sp->demo; + char *filename = level->file_info.filename; + int i; - break; - } + // always start with reliable default values + setTapeInfoToDefaults(); - /* ---------- here we have one part of a multi-part level ---------- */ + if (!demo->is_available) + return; - reading_multipart_level = TRUE; + tape.level_nr = demo->level_nr; // (currently not used) + tape.random_seed = level_sp->header.DemoRandomSeed; - if (is_first_part) /* start with first part of new multi-part level */ - { - /* copy level info structure from first part */ - multipart_level = *level; + TapeSetDateFromEpochSeconds(getFileTimestampEpochSeconds(filename)); - /* clear playfield of new multi-part level */ - for (y = 0; y < MAX_LEV_FIELDY; y++) - for (x = 0; x < MAX_LEV_FIELDX; x++) - multipart_level.field[x][y] = EL_EMPTY; - } - - if (name_first == '?') - name_first = '1'; - if (name_last == '?') - name_last = '1'; + tape.counter = 0; + tape.pos[tape.counter].delay = 0; - multipart_xpos = (int)(name_first - '0'); - multipart_ypos = (int)(name_last - '0'); + for (i = 0; i < demo->length; i++) + { + int demo_action = demo->data[i] & 0x0f; + int demo_repeat = (demo->data[i] & 0xf0) >> 4; + int tape_action = map_key_SP_to_RND(demo_action); + int tape_repeat = demo_repeat + 1; + byte action[MAX_PLAYERS] = { tape_action, 0, 0, 0 }; + boolean success = 0; + int j; -#if 0 - printf("----------> part (%d/%d) of multi-part level '%s'\n", - multipart_xpos, multipart_ypos, multipart_level.name); -#endif + for (j = 0; j < tape_repeat; j++) + success = TapeAddAction(action); - if (multipart_xpos * SP_LEVEL_XSIZE > MAX_LEV_FIELDX || - multipart_ypos * SP_LEVEL_YSIZE > MAX_LEV_FIELDY) + if (!success) { - Error(ERR_WARN, "multi-part level is too big -- ignoring part of it"); + Error(ERR_WARN, "SP demo truncated: size exceeds maximum tape size %d", + MAX_TAPE_LEN); break; } - - multipart_level.fieldx = MAX(multipart_level.fieldx, - multipart_xpos * SP_LEVEL_XSIZE); - multipart_level.fieldy = MAX(multipart_level.fieldy, - multipart_ypos * SP_LEVEL_YSIZE); - - /* copy level part at the right position of multi-part level */ - for (y = 0; y < SP_LEVEL_YSIZE; y++) - { - for (x = 0; x < SP_LEVEL_XSIZE; x++) - { - int start_x = (multipart_xpos - 1) * SP_LEVEL_XSIZE; - int start_y = (multipart_ypos - 1) * SP_LEVEL_YSIZE; - - multipart_level.field[start_x + x][start_y + y] = level->field[x][y]; - } - } } - fclose(file); + TapeHaltRecording(); +} - if (use_empty_level) - { - setLevelInfoToDefaults(level); - level->fieldx = SP_LEVEL_XSIZE; - level->fieldy = SP_LEVEL_YSIZE; +// ---------------------------------------------------------------------------- +// functions for loading MM level +// ---------------------------------------------------------------------------- - for (y = 0; y < SP_LEVEL_YSIZE; y++) - for (x = 0; x < SP_LEVEL_XSIZE; x++) - level->field[x][y] = EL_EMPTY; +static void CopyNativeLevel_RND_to_MM(struct LevelInfo *level) +{ + struct LevelInfo_MM *level_mm = level->native_mm_level; + int x, y; - strcpy(level->name, "-------- EMPTY --------"); + level_mm->fieldx = MIN(level->fieldx, MM_MAX_PLAYFIELD_WIDTH); + level_mm->fieldy = MIN(level->fieldy, MM_MAX_PLAYFIELD_HEIGHT); - Error(ERR_WARN, "single part of multi-part level -- using empty level"); - } + level_mm->time = level->time; + level_mm->kettles_needed = level->gems_needed; + level_mm->auto_count_kettles = level->auto_count_gems; - if (reading_multipart_level) - *level = multipart_level; -} + level_mm->laser_red = level->mm_laser_red; + level_mm->laser_green = level->mm_laser_green; + level_mm->laser_blue = level->mm_laser_blue; -#endif + strcpy(level_mm->name, level->name); + strcpy(level_mm->author, level->author); -void CopyNativeLevel_RND_to_SP(struct LevelInfo *level) -{ - LevelInfoType *header = &native_sp_level.header; - int i, x, y; + level_mm->score[SC_EMERALD] = level->score[SC_EMERALD]; + level_mm->score[SC_PACMAN] = level->score[SC_PACMAN]; + level_mm->score[SC_KEY] = level->score[SC_KEY]; + level_mm->score[SC_TIME_BONUS] = level->score[SC_TIME_BONUS]; + level_mm->score[SC_ELEM_BONUS] = level->score[SC_ELEM_BONUS]; - native_sp_level.width = level->fieldx; - native_sp_level.height = level->fieldy; + level_mm->amoeba_speed = level->amoeba_speed; + level_mm->time_fuse = level->mm_time_fuse; + level_mm->time_bomb = level->mm_time_bomb; + level_mm->time_ball = level->mm_time_ball; + level_mm->time_block = level->mm_time_block; for (x = 0; x < level->fieldx; x++) - { for (y = 0; y < level->fieldy; y++) - { - int element_old = level->field[x][y]; - int element_new; - - if (element_old >= EL_SP_START && - element_old <= EL_SP_END) - element_new = element_old - EL_SP_START; - else if (element_old == EL_INVISIBLE_WALL) - element_new = 0x28; - else - element_new = EL_SP_HARDWARE_YELLOW; /* unknown to Supaplex engine */ - - native_sp_level.playfield[x][y] = element_new; - } - } - - header->InitialGravity = (level->initial_player_gravity[0] ? 1 : 0); - - for (i = 0; i < SP_LEVEL_NAME_LEN; i++) - header->LevelTitle[i] = level->name[i]; - /* !!! NO STRING TERMINATION IN SUPAPLEX VB CODE YET -- FIX THIS !!! */ - - header->InfotronsNeeded = level->gems_needed; - - /* !!! ADD SPECIAL PORT DATABASE STUFF !!! */ + Ur[x][y] = + level_mm->field[x][y] = map_element_RND_to_MM(level->field[x][y]); } -void CopyNativeLevel_SP_to_RND(struct LevelInfo *level) +static void CopyNativeLevel_MM_to_RND(struct LevelInfo *level) { - LevelInfoType *header = &native_sp_level.header; - int i, x, y; - - level->fieldx = native_sp_level.width; - level->fieldy = native_sp_level.height; - - for (x = 0; x < level->fieldx; x++) - { - for (y = 0; y < level->fieldy; y++) - { - int element_old = native_sp_level.playfield[x][y]; - int element_new; - - if (element_old <= 0x27) - element_new = getMappedElement(EL_SP_START + element_old); - else if (element_old == 0x28) - element_new = EL_INVISIBLE_WALL; - else - { - Error(ERR_WARN, "invalid element %d at position %d, %d", - element_old, x, y); - - element_new = EL_UNKNOWN; - } - - level->field[x][y] = element_new; - } - } - - for (i = 0; i < MAX_PLAYERS; i++) - level->initial_player_gravity[i] = - (header->InitialGravity == 1 ? TRUE : FALSE); - - for (i = 0; i < SP_LEVEL_NAME_LEN; i++) - level->name[i] = header->LevelTitle[i]; - level->name[SP_LEVEL_NAME_LEN] = '\0'; + struct LevelInfo_MM *level_mm = level->native_mm_level; + int x, y; - level->gems_needed = header->InfotronsNeeded; + level->fieldx = MIN(level_mm->fieldx, MAX_LEV_FIELDX); + level->fieldy = MIN(level_mm->fieldy, MAX_LEV_FIELDY); - for (i = 0; i < header->SpecialPortCount; i++) - { - SpecialPortType *port = &header->SpecialPort[i]; - int port_location = port->PortLocation; - int gravity = port->Gravity; - int port_x, port_y, port_element; + level->time = level_mm->time; + level->gems_needed = level_mm->kettles_needed; + level->auto_count_gems = level_mm->auto_count_kettles; - port_x = (port_location / 2) % level->fieldx; - port_y = (port_location / 2) / level->fieldx; + level->mm_laser_red = level_mm->laser_red; + level->mm_laser_green = level_mm->laser_green; + level->mm_laser_blue = level_mm->laser_blue; - if (port_x < 0 || port_x >= level->fieldx || - port_y < 0 || port_y >= level->fieldy) - { - Error(ERR_WARN, "special port position (%d, %d) out of bounds", - port_x, port_y); + strcpy(level->name, level_mm->name); - continue; - } + // only overwrite author from 'levelinfo.conf' if author defined in level + if (!strEqual(level_mm->author, ANONYMOUS_NAME)) + strcpy(level->author, level_mm->author); - port_element = level->field[port_x][port_y]; + level->score[SC_EMERALD] = level_mm->score[SC_EMERALD]; + level->score[SC_PACMAN] = level_mm->score[SC_PACMAN]; + level->score[SC_KEY] = level_mm->score[SC_KEY]; + level->score[SC_TIME_BONUS] = level_mm->score[SC_TIME_BONUS]; + level->score[SC_ELEM_BONUS] = level_mm->score[SC_ELEM_BONUS]; - if (port_element < EL_SP_GRAVITY_PORT_RIGHT || - port_element > EL_SP_GRAVITY_PORT_UP) - { - Error(ERR_WARN, "no special port at position (%d, %d)", port_x, port_y); - - continue; - } + level->amoeba_speed = level_mm->amoeba_speed; + level->mm_time_fuse = level_mm->time_fuse; + level->mm_time_bomb = level_mm->time_bomb; + level->mm_time_ball = level_mm->time_ball; + level->mm_time_block = level_mm->time_block; - /* change previous (wrong) gravity inverting special port to either - gravity enabling special port or gravity disabling special port */ - level->field[port_x][port_y] += - (gravity == 1 ? EL_SP_GRAVITY_ON_PORT_RIGHT : - EL_SP_GRAVITY_OFF_PORT_RIGHT) - EL_SP_GRAVITY_PORT_RIGHT; - } - - /* change special gravity ports without database entries to normal ports */ for (x = 0; x < level->fieldx; x++) for (y = 0; y < level->fieldy; y++) - if (level->field[x][y] >= EL_SP_GRAVITY_PORT_RIGHT && - level->field[x][y] <= EL_SP_GRAVITY_PORT_UP) - level->field[x][y] += EL_SP_PORT_RIGHT - EL_SP_GRAVITY_PORT_RIGHT; - - level->time = 0; /* no time limit */ - level->amoeba_speed = 0; - level->time_magic_wall = 0; - level->time_wheel = 0; - level->amoeba_content = EL_EMPTY; - -#if 1 - /* original Supaplex does not use score values -- use default values */ -#else - for (i = 0; i < LEVEL_SCORE_ELEMENTS; i++) - level->score[i] = 0; -#endif - - /* there are no yamyams in supaplex levels */ - for (i = 0; i < level->num_yamyam_contents; i++) - for (x = 0; x < 3; x++) - for (y = 0; y < 3; y++) - level->yamyam_content[i].e[x][y] = EL_EMPTY; + level->field[x][y] = map_element_MM_to_RND(level_mm->field[x][y]); } -/* ------------------------------------------------------------------------- */ -/* functions for loading DC level */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// functions for loading DC level +// ---------------------------------------------------------------------------- #define DC_LEVEL_HEADER_SIZE 344 -unsigned short getDecodedWord_DC(unsigned short data_encoded, boolean init) +static unsigned short getDecodedWord_DC(unsigned short data_encoded, + boolean init) { static int last_data_encoded; static int offset1; @@ -4343,7 +4150,7 @@ unsigned short getDecodedWord_DC(unsigned short data_encoded, boolean init) return data_decoded; } -int getMappedElement_DC(int element) +static int getMappedElement_DC(int element) { switch (element) { @@ -4351,11 +4158,11 @@ int getMappedElement_DC(int element) element = EL_ROCK; break; - /* 0x0117 - 0x036e: (?) */ - /* EL_DIAMOND */ + // 0x0117 - 0x036e: (?) + // EL_DIAMOND - /* 0x042d - 0x0684: (?) */ - /* EL_EMERALD */ + // 0x042d - 0x0684: (?) + // EL_EMERALD case 0x06f1: element = EL_NUT; @@ -4373,11 +4180,11 @@ int getMappedElement_DC(int element) element = EL_CRYSTAL; break; - case 0x0e77: /* quicksand (boulder) */ + case 0x0e77: // quicksand (boulder) element = EL_QUICKSAND_FAST_FULL; break; - case 0x0e99: /* slow quicksand (boulder) */ + case 0x0e99: // slow quicksand (boulder) element = EL_QUICKSAND_FULL; break; @@ -4397,19 +4204,19 @@ int getMappedElement_DC(int element) element = EL_EM_STEEL_EXIT_CLOSED; break; - case 0x0f4f: /* dynamite (lit 1) */ + case 0x0f4f: // dynamite (lit 1) element = EL_EM_DYNAMITE_ACTIVE; break; - case 0x0f57: /* dynamite (lit 2) */ + case 0x0f57: // dynamite (lit 2) element = EL_EM_DYNAMITE_ACTIVE; break; - case 0x0f5f: /* dynamite (lit 3) */ + case 0x0f5f: // dynamite (lit 3) element = EL_EM_DYNAMITE_ACTIVE; break; - case 0x0f67: /* dynamite (lit 4) */ + case 0x0f67: // dynamite (lit 4) element = EL_EM_DYNAMITE_ACTIVE; break; @@ -4500,15 +4307,15 @@ int getMappedElement_DC(int element) element = EL_TIMEGATE_CLOSED; break; - case 0x144c: /* conveyor belt switch (green) */ + case 0x144c: // conveyor belt switch (green) element = EL_CONVEYOR_BELT_3_SWITCH_MIDDLE; break; - case 0x144f: /* conveyor belt switch (red) */ + case 0x144f: // conveyor belt switch (red) element = EL_CONVEYOR_BELT_1_SWITCH_MIDDLE; break; - case 0x1452: /* conveyor belt switch (blue) */ + case 0x1452: // conveyor belt switch (blue) element = EL_CONVEYOR_BELT_4_SWITCH_MIDDLE; break; @@ -4560,15 +4367,15 @@ int getMappedElement_DC(int element) element = EL_EXPANDABLE_WALL_ANY; break; - case 0x14ce: /* growing steel wall (left/right) */ + case 0x14ce: // growing steel wall (left/right) element = EL_EXPANDABLE_STEELWALL_HORIZONTAL; break; - case 0x14df: /* growing steel wall (up/down) */ + case 0x14df: // growing steel wall (up/down) element = EL_EXPANDABLE_STEELWALL_VERTICAL; break; - case 0x14e8: /* growing steel wall (up/down/left/right) */ + case 0x14e8: // growing steel wall (up/down/left/right) element = EL_EXPANDABLE_STEELWALL_ANY; break; @@ -4588,41 +4395,41 @@ int getMappedElement_DC(int element) element = EL_EMPTY_SPACE; break; - case 0x1578: /* quicksand (empty) */ + case 0x1578: // quicksand (empty) element = EL_QUICKSAND_FAST_EMPTY; break; - case 0x1579: /* slow quicksand (empty) */ + case 0x1579: // slow quicksand (empty) element = EL_QUICKSAND_EMPTY; break; - /* 0x157c - 0x158b: */ - /* EL_SAND */ + // 0x157c - 0x158b: + // EL_SAND - /* 0x1590 - 0x159f: */ - /* EL_DC_LANDMINE */ + // 0x1590 - 0x159f: + // EL_DC_LANDMINE case 0x15a0: element = EL_EM_DYNAMITE; break; - case 0x15a1: /* key (red) */ + case 0x15a1: // key (red) element = EL_EM_KEY_1; break; - case 0x15a2: /* key (yellow) */ + case 0x15a2: // key (yellow) element = EL_EM_KEY_2; break; - case 0x15a3: /* key (blue) */ + case 0x15a3: // key (blue) element = EL_EM_KEY_4; break; - case 0x15a4: /* key (green) */ + case 0x15a4: // key (green) element = EL_EM_KEY_3; break; - case 0x15a5: /* key (white) */ + case 0x15a5: // key (white) element = EL_DC_KEY_WHITE; break; @@ -4634,915 +4441,915 @@ int getMappedElement_DC(int element) element = EL_WALL; break; - case 0x15a8: /* wall (not round) */ + case 0x15a8: // wall (not round) element = EL_WALL; break; - case 0x15a9: /* (blue) */ + case 0x15a9: // (blue) element = EL_CHAR_A; break; - case 0x15aa: /* (blue) */ + case 0x15aa: // (blue) element = EL_CHAR_B; break; - case 0x15ab: /* (blue) */ + case 0x15ab: // (blue) element = EL_CHAR_C; break; - case 0x15ac: /* (blue) */ + case 0x15ac: // (blue) element = EL_CHAR_D; break; - case 0x15ad: /* (blue) */ + case 0x15ad: // (blue) element = EL_CHAR_E; break; - case 0x15ae: /* (blue) */ + case 0x15ae: // (blue) element = EL_CHAR_F; break; - case 0x15af: /* (blue) */ + case 0x15af: // (blue) element = EL_CHAR_G; break; - case 0x15b0: /* (blue) */ + case 0x15b0: // (blue) element = EL_CHAR_H; break; - case 0x15b1: /* (blue) */ + case 0x15b1: // (blue) element = EL_CHAR_I; break; - case 0x15b2: /* (blue) */ + case 0x15b2: // (blue) element = EL_CHAR_J; break; - case 0x15b3: /* (blue) */ + case 0x15b3: // (blue) element = EL_CHAR_K; break; - case 0x15b4: /* (blue) */ + case 0x15b4: // (blue) element = EL_CHAR_L; break; - case 0x15b5: /* (blue) */ + case 0x15b5: // (blue) element = EL_CHAR_M; break; - case 0x15b6: /* (blue) */ + case 0x15b6: // (blue) element = EL_CHAR_N; break; - case 0x15b7: /* (blue) */ + case 0x15b7: // (blue) element = EL_CHAR_O; break; - case 0x15b8: /* (blue) */ + case 0x15b8: // (blue) element = EL_CHAR_P; break; - case 0x15b9: /* (blue) */ + case 0x15b9: // (blue) element = EL_CHAR_Q; break; - case 0x15ba: /* (blue) */ + case 0x15ba: // (blue) element = EL_CHAR_R; break; - case 0x15bb: /* (blue) */ + case 0x15bb: // (blue) element = EL_CHAR_S; break; - case 0x15bc: /* (blue) */ + case 0x15bc: // (blue) element = EL_CHAR_T; break; - case 0x15bd: /* (blue) */ + case 0x15bd: // (blue) element = EL_CHAR_U; break; - case 0x15be: /* (blue) */ + case 0x15be: // (blue) element = EL_CHAR_V; break; - case 0x15bf: /* (blue) */ + case 0x15bf: // (blue) element = EL_CHAR_W; break; - case 0x15c0: /* (blue) */ + case 0x15c0: // (blue) element = EL_CHAR_X; break; - case 0x15c1: /* (blue) */ + case 0x15c1: // (blue) element = EL_CHAR_Y; break; - case 0x15c2: /* (blue) */ + case 0x15c2: // (blue) element = EL_CHAR_Z; break; - case 0x15c3: /* (blue) */ + case 0x15c3: // (blue) element = EL_CHAR_AUMLAUT; break; - case 0x15c4: /* (blue) */ + case 0x15c4: // (blue) element = EL_CHAR_OUMLAUT; break; - case 0x15c5: /* (blue) */ + case 0x15c5: // (blue) element = EL_CHAR_UUMLAUT; break; - case 0x15c6: /* (blue) */ + case 0x15c6: // (blue) element = EL_CHAR_0; break; - case 0x15c7: /* (blue) */ + case 0x15c7: // (blue) element = EL_CHAR_1; break; - case 0x15c8: /* (blue) */ + case 0x15c8: // (blue) element = EL_CHAR_2; break; - case 0x15c9: /* (blue) */ + case 0x15c9: // (blue) element = EL_CHAR_3; break; - case 0x15ca: /* (blue) */ + case 0x15ca: // (blue) element = EL_CHAR_4; break; - case 0x15cb: /* (blue) */ + case 0x15cb: // (blue) element = EL_CHAR_5; break; - case 0x15cc: /* (blue) */ + case 0x15cc: // (blue) element = EL_CHAR_6; break; - case 0x15cd: /* (blue) */ + case 0x15cd: // (blue) element = EL_CHAR_7; break; - case 0x15ce: /* (blue) */ + case 0x15ce: // (blue) element = EL_CHAR_8; break; - case 0x15cf: /* (blue) */ + case 0x15cf: // (blue) element = EL_CHAR_9; break; - case 0x15d0: /* (blue) */ + case 0x15d0: // (blue) element = EL_CHAR_PERIOD; break; - case 0x15d1: /* (blue) */ + case 0x15d1: // (blue) element = EL_CHAR_EXCLAM; break; - case 0x15d2: /* (blue) */ + case 0x15d2: // (blue) element = EL_CHAR_COLON; break; - case 0x15d3: /* (blue) */ + case 0x15d3: // (blue) element = EL_CHAR_LESS; break; - case 0x15d4: /* (blue) */ + case 0x15d4: // (blue) element = EL_CHAR_GREATER; break; - case 0x15d5: /* (blue) */ + case 0x15d5: // (blue) element = EL_CHAR_QUESTION; break; - case 0x15d6: /* (blue) */ + case 0x15d6: // (blue) element = EL_CHAR_COPYRIGHT; break; - case 0x15d7: /* (blue) */ + case 0x15d7: // (blue) element = EL_CHAR_UP; break; - case 0x15d8: /* (blue) */ + case 0x15d8: // (blue) element = EL_CHAR_DOWN; break; - case 0x15d9: /* (blue) */ + case 0x15d9: // (blue) element = EL_CHAR_BUTTON; break; - case 0x15da: /* (blue) */ + case 0x15da: // (blue) element = EL_CHAR_PLUS; break; - case 0x15db: /* (blue) */ + case 0x15db: // (blue) element = EL_CHAR_MINUS; break; - case 0x15dc: /* (blue) */ + case 0x15dc: // (blue) element = EL_CHAR_APOSTROPHE; break; - case 0x15dd: /* (blue) */ + case 0x15dd: // (blue) element = EL_CHAR_PARENLEFT; break; - case 0x15de: /* (blue) */ + case 0x15de: // (blue) element = EL_CHAR_PARENRIGHT; break; - case 0x15df: /* (green) */ + case 0x15df: // (green) element = EL_CHAR_A; break; - case 0x15e0: /* (green) */ + case 0x15e0: // (green) element = EL_CHAR_B; break; - case 0x15e1: /* (green) */ + case 0x15e1: // (green) element = EL_CHAR_C; break; - case 0x15e2: /* (green) */ + case 0x15e2: // (green) element = EL_CHAR_D; break; - case 0x15e3: /* (green) */ + case 0x15e3: // (green) element = EL_CHAR_E; break; - case 0x15e4: /* (green) */ + case 0x15e4: // (green) element = EL_CHAR_F; break; - case 0x15e5: /* (green) */ + case 0x15e5: // (green) element = EL_CHAR_G; break; - case 0x15e6: /* (green) */ + case 0x15e6: // (green) element = EL_CHAR_H; break; - case 0x15e7: /* (green) */ + case 0x15e7: // (green) element = EL_CHAR_I; break; - case 0x15e8: /* (green) */ + case 0x15e8: // (green) element = EL_CHAR_J; break; - case 0x15e9: /* (green) */ + case 0x15e9: // (green) element = EL_CHAR_K; break; - case 0x15ea: /* (green) */ + case 0x15ea: // (green) element = EL_CHAR_L; break; - case 0x15eb: /* (green) */ + case 0x15eb: // (green) element = EL_CHAR_M; break; - case 0x15ec: /* (green) */ + case 0x15ec: // (green) element = EL_CHAR_N; break; - case 0x15ed: /* (green) */ + case 0x15ed: // (green) element = EL_CHAR_O; break; - case 0x15ee: /* (green) */ + case 0x15ee: // (green) element = EL_CHAR_P; break; - case 0x15ef: /* (green) */ + case 0x15ef: // (green) element = EL_CHAR_Q; break; - case 0x15f0: /* (green) */ + case 0x15f0: // (green) element = EL_CHAR_R; break; - case 0x15f1: /* (green) */ + case 0x15f1: // (green) element = EL_CHAR_S; break; - case 0x15f2: /* (green) */ + case 0x15f2: // (green) element = EL_CHAR_T; break; - case 0x15f3: /* (green) */ + case 0x15f3: // (green) element = EL_CHAR_U; break; - case 0x15f4: /* (green) */ + case 0x15f4: // (green) element = EL_CHAR_V; break; - case 0x15f5: /* (green) */ + case 0x15f5: // (green) element = EL_CHAR_W; break; - case 0x15f6: /* (green) */ + case 0x15f6: // (green) element = EL_CHAR_X; break; - case 0x15f7: /* (green) */ + case 0x15f7: // (green) element = EL_CHAR_Y; break; - case 0x15f8: /* (green) */ + case 0x15f8: // (green) element = EL_CHAR_Z; break; - case 0x15f9: /* (green) */ + case 0x15f9: // (green) element = EL_CHAR_AUMLAUT; break; - case 0x15fa: /* (green) */ + case 0x15fa: // (green) element = EL_CHAR_OUMLAUT; break; - case 0x15fb: /* (green) */ + case 0x15fb: // (green) element = EL_CHAR_UUMLAUT; break; - case 0x15fc: /* (green) */ + case 0x15fc: // (green) element = EL_CHAR_0; break; - case 0x15fd: /* (green) */ + case 0x15fd: // (green) element = EL_CHAR_1; break; - case 0x15fe: /* (green) */ + case 0x15fe: // (green) element = EL_CHAR_2; break; - case 0x15ff: /* (green) */ + case 0x15ff: // (green) element = EL_CHAR_3; break; - case 0x1600: /* (green) */ + case 0x1600: // (green) element = EL_CHAR_4; break; - case 0x1601: /* (green) */ + case 0x1601: // (green) element = EL_CHAR_5; break; - case 0x1602: /* (green) */ + case 0x1602: // (green) element = EL_CHAR_6; break; - case 0x1603: /* (green) */ + case 0x1603: // (green) element = EL_CHAR_7; break; - case 0x1604: /* (green) */ + case 0x1604: // (green) element = EL_CHAR_8; break; - case 0x1605: /* (green) */ + case 0x1605: // (green) element = EL_CHAR_9; break; - case 0x1606: /* (green) */ + case 0x1606: // (green) element = EL_CHAR_PERIOD; break; - case 0x1607: /* (green) */ + case 0x1607: // (green) element = EL_CHAR_EXCLAM; break; - case 0x1608: /* (green) */ + case 0x1608: // (green) element = EL_CHAR_COLON; break; - case 0x1609: /* (green) */ + case 0x1609: // (green) element = EL_CHAR_LESS; break; - case 0x160a: /* (green) */ + case 0x160a: // (green) element = EL_CHAR_GREATER; break; - case 0x160b: /* (green) */ + case 0x160b: // (green) element = EL_CHAR_QUESTION; break; - case 0x160c: /* (green) */ + case 0x160c: // (green) element = EL_CHAR_COPYRIGHT; break; - case 0x160d: /* (green) */ + case 0x160d: // (green) element = EL_CHAR_UP; break; - case 0x160e: /* (green) */ + case 0x160e: // (green) element = EL_CHAR_DOWN; break; - case 0x160f: /* (green) */ + case 0x160f: // (green) element = EL_CHAR_BUTTON; break; - case 0x1610: /* (green) */ + case 0x1610: // (green) element = EL_CHAR_PLUS; break; - case 0x1611: /* (green) */ + case 0x1611: // (green) element = EL_CHAR_MINUS; break; - case 0x1612: /* (green) */ + case 0x1612: // (green) element = EL_CHAR_APOSTROPHE; break; - case 0x1613: /* (green) */ + case 0x1613: // (green) element = EL_CHAR_PARENLEFT; break; - case 0x1614: /* (green) */ + case 0x1614: // (green) element = EL_CHAR_PARENRIGHT; break; - case 0x1615: /* (blue steel) */ + case 0x1615: // (blue steel) element = EL_STEEL_CHAR_A; break; - case 0x1616: /* (blue steel) */ + case 0x1616: // (blue steel) element = EL_STEEL_CHAR_B; break; - case 0x1617: /* (blue steel) */ + case 0x1617: // (blue steel) element = EL_STEEL_CHAR_C; break; - case 0x1618: /* (blue steel) */ + case 0x1618: // (blue steel) element = EL_STEEL_CHAR_D; break; - case 0x1619: /* (blue steel) */ + case 0x1619: // (blue steel) element = EL_STEEL_CHAR_E; break; - case 0x161a: /* (blue steel) */ + case 0x161a: // (blue steel) element = EL_STEEL_CHAR_F; break; - case 0x161b: /* (blue steel) */ + case 0x161b: // (blue steel) element = EL_STEEL_CHAR_G; break; - case 0x161c: /* (blue steel) */ + case 0x161c: // (blue steel) element = EL_STEEL_CHAR_H; break; - case 0x161d: /* (blue steel) */ + case 0x161d: // (blue steel) element = EL_STEEL_CHAR_I; break; - case 0x161e: /* (blue steel) */ + case 0x161e: // (blue steel) element = EL_STEEL_CHAR_J; break; - case 0x161f: /* (blue steel) */ + case 0x161f: // (blue steel) element = EL_STEEL_CHAR_K; break; - case 0x1620: /* (blue steel) */ + case 0x1620: // (blue steel) element = EL_STEEL_CHAR_L; break; - case 0x1621: /* (blue steel) */ + case 0x1621: // (blue steel) element = EL_STEEL_CHAR_M; break; - case 0x1622: /* (blue steel) */ + case 0x1622: // (blue steel) element = EL_STEEL_CHAR_N; break; - case 0x1623: /* (blue steel) */ + case 0x1623: // (blue steel) element = EL_STEEL_CHAR_O; break; - case 0x1624: /* (blue steel) */ + case 0x1624: // (blue steel) element = EL_STEEL_CHAR_P; break; - case 0x1625: /* (blue steel) */ + case 0x1625: // (blue steel) element = EL_STEEL_CHAR_Q; break; - case 0x1626: /* (blue steel) */ + case 0x1626: // (blue steel) element = EL_STEEL_CHAR_R; break; - case 0x1627: /* (blue steel) */ + case 0x1627: // (blue steel) element = EL_STEEL_CHAR_S; break; - case 0x1628: /* (blue steel) */ + case 0x1628: // (blue steel) element = EL_STEEL_CHAR_T; break; - case 0x1629: /* (blue steel) */ + case 0x1629: // (blue steel) element = EL_STEEL_CHAR_U; break; - case 0x162a: /* (blue steel) */ + case 0x162a: // (blue steel) element = EL_STEEL_CHAR_V; break; - case 0x162b: /* (blue steel) */ + case 0x162b: // (blue steel) element = EL_STEEL_CHAR_W; break; - case 0x162c: /* (blue steel) */ + case 0x162c: // (blue steel) element = EL_STEEL_CHAR_X; break; - case 0x162d: /* (blue steel) */ + case 0x162d: // (blue steel) element = EL_STEEL_CHAR_Y; break; - case 0x162e: /* (blue steel) */ + case 0x162e: // (blue steel) element = EL_STEEL_CHAR_Z; break; - case 0x162f: /* (blue steel) */ + case 0x162f: // (blue steel) element = EL_STEEL_CHAR_AUMLAUT; break; - case 0x1630: /* (blue steel) */ + case 0x1630: // (blue steel) element = EL_STEEL_CHAR_OUMLAUT; break; - case 0x1631: /* (blue steel) */ + case 0x1631: // (blue steel) element = EL_STEEL_CHAR_UUMLAUT; break; - case 0x1632: /* (blue steel) */ + case 0x1632: // (blue steel) element = EL_STEEL_CHAR_0; break; - case 0x1633: /* (blue steel) */ + case 0x1633: // (blue steel) element = EL_STEEL_CHAR_1; break; - case 0x1634: /* (blue steel) */ + case 0x1634: // (blue steel) element = EL_STEEL_CHAR_2; break; - case 0x1635: /* (blue steel) */ + case 0x1635: // (blue steel) element = EL_STEEL_CHAR_3; break; - case 0x1636: /* (blue steel) */ + case 0x1636: // (blue steel) element = EL_STEEL_CHAR_4; break; - case 0x1637: /* (blue steel) */ + case 0x1637: // (blue steel) element = EL_STEEL_CHAR_5; break; - case 0x1638: /* (blue steel) */ + case 0x1638: // (blue steel) element = EL_STEEL_CHAR_6; break; - case 0x1639: /* (blue steel) */ + case 0x1639: // (blue steel) element = EL_STEEL_CHAR_7; break; - case 0x163a: /* (blue steel) */ + case 0x163a: // (blue steel) element = EL_STEEL_CHAR_8; break; - case 0x163b: /* (blue steel) */ + case 0x163b: // (blue steel) element = EL_STEEL_CHAR_9; break; - case 0x163c: /* (blue steel) */ + case 0x163c: // (blue steel) element = EL_STEEL_CHAR_PERIOD; break; - case 0x163d: /* (blue steel) */ + case 0x163d: // (blue steel) element = EL_STEEL_CHAR_EXCLAM; break; - case 0x163e: /* (blue steel) */ + case 0x163e: // (blue steel) element = EL_STEEL_CHAR_COLON; break; - case 0x163f: /* (blue steel) */ + case 0x163f: // (blue steel) element = EL_STEEL_CHAR_LESS; break; - case 0x1640: /* (blue steel) */ + case 0x1640: // (blue steel) element = EL_STEEL_CHAR_GREATER; break; - case 0x1641: /* (blue steel) */ + case 0x1641: // (blue steel) element = EL_STEEL_CHAR_QUESTION; break; - case 0x1642: /* (blue steel) */ + case 0x1642: // (blue steel) element = EL_STEEL_CHAR_COPYRIGHT; break; - case 0x1643: /* (blue steel) */ + case 0x1643: // (blue steel) element = EL_STEEL_CHAR_UP; break; - case 0x1644: /* (blue steel) */ + case 0x1644: // (blue steel) element = EL_STEEL_CHAR_DOWN; break; - case 0x1645: /* (blue steel) */ + case 0x1645: // (blue steel) element = EL_STEEL_CHAR_BUTTON; break; - case 0x1646: /* (blue steel) */ + case 0x1646: // (blue steel) element = EL_STEEL_CHAR_PLUS; break; - case 0x1647: /* (blue steel) */ + case 0x1647: // (blue steel) element = EL_STEEL_CHAR_MINUS; break; - case 0x1648: /* (blue steel) */ + case 0x1648: // (blue steel) element = EL_STEEL_CHAR_APOSTROPHE; break; - case 0x1649: /* (blue steel) */ + case 0x1649: // (blue steel) element = EL_STEEL_CHAR_PARENLEFT; break; - case 0x164a: /* (blue steel) */ + case 0x164a: // (blue steel) element = EL_STEEL_CHAR_PARENRIGHT; break; - case 0x164b: /* (green steel) */ + case 0x164b: // (green steel) element = EL_STEEL_CHAR_A; break; - case 0x164c: /* (green steel) */ + case 0x164c: // (green steel) element = EL_STEEL_CHAR_B; break; - case 0x164d: /* (green steel) */ + case 0x164d: // (green steel) element = EL_STEEL_CHAR_C; break; - case 0x164e: /* (green steel) */ + case 0x164e: // (green steel) element = EL_STEEL_CHAR_D; break; - case 0x164f: /* (green steel) */ + case 0x164f: // (green steel) element = EL_STEEL_CHAR_E; break; - case 0x1650: /* (green steel) */ + case 0x1650: // (green steel) element = EL_STEEL_CHAR_F; break; - case 0x1651: /* (green steel) */ + case 0x1651: // (green steel) element = EL_STEEL_CHAR_G; break; - case 0x1652: /* (green steel) */ + case 0x1652: // (green steel) element = EL_STEEL_CHAR_H; break; - case 0x1653: /* (green steel) */ + case 0x1653: // (green steel) element = EL_STEEL_CHAR_I; break; - case 0x1654: /* (green steel) */ + case 0x1654: // (green steel) element = EL_STEEL_CHAR_J; break; - case 0x1655: /* (green steel) */ + case 0x1655: // (green steel) element = EL_STEEL_CHAR_K; break; - case 0x1656: /* (green steel) */ + case 0x1656: // (green steel) element = EL_STEEL_CHAR_L; break; - case 0x1657: /* (green steel) */ + case 0x1657: // (green steel) element = EL_STEEL_CHAR_M; break; - case 0x1658: /* (green steel) */ + case 0x1658: // (green steel) element = EL_STEEL_CHAR_N; break; - case 0x1659: /* (green steel) */ + case 0x1659: // (green steel) element = EL_STEEL_CHAR_O; break; - case 0x165a: /* (green steel) */ + case 0x165a: // (green steel) element = EL_STEEL_CHAR_P; break; - case 0x165b: /* (green steel) */ + case 0x165b: // (green steel) element = EL_STEEL_CHAR_Q; break; - case 0x165c: /* (green steel) */ + case 0x165c: // (green steel) element = EL_STEEL_CHAR_R; break; - case 0x165d: /* (green steel) */ + case 0x165d: // (green steel) element = EL_STEEL_CHAR_S; break; - case 0x165e: /* (green steel) */ + case 0x165e: // (green steel) element = EL_STEEL_CHAR_T; break; - case 0x165f: /* (green steel) */ + case 0x165f: // (green steel) element = EL_STEEL_CHAR_U; break; - case 0x1660: /* (green steel) */ + case 0x1660: // (green steel) element = EL_STEEL_CHAR_V; break; - case 0x1661: /* (green steel) */ + case 0x1661: // (green steel) element = EL_STEEL_CHAR_W; break; - case 0x1662: /* (green steel) */ + case 0x1662: // (green steel) element = EL_STEEL_CHAR_X; break; - case 0x1663: /* (green steel) */ + case 0x1663: // (green steel) element = EL_STEEL_CHAR_Y; break; - case 0x1664: /* (green steel) */ + case 0x1664: // (green steel) element = EL_STEEL_CHAR_Z; break; - case 0x1665: /* (green steel) */ + case 0x1665: // (green steel) element = EL_STEEL_CHAR_AUMLAUT; break; - case 0x1666: /* (green steel) */ + case 0x1666: // (green steel) element = EL_STEEL_CHAR_OUMLAUT; break; - case 0x1667: /* (green steel) */ + case 0x1667: // (green steel) element = EL_STEEL_CHAR_UUMLAUT; break; - case 0x1668: /* (green steel) */ + case 0x1668: // (green steel) element = EL_STEEL_CHAR_0; break; - case 0x1669: /* (green steel) */ + case 0x1669: // (green steel) element = EL_STEEL_CHAR_1; break; - case 0x166a: /* (green steel) */ + case 0x166a: // (green steel) element = EL_STEEL_CHAR_2; break; - case 0x166b: /* (green steel) */ + case 0x166b: // (green steel) element = EL_STEEL_CHAR_3; break; - case 0x166c: /* (green steel) */ + case 0x166c: // (green steel) element = EL_STEEL_CHAR_4; break; - case 0x166d: /* (green steel) */ + case 0x166d: // (green steel) element = EL_STEEL_CHAR_5; break; - case 0x166e: /* (green steel) */ + case 0x166e: // (green steel) element = EL_STEEL_CHAR_6; break; - case 0x166f: /* (green steel) */ + case 0x166f: // (green steel) element = EL_STEEL_CHAR_7; break; - case 0x1670: /* (green steel) */ + case 0x1670: // (green steel) element = EL_STEEL_CHAR_8; break; - case 0x1671: /* (green steel) */ + case 0x1671: // (green steel) element = EL_STEEL_CHAR_9; break; - case 0x1672: /* (green steel) */ + case 0x1672: // (green steel) element = EL_STEEL_CHAR_PERIOD; break; - case 0x1673: /* (green steel) */ + case 0x1673: // (green steel) element = EL_STEEL_CHAR_EXCLAM; break; - case 0x1674: /* (green steel) */ + case 0x1674: // (green steel) element = EL_STEEL_CHAR_COLON; break; - case 0x1675: /* (green steel) */ + case 0x1675: // (green steel) element = EL_STEEL_CHAR_LESS; break; - case 0x1676: /* (green steel) */ + case 0x1676: // (green steel) element = EL_STEEL_CHAR_GREATER; break; - case 0x1677: /* (green steel) */ + case 0x1677: // (green steel) element = EL_STEEL_CHAR_QUESTION; break; - case 0x1678: /* (green steel) */ + case 0x1678: // (green steel) element = EL_STEEL_CHAR_COPYRIGHT; break; - case 0x1679: /* (green steel) */ + case 0x1679: // (green steel) element = EL_STEEL_CHAR_UP; break; - case 0x167a: /* (green steel) */ + case 0x167a: // (green steel) element = EL_STEEL_CHAR_DOWN; break; - case 0x167b: /* (green steel) */ + case 0x167b: // (green steel) element = EL_STEEL_CHAR_BUTTON; break; - case 0x167c: /* (green steel) */ + case 0x167c: // (green steel) element = EL_STEEL_CHAR_PLUS; break; - case 0x167d: /* (green steel) */ + case 0x167d: // (green steel) element = EL_STEEL_CHAR_MINUS; break; - case 0x167e: /* (green steel) */ + case 0x167e: // (green steel) element = EL_STEEL_CHAR_APOSTROPHE; break; - case 0x167f: /* (green steel) */ + case 0x167f: // (green steel) element = EL_STEEL_CHAR_PARENLEFT; break; - case 0x1680: /* (green steel) */ + case 0x1680: // (green steel) element = EL_STEEL_CHAR_PARENRIGHT; break; - case 0x1681: /* gate (red) */ + case 0x1681: // gate (red) element = EL_EM_GATE_1; break; - case 0x1682: /* secret gate (red) */ + case 0x1682: // secret gate (red) element = EL_GATE_1_GRAY; break; - case 0x1683: /* gate (yellow) */ + case 0x1683: // gate (yellow) element = EL_EM_GATE_2; break; - case 0x1684: /* secret gate (yellow) */ + case 0x1684: // secret gate (yellow) element = EL_GATE_2_GRAY; break; - case 0x1685: /* gate (blue) */ + case 0x1685: // gate (blue) element = EL_EM_GATE_4; break; - case 0x1686: /* secret gate (blue) */ + case 0x1686: // secret gate (blue) element = EL_GATE_4_GRAY; break; - case 0x1687: /* gate (green) */ + case 0x1687: // gate (green) element = EL_EM_GATE_3; break; - case 0x1688: /* secret gate (green) */ + case 0x1688: // secret gate (green) element = EL_GATE_3_GRAY; break; - case 0x1689: /* gate (white) */ + case 0x1689: // gate (white) element = EL_DC_GATE_WHITE; break; - case 0x168a: /* secret gate (white) */ + case 0x168a: // secret gate (white) element = EL_DC_GATE_WHITE_GRAY; break; - case 0x168b: /* secret gate (no key) */ + case 0x168b: // secret gate (no key) element = EL_DC_GATE_FAKE_GRAY; break; @@ -5582,91 +5389,91 @@ int getMappedElement_DC(int element) element = EL_STEELWALL_SLIPPERY; break; - case 0x1695: /* steel wall (not round) */ + case 0x1695: // steel wall (not round) element = EL_STEELWALL; break; - case 0x1696: /* steel wall (left) */ + case 0x1696: // steel wall (left) element = EL_DC_STEELWALL_1_LEFT; break; - case 0x1697: /* steel wall (bottom) */ + case 0x1697: // steel wall (bottom) element = EL_DC_STEELWALL_1_BOTTOM; break; - case 0x1698: /* steel wall (right) */ + case 0x1698: // steel wall (right) element = EL_DC_STEELWALL_1_RIGHT; break; - case 0x1699: /* steel wall (top) */ + case 0x1699: // steel wall (top) element = EL_DC_STEELWALL_1_TOP; break; - case 0x169a: /* steel wall (left/bottom) */ + case 0x169a: // steel wall (left/bottom) element = EL_DC_STEELWALL_1_BOTTOMLEFT; break; - case 0x169b: /* steel wall (right/bottom) */ + case 0x169b: // steel wall (right/bottom) element = EL_DC_STEELWALL_1_BOTTOMRIGHT; break; - case 0x169c: /* steel wall (right/top) */ + case 0x169c: // steel wall (right/top) element = EL_DC_STEELWALL_1_TOPRIGHT; break; - case 0x169d: /* steel wall (left/top) */ + case 0x169d: // steel wall (left/top) element = EL_DC_STEELWALL_1_TOPLEFT; break; - case 0x169e: /* steel wall (right/bottom small) */ + case 0x169e: // steel wall (right/bottom small) element = EL_DC_STEELWALL_1_BOTTOMRIGHT_2; break; - case 0x169f: /* steel wall (left/bottom small) */ + case 0x169f: // steel wall (left/bottom small) element = EL_DC_STEELWALL_1_BOTTOMLEFT_2; break; - case 0x16a0: /* steel wall (right/top small) */ + case 0x16a0: // steel wall (right/top small) element = EL_DC_STEELWALL_1_TOPRIGHT_2; break; - case 0x16a1: /* steel wall (left/top small) */ + case 0x16a1: // steel wall (left/top small) element = EL_DC_STEELWALL_1_TOPLEFT_2; break; - case 0x16a2: /* steel wall (left/right) */ + case 0x16a2: // steel wall (left/right) element = EL_DC_STEELWALL_1_VERTICAL; break; - case 0x16a3: /* steel wall (top/bottom) */ + case 0x16a3: // steel wall (top/bottom) element = EL_DC_STEELWALL_1_HORIZONTAL; break; - case 0x16a4: /* steel wall 2 (left end) */ + case 0x16a4: // steel wall 2 (left end) element = EL_DC_STEELWALL_2_LEFT; break; - case 0x16a5: /* steel wall 2 (right end) */ + case 0x16a5: // steel wall 2 (right end) element = EL_DC_STEELWALL_2_RIGHT; break; - case 0x16a6: /* steel wall 2 (top end) */ + case 0x16a6: // steel wall 2 (top end) element = EL_DC_STEELWALL_2_TOP; break; - case 0x16a7: /* steel wall 2 (bottom end) */ + case 0x16a7: // steel wall 2 (bottom end) element = EL_DC_STEELWALL_2_BOTTOM; break; - case 0x16a8: /* steel wall 2 (left/right) */ + case 0x16a8: // steel wall 2 (left/right) element = EL_DC_STEELWALL_2_HORIZONTAL; break; - case 0x16a9: /* steel wall 2 (up/down) */ + case 0x16a9: // steel wall 2 (up/down) element = EL_DC_STEELWALL_2_VERTICAL; break; - case 0x16aa: /* steel wall 2 (mid) */ + case 0x16aa: // steel wall 2 (mid) element = EL_DC_STEELWALL_2_MIDDLE; break; @@ -5738,8 +5545,8 @@ int getMappedElement_DC(int element) element = EL_INVISIBLE_STEELWALL; break; - /* 0x16bc - 0x16cb: */ - /* EL_INVISIBLE_SAND */ + // 0x16bc - 0x16cb: + // EL_INVISIBLE_SAND case 0x16cc: element = EL_LIGHT_SWITCH; @@ -5750,9 +5557,9 @@ int getMappedElement_DC(int element) break; default: - if (element >= 0x0117 && element <= 0x036e) /* (?) */ + if (element >= 0x0117 && element <= 0x036e) // (?) element = EL_DIAMOND; - else if (element >= 0x042d && element <= 0x0684) /* (?) */ + else if (element >= 0x042d && element <= 0x0684) // (?) element = EL_EMERALD; else if (element >= 0x157c && element <= 0x158b) element = EL_SAND; @@ -5771,9 +5578,7 @@ int getMappedElement_DC(int element) return getMappedElement(element); } -#if 1 - -static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, +static void LoadLevelFromFileStream_DC(File *file, struct LevelInfo *level, int nr) { byte header[DC_LEVEL_HEADER_SIZE]; @@ -5790,7 +5595,7 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, int num_yamyam_contents; int i, x, y; - getDecodedWord_DC(0, TRUE); /* initialize DC2 decoding engine */ + getDecodedWord_DC(0, TRUE); // initialize DC2 decoding engine for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++) { @@ -5800,12 +5605,12 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, header[i * 2 + 1] = header_word & 0xff; } - /* read some values from level header to check level decoding integrity */ + // read some values from level header to check level decoding integrity fieldx = header[6] | (header[7] << 8); fieldy = header[8] | (header[9] << 8); num_yamyam_contents = header[60] | (header[61] << 8); - /* do some simple sanity checks to ensure that level was correctly decoded */ + // do some simple sanity checks to ensure that level was correctly decoded if (fieldx < 1 || fieldx > 256 || fieldy < 1 || fieldy > 256 || num_yamyam_contents < 1 || num_yamyam_contents > 8) @@ -5817,14 +5622,14 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, return; } - /* maximum envelope header size is 31 bytes */ + // maximum envelope header size is 31 bytes envelope_header_len = header[envelope_header_pos]; - /* maximum envelope content size is 110 (156?) bytes */ + // maximum envelope content size is 110 (156?) bytes envelope_content_len = header[envelope_content_pos]; - /* maximum level title size is 40 bytes */ + // 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 */ + // maximum level author size is 30 (51?) bytes level_author_len = MIN(header[level_author_pos], MAX_LEVEL_AUTHOR_LEN); envelope_size = 0; @@ -5871,11 +5676,7 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, 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); @@ -5890,11 +5691,7 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, 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); @@ -5933,48 +5730,27 @@ static void LoadLevelFromFileStream_DC(FILE *file, struct LevelInfo *level, level->extra_time = header[56] | (header[57] << 8); level->shield_normal_time = header[58] | (header[59] << 8); - /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems - can slip down from flat walls, like normal walls and steel walls */ + // Diamond Caves has the same (strange) behaviour as Emerald Mine that gems + // can slip down from flat walls, like normal walls and steel walls level->em_slippery_gems = TRUE; - -#if 0 - /* Diamond Caves II levels are always surrounded by indestructible wall, but - not necessarily in a rectangular way -- fill with invisible steel wall */ - - /* !!! not always true !!! keep level and set BorderElement instead !!! */ - - for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) - { -#if 1 - if ((x == 0 || x == level->fieldx - 1 || - y == 0 || y == level->fieldy - 1) && - level->field[x][y] == EL_EMPTY) - level->field[x][y] = EL_INVISIBLE_STEELWALL; -#else - if ((x == 0 || x == level->fieldx - 1 || - y == 0 || y == level->fieldy - 1) && - level->field[x][y] == EL_EMPTY) - FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL, - level->field, level->fieldx, level->fieldy); -#endif - } -#endif } static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) + struct LevelFileInfo *level_file_info, + boolean level_info_only) { char *filename = level_file_info->filename; - FILE *file; + File *file; int num_magic_bytes = 8; char magic_bytes[num_magic_bytes + 1]; int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level; - if (!(file = fopen(filename, MODE_READ))) + if (!(file = openFile(filename, MODE_READ))) { level->no_valid_file = TRUE; - Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + if (!level_info_only) + Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); return; } @@ -5983,10 +5759,11 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, if (level_file_info->packed) { - /* read "magic bytes" from start of file */ - fgets(magic_bytes, num_magic_bytes + 1, file); + // read "magic bytes" from start of file + if (getStringFromFile(file, magic_bytes, num_magic_bytes + 1) == NULL) + magic_bytes[0] = '\0'; - /* check "magic bytes" for correct file format */ + // check "magic bytes" for correct file format if (!strPrefix(magic_bytes, "DC2")) { level->no_valid_file = TRUE; @@ -6004,17 +5781,17 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, int extra_bytes = 4; int skip_bytes; - /* advance file stream to first level inside the level package */ + // advance file stream to first level inside the level package skip_bytes = position_first_level - num_magic_bytes - extra_bytes; - /* each block of level data is followed by block of non-level data */ + // each block of level data is followed by block of non-level data num_levels_to_skip *= 2; - /* at least skip header bytes, therefore use ">= 0" instead of "> 0" */ + // at least skip header bytes, therefore use ">= 0" instead of "> 0" while (num_levels_to_skip >= 0) { - /* advance file stream to next level inside the level package */ - if (fseek(file, skip_bytes, SEEK_CUR) != 0) + // advance file stream to next level inside the level package + if (seekFile(file, skip_bytes, SEEK_CUR) != 0) { level->no_valid_file = TRUE; @@ -6024,10 +5801,10 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, return; } - /* skip apparently unused extra bytes following each level */ + // skip apparently unused extra bytes following each level ReadUnusedBytesFromFile(file, extra_bytes); - /* read size of next level in level package */ + // read size of next level in level package skip_bytes = getFile32BitLE(file); num_levels_to_skip--; @@ -6046,252 +5823,322 @@ static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, LoadLevelFromFileStream_DC(file, level, level_file_info->nr); - fclose(file); + closeFile(file); } -#else -static void LoadLevelFromFileInfo_DC(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) +// ---------------------------------------------------------------------------- +// functions for loading SB level +// ---------------------------------------------------------------------------- + +int getMappedElement_SB(int element_ascii, boolean use_ces) +{ + static struct + { + int ascii; + int sb; + int ce; + } + sb_element_mapping[] = + { + { ' ', EL_EMPTY, EL_CUSTOM_1 }, // floor (space) + { '#', EL_STEELWALL, EL_CUSTOM_2 }, // wall + { '@', EL_PLAYER_1, EL_CUSTOM_3 }, // player + { '$', EL_SOKOBAN_OBJECT, EL_CUSTOM_4 }, // box + { '.', EL_SOKOBAN_FIELD_EMPTY, EL_CUSTOM_5 }, // goal square + { '*', EL_SOKOBAN_FIELD_FULL, EL_CUSTOM_6 }, // box on goal square + { '+', EL_SOKOBAN_FIELD_PLAYER, EL_CUSTOM_7 }, // player on goal square + { '_', EL_INVISIBLE_STEELWALL, EL_FROM_LEVEL_TEMPLATE }, // floor beyond border + + { 0, -1, -1 }, + }; + + int i; + + for (i = 0; sb_element_mapping[i].ascii != 0; i++) + if (element_ascii == sb_element_mapping[i].ascii) + return (use_ces ? sb_element_mapping[i].ce : sb_element_mapping[i].sb); + + return EL_UNDEFINED; +} + +static void LoadLevelFromFileInfo_SB(struct LevelInfo *level, + struct LevelFileInfo *level_file_info, + boolean level_info_only) { 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; + char line[MAX_LINE_LEN], line_raw[MAX_LINE_LEN], previous_line[MAX_LINE_LEN]; + char last_comment[MAX_LINE_LEN]; + char level_name[MAX_LINE_LEN]; + char *line_ptr; + File *file; + int num_levels_to_skip = level_file_info->nr - leveldir_current->first_level; + boolean read_continued_line = FALSE; + boolean reading_playfield = FALSE; + boolean got_valid_playfield_line = FALSE; + boolean invalid_playfield_char = FALSE; + boolean load_xsb_to_ces = check_special_flags("load_xsb_to_ces"); + int file_level_nr = 0; + int line_nr = 0; + int x = 0, y = 0; // initialized to make compilers happy - if (!(file = fopen(filename, MODE_READ))) + last_comment[0] = '\0'; + level_name[0] = '\0'; + + if (!(file = openFile(filename, MODE_READ))) { level->no_valid_file = TRUE; - Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); + if (!level_info_only) + 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) + while (!checkEndOfFile(file)) { - level->no_valid_file = TRUE; + // level successfully read, but next level may follow here + if (!got_valid_playfield_line && reading_playfield) + { + // read playfield from single level file -- skip remaining file + if (!level_file_info->packed) + break; - Error(ERR_WARN, "cannot fseek in file '%s' -- using empty level", filename); + if (file_level_nr >= num_levels_to_skip) + break; - return; - } -#endif + file_level_nr++; - getDecodedWord_DC(0, TRUE); /* initialize DC2 decoding engine */ + last_comment[0] = '\0'; + level_name[0] = '\0'; - for (i = 0; i < DC_LEVEL_HEADER_SIZE / 2; i++) - { - unsigned short header_word = getDecodedWord_DC(getFile16BitBE(file), FALSE); + reading_playfield = FALSE; + } - header[i * 2 + 0] = header_word >> 8; - header[i * 2 + 1] = header_word & 0xff; - } + got_valid_playfield_line = FALSE; - /* read some values from level header to check level decoding integrity */ - fieldx = header[6] | (header[7] << 8); - fieldy = header[8] | (header[9] << 8); - num_yamyam_contents = header[60] | (header[61] << 8); + // read next line of input file + if (!getStringFromFile(file, line, MAX_LINE_LEN)) + break; - /* do some simple sanity checks to ensure that level was correctly decoded */ - if (fieldx < 1 || fieldx > 256 || - fieldy < 1 || fieldy > 256 || - num_yamyam_contents < 1 || num_yamyam_contents > 8) - { - level->no_valid_file = TRUE; + // check if line was completely read and is terminated by line break + if (strlen(line) > 0 && line[strlen(line) - 1] == '\n') + line_nr++; - Error(ERR_WARN, "cannot read level from file '%s' -- using empty level", - filename); + // cut trailing line break (this can be newline and/or carriage return) + for (line_ptr = &line[strlen(line)]; line_ptr >= line; line_ptr--) + if ((*line_ptr == '\n' || *line_ptr == '\r') && *(line_ptr + 1) == '\0') + *line_ptr = '\0'; - return; - } + // copy raw input line for later use (mainly debugging output) + strcpy(line_raw, line); - /* 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]; + if (read_continued_line) + { + // append new line to existing line, if there is enough space + if (strlen(previous_line) + strlen(line_ptr) < MAX_LINE_LEN) + strcat(previous_line, line_ptr); - /* 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); + strcpy(line, previous_line); // copy storage buffer to line - envelope_size = 0; + read_continued_line = FALSE; + } - 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 the last character is '\', continue at next line + if (strlen(line) > 0 && line[strlen(line) - 1] == '\\') + { + line[strlen(line) - 1] = '\0'; // cut off trailing backslash + strcpy(previous_line, line); // copy line to storage buffer - 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'; - } + read_continued_line = TRUE; - 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]; + continue; + } + + // skip empty lines + if (line[0] == '\0') + continue; + + // extract comment text from comment line + if (line[0] == ';') + { + for (line_ptr = line; *line_ptr; line_ptr++) + if (*line_ptr != ' ' && *line_ptr != '\t' && *line_ptr != ';') + break; + + strcpy(last_comment, line_ptr); + + continue; + } + + // extract level title text from line containing level title + if (line[0] == '\'') + { + strcpy(level_name, &line[1]); + + if (strlen(level_name) > 0 && level_name[strlen(level_name) - 1] == '\'') + level_name[strlen(level_name) - 1] = '\0'; + + continue; + } + + // skip lines containing only spaces (or empty lines) + for (line_ptr = line; *line_ptr; line_ptr++) + if (*line_ptr != ' ') + break; + if (*line_ptr == '\0') + continue; + + // at this point, we have found a line containing part of a playfield + + got_valid_playfield_line = TRUE; - level->envelope[0].text[envelope_size] = '\0'; + if (!reading_playfield) + { + reading_playfield = TRUE; + invalid_playfield_char = FALSE; - level->envelope[0].xsize = MAX_ENVELOPE_XSIZE; - level->envelope[0].ysize = 10; - level->envelope[0].autowrap = TRUE; - level->envelope[0].centered = TRUE; + for (x = 0; x < MAX_LEV_FIELDX; x++) + for (y = 0; y < MAX_LEV_FIELDY; y++) + level->field[x][y] = getMappedElement_SB(' ', load_xsb_to_ces); - for (i = 0; i < level_name_len; i++) - level->name[i] = header[level_name_pos + 1 + i]; - level->name[level_name_len] = '\0'; + level->fieldx = 0; + level->fieldy = 0; - for (i = 0; i < level_author_len; i++) - level->author[i] = header[level_author_pos + 1 + i]; - level->author[level_author_len] = '\0'; + // start with topmost tile row + y = 0; + } - num_yamyam_contents = header[60] | (header[61] << 8); - level->num_yamyam_contents = - MIN(MAX(MIN_ELEMENT_CONTENTS, num_yamyam_contents), MAX_ELEMENT_CONTENTS); + // skip playfield line if larger row than allowed + if (y >= MAX_LEV_FIELDY) + continue; - for (i = 0; i < num_yamyam_contents; i++) - { - for (y = 0; y < 3; y++) for (x = 0; x < 3; x++) + // start with leftmost tile column + x = 0; + + // read playfield elements from line + for (line_ptr = line; *line_ptr; line_ptr++) { - 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 + int mapped_sb_element = getMappedElement_SB(*line_ptr, load_xsb_to_ces); - if (i < MAX_ELEMENT_CONTENTS) - level->yamyam_content[i].e[x][y] = getMappedElement_DC(element_dc); - } - } + // stop parsing playfield line if larger column than allowed + if (x >= MAX_LEV_FIELDX) + break; - 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); + if (mapped_sb_element == EL_UNDEFINED) + { + invalid_playfield_char = TRUE; - 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 + break; + } - if (x < MAX_LEV_FIELDX && y < MAX_LEV_FIELDY) - level->field[x][y] = getMappedElement_DC(element_dc); - } + level->field[x][y] = mapped_sb_element; - 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; + // continue with next tile column + x++; - 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->fieldx = MAX(x, level->fieldx); + } - level->gems_needed = header[18] | (header[19] << 8); + if (invalid_playfield_char) + { + // if first playfield line, treat invalid lines as comment lines + if (y == 0) + reading_playfield = FALSE; - 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); + continue; + } - level->time = header[44] | (header[45] << 8); + // continue with next tile row + y++; + } - 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); + closeFile(file); - fclose(file); + level->fieldy = y; - /* Diamond Caves has the same (strange) behaviour as Emerald Mine that gems - can slip down from flat walls, like normal walls and steel walls */ - level->em_slippery_gems = TRUE; + level->fieldx = MIN(MAX(MIN_LEV_FIELDX, level->fieldx), MAX_LEV_FIELDX); + level->fieldy = MIN(MAX(MIN_LEV_FIELDY, level->fieldy), MAX_LEV_FIELDY); -#if 0 - /* Diamond Caves II levels are always surrounded by indestructible wall, but - not necessarily in a rectangular way -- fill with invisible steel wall */ + if (!reading_playfield) + { + level->no_valid_file = TRUE; + + Error(ERR_WARN, "cannot read level '%s' -- using empty level", filename); - /* !!! not always true !!! keep level and set BorderElement instead !!! */ + return; + } + + if (*level_name != '\0') + { + strncpy(level->name, level_name, MAX_LEVEL_NAME_LEN); + level->name[MAX_LEVEL_NAME_LEN] = '\0'; + } + else if (*last_comment != '\0') + { + strncpy(level->name, last_comment, MAX_LEVEL_NAME_LEN); + level->name[MAX_LEVEL_NAME_LEN] = '\0'; + } + else + { + sprintf(level->name, "--> Level %d <--", level_file_info->nr); + } + // set all empty fields beyond the border walls to invisible steel wall for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) { -#if 1 - if ((x == 0 || x == level->fieldx - 1 || - y == 0 || y == level->fieldy - 1) && - level->field[x][y] == EL_EMPTY) - level->field[x][y] = EL_INVISIBLE_STEELWALL; -#else if ((x == 0 || x == level->fieldx - 1 || y == 0 || y == level->fieldy - 1) && - level->field[x][y] == EL_EMPTY) - FloodFillLevel(x, y, EL_INVISIBLE_STEELWALL, + level->field[x][y] == getMappedElement_SB(' ', load_xsb_to_ces)) + FloodFillLevel(x, y, getMappedElement_SB('_', load_xsb_to_ces), level->field, level->fieldx, level->fieldy); -#endif } -#endif -} -#endif + // set special level settings for Sokoban levels + + level->time = 0; + level->use_step_counter = TRUE; + + if (load_xsb_to_ces) + { + // special global settings can now be set in level template + + level->use_custom_template = TRUE; + } +} -/* ------------------------------------------------------------------------- */ -/* functions for handling native levels */ -/* ------------------------------------------------------------------------- */ +// ------------------------------------------------------------------------- +// functions for handling native levels +// ------------------------------------------------------------------------- static void LoadLevelFromFileInfo_EM(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) + struct LevelFileInfo *level_file_info, + boolean level_info_only) { - if (!LoadNativeLevel_EM(level_file_info->filename)) + if (!LoadNativeLevel_EM(level_file_info->filename, level_info_only)) level->no_valid_file = TRUE; } static void LoadLevelFromFileInfo_SP(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) + struct LevelFileInfo *level_file_info, + boolean level_info_only) { int pos = 0; - /* determine position of requested level inside level package */ + // determine position of requested level inside level package if (level_file_info->packed) pos = level_file_info->nr - leveldir_current->first_level; - if (!LoadNativeLevel_SP(level_file_info->filename, pos)) + if (!LoadNativeLevel_SP(level_file_info->filename, pos, level_info_only)) + level->no_valid_file = TRUE; +} + +static void LoadLevelFromFileInfo_MM(struct LevelInfo *level, + struct LevelFileInfo *level_file_info, + boolean level_info_only) +{ + if (!LoadNativeLevel_MM(level_file_info->filename, level_info_only)) level->no_valid_file = TRUE; } @@ -6301,6 +6148,8 @@ void CopyNativeLevel_RND_to_Native(struct LevelInfo *level) CopyNativeLevel_RND_to_EM(level); else if (level->game_engine_type == GAME_ENGINE_TYPE_SP) CopyNativeLevel_RND_to_SP(level); + else if (level->game_engine_type == GAME_ENGINE_TYPE_MM) + CopyNativeLevel_RND_to_MM(level); } void CopyNativeLevel_Native_to_RND(struct LevelInfo *level) @@ -6309,47 +6158,73 @@ void CopyNativeLevel_Native_to_RND(struct LevelInfo *level) CopyNativeLevel_EM_to_RND(level); else if (level->game_engine_type == GAME_ENGINE_TYPE_SP) CopyNativeLevel_SP_to_RND(level); + else if (level->game_engine_type == GAME_ENGINE_TYPE_MM) + CopyNativeLevel_MM_to_RND(level); +} + +void SaveNativeLevel(struct LevelInfo *level) +{ + if (level->game_engine_type == GAME_ENGINE_TYPE_SP) + { + char *basename = getSingleLevelBasenameExt(level->file_info.nr, "sp"); + char *filename = getLevelFilenameFromBasename(basename); + + CopyNativeLevel_RND_to_SP(level); + CopyNativeTape_RND_to_SP(level); + + SaveNativeLevel_SP(filename); + } } -/* ------------------------------------------------------------------------- */ -/* functions for loading generic level */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// functions for loading generic level +// ---------------------------------------------------------------------------- -void LoadLevelFromFileInfo(struct LevelInfo *level, - struct LevelFileInfo *level_file_info) +static void LoadLevelFromFileInfo(struct LevelInfo *level, + struct LevelFileInfo *level_file_info, + boolean level_info_only) { - /* always start with reliable default values */ - setLevelInfoToDefaults(level); + // always start with reliable default values + setLevelInfoToDefaults(level, level_info_only, TRUE); switch (level_file_info->type) { case LEVEL_FILE_TYPE_RND: - LoadLevelFromFileInfo_RND(level, level_file_info); + LoadLevelFromFileInfo_RND(level, level_file_info, level_info_only); break; case LEVEL_FILE_TYPE_EM: - LoadLevelFromFileInfo_EM(level, level_file_info); + LoadLevelFromFileInfo_EM(level, level_file_info, level_info_only); level->game_engine_type = GAME_ENGINE_TYPE_EM; break; case LEVEL_FILE_TYPE_SP: - LoadLevelFromFileInfo_SP(level, level_file_info); + LoadLevelFromFileInfo_SP(level, level_file_info, level_info_only); level->game_engine_type = GAME_ENGINE_TYPE_SP; break; + case LEVEL_FILE_TYPE_MM: + LoadLevelFromFileInfo_MM(level, level_file_info, level_info_only); + level->game_engine_type = GAME_ENGINE_TYPE_MM; + break; + case LEVEL_FILE_TYPE_DC: - LoadLevelFromFileInfo_DC(level, level_file_info); + LoadLevelFromFileInfo_DC(level, level_file_info, level_info_only); + break; + + case LEVEL_FILE_TYPE_SB: + LoadLevelFromFileInfo_SB(level, level_file_info, level_info_only); break; default: - LoadLevelFromFileInfo_RND(level, level_file_info); + LoadLevelFromFileInfo_RND(level, level_file_info, level_info_only); break; } - /* if level file is invalid, restore level structure to default values */ + // if level file is invalid, restore level structure to default values if (level->no_valid_file) - setLevelInfoToDefaults(level); + setLevelInfoToDefaults(level, level_info_only, FALSE); if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN) level->game_engine_type = GAME_ENGINE_TYPE_RND; @@ -6362,37 +6237,34 @@ void LoadLevelFromFilename(struct LevelInfo *level, char *filename) { static struct LevelFileInfo level_file_info; - /* always start with reliable default values */ + // always start with reliable default values setFileInfoToDefaults(&level_file_info); - level_file_info.nr = 0; /* unknown level number */ - level_file_info.type = LEVEL_FILE_TYPE_RND; /* no others supported yet */ - level_file_info.filename = filename; + level_file_info.nr = 0; // unknown level number + level_file_info.type = LEVEL_FILE_TYPE_RND; // no others supported yet - LoadLevelFromFileInfo(level, &level_file_info); + setString(&level_file_info.filename, filename); + + LoadLevelFromFileInfo(level, &level_file_info, FALSE); } -static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) +static void LoadLevel_InitVersion(struct LevelInfo *level) { int i, j; - if (leveldir_current == NULL) /* only when dumping level */ + if (leveldir_current == NULL) // only when dumping level return; - /* all engine modifications also valid for levels which use latest engine */ + // all engine modifications also valid for levels which use latest engine 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 */ + // time bonus score was given for 10 s instead of 1 s before 3.2.0-5 level->score[SC_TIME_BONUS] /= 10; } -#if 0 - leveldir_current->latest_engine = TRUE; /* !!! TEST ONLY !!! */ -#endif - if (leveldir_current->latest_engine) { - /* ---------- use latest game engine ----------------------------------- */ + // ---------- use latest game engine -------------------------------------- /* For all levels which are forced to use the latest game engine version (normally all but user contributed, private and undefined levels), set @@ -6417,7 +6289,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) return; } - /* ---------- use game engine the level was created with ----------------- */ + // ---------- use game engine the level was created with -------------------- /* For all levels which are not forced to use the latest game engine version (normally user contributed, private and undefined levels), @@ -6429,50 +6301,53 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) pre-2.0 levels, where the game version is still taken from the file format version used to store the level -- see above). */ - /* player was faster than enemies in 1.0.0 and before */ + // player was faster than enemies in 1.0.0 and before if (level->file_version == FILE_VERSION_1_0) for (i = 0; i < MAX_PLAYERS; i++) level->initial_player_stepsize[i] = STEPSIZE_FAST; - /* default behaviour for EM style gems was "slippery" only in 2.0.1 */ + // default behaviour for EM style gems was "slippery" only in 2.0.1 if (level->game_version == VERSION_IDENT(2,0,1,0)) level->em_slippery_gems = TRUE; - /* springs could be pushed over pits before (pre-release version) 2.2.0 */ + // springs could be pushed over pits before (pre-release version) 2.2.0 if (level->game_version < VERSION_IDENT(2,2,0,0)) level->use_spring_bug = TRUE; if (level->game_version < VERSION_IDENT(3,2,0,5)) { - /* time orb caused limited time in endless time levels before 3.2.0-5 */ + // time orb caused limited time in endless time levels before 3.2.0-5 level->use_time_orb_bug = TRUE; - /* default behaviour for snapping was "no snap delay" before 3.2.0-5 */ + // default behaviour for snapping was "no snap delay" before 3.2.0-5 level->block_snap_field = FALSE; - /* extra time score was same value as time left score before 3.2.0-5 */ + // extra time score was same value as time left score before 3.2.0-5 level->extra_time_score = level->score[SC_TIME_BONUS]; - -#if 0 - /* time bonus score was given for 10 s instead of 1 s before 3.2.0-5 */ - level->score[SC_TIME_BONUS] /= 10; -#endif } + // game logic of "game of life" and "biomaze" was buggy before 4.1.1.1 + if (level->game_version < VERSION_IDENT(4,1,1,1)) + level->use_life_bugs = TRUE; + + // only Sokoban fields (but not objects) had to be solved before 4.1.1.1 + if (level->game_version < VERSION_IDENT(4,1,1,1)) + level->sb_objects_needed = FALSE; + if (level->game_version < VERSION_IDENT(3,2,0,7)) { - /* default behaviour for snapping was "not continuous" before 3.2.0-7 */ + // default behaviour for snapping was "not continuous" before 3.2.0-7 level->continuous_snapping = FALSE; } - /* only few elements were able to actively move into acid before 3.1.0 */ - /* trigger settings did not exist before 3.1.0; set to default "any" */ + // only few elements were able to actively move into acid before 3.1.0 + // trigger settings did not exist before 3.1.0; set to default "any" if (level->game_version < VERSION_IDENT(3,1,0,0)) { - /* correct "can move into acid" settings (all zero in old levels) */ + // correct "can move into acid" settings (all zero in old levels) - level->can_move_into_acid_bits = 0; /* nothing can move into acid */ - level->dont_collide_with_bits = 0; /* nothing is deadly when colliding */ + level->can_move_into_acid_bits = 0; // nothing can move into acid + level->dont_collide_with_bits = 0; // nothing is deadly when colliding setMoveIntoAcidProperty(level, EL_ROBOT, TRUE); setMoveIntoAcidProperty(level, EL_SATELLITE, TRUE); @@ -6482,7 +6357,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) SET_PROPERTY(EL_CUSTOM_START + i, EP_CAN_MOVE_INTO_ACID, TRUE); - /* correct trigger settings (stored as zero == "none" in old levels) */ + // correct trigger settings (stored as zero == "none" in old levels) for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { @@ -6499,7 +6374,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) } } - /* try to detect and fix "Snake Bite" levels, which are broken with 3.2.0 */ + // try to detect and fix "Snake Bite" levels, which are broken with 3.2.0 { int element = EL_CUSTOM_256; struct ElementInfo *ei = &element_info[element]; @@ -6521,8 +6396,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) change->target_element = EL_PLAYER_1; } -#if 1 - /* try to detect and fix "Zelda" style levels, which are broken with 3.2.5 */ + // try to detect and fix "Zelda" style levels, which are broken with 3.2.5 if (level->game_version < VERSION_IDENT(3,2,5,0)) { /* This is needed to fix a problem that was caused by a bugfix in function @@ -6545,60 +6419,51 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) level->use_action_after_change_bug = TRUE; } -#else - /* !!! THIS DOES NOT FIX "Zelda I" (GRAPHICALLY) AND "Alan's FMV" LEVELS */ - /* try to detect and fix "Zelda II" levels, which are broken with 3.2.5 */ - { - int element = EL_CUSTOM_16; - struct ElementInfo *ei = &element_info[element]; - - /* This is needed to fix a problem that was caused by a bugfix in function - game.c/CheckTriggeredElementChangeExt() introduced with 3.2.5 that - corrects the behaviour when a custom element changes to another custom - element with a higher element number that has change actions defined. - Normally, only one change per frame is allowed for custom elements. - Therefore, it is checked if a custom element already changed in the - current frame; if it did, subsequent changes are suppressed. - Unfortunately, this is only checked for element changes, but not for - change actions, which are still executed. As the function above loops - through all custom elements from lower to higher, an element change - resulting in a lower CE number won't be checked again, while a target - element with a higher number will also be checked, and potential change - actions will get executed for this CE, too (which is wrong), while - further changes are ignored (which is correct). As this bugfix breaks - Zelda II (but no other levels), allow the previous, incorrect behaviour - for this outstanding level set to not break the game or existing tapes */ - - if (strncmp(leveldir_current->identifier, "zelda2", 6) == 0 || - strncmp(ei->description, "scanline - row 1", 16) == 0) - level->use_action_after_change_bug = TRUE; - } -#endif - /* not centering level after relocating player was default only in 3.2.3 */ - if (level->game_version == VERSION_IDENT(3,2,3,0)) /* (no pre-releases) */ + // not centering level after relocating player was default only in 3.2.3 + if (level->game_version == VERSION_IDENT(3,2,3,0)) // (no pre-releases) level->shifted_relocation = TRUE; - /* EM style elements always chain-exploded in R'n'D engine before 3.2.6 */ + // EM style elements always chain-exploded in R'n'D engine before 3.2.6 if (level->game_version < VERSION_IDENT(3,2,6,0)) level->em_explodes_by_fire = TRUE; + + // levels were solved by the first player entering an exit up to 4.1.0.0 + if (level->game_version <= VERSION_IDENT(4,1,0,0)) + level->solved_by_one_player = TRUE; } -static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) +static void LoadLevel_InitStandardElements(struct LevelInfo *level) { - int i, j, x, y; + int i, x, y; + + // map elements that have changed in newer versions + level->amoeba_content = getMappedElementByVersion(level->amoeba_content, + level->game_version); + 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] = + getMappedElementByVersion(level->yamyam_content[i].e[x][y], + level->game_version); + +} + +static void LoadLevel_InitCustomElements(struct LevelInfo *level) +{ + int i, j; - /* map custom element change events that have changed in newer versions - (these following values were accidentally changed in version 3.0.1) - (this seems to be needed only for 'ab_levelset3' and 'ab_levelset4') */ + // map custom element change events that have changed in newer versions + // (these following values were accidentally changed in version 3.0.1) + // (this seems to be needed only for 'ab_levelset3' and 'ab_levelset4') if (level->game_version <= VERSION_IDENT(3,0,0,0)) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; - /* order of checking and copying events to be mapped is important */ - /* (do not change the start and end value -- they are constant) */ + // order of checking and copying events to be mapped is important + // (do not change the start and end value -- they are constant) for (j = CE_BY_OTHER_ACTION; j >= CE_VALUE_GETS_ZERO; j--) { if (HAS_CHANGE_EVENT(element, j - 2)) @@ -6608,8 +6473,8 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* order of checking and copying events to be mapped is important */ - /* (do not change the start and end value -- they are constant) */ + // order of checking and copying events to be mapped is important + // (do not change the start and end value -- they are constant) for (j = CE_PLAYER_COLLECTS_X; j >= CE_HITTING_SOMETHING; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) @@ -6621,7 +6486,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* initialize "can_change" field for old levels with only one change page */ + // initialize "can_change" field for old levels with only one change page if (level->game_version <= VERSION_IDENT(3,0,2,0)) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) @@ -6633,7 +6498,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* correct custom element values (for old levels without these options) */ + // correct custom element values (for old levels without these options) if (level->game_version < VERSION_IDENT(3,1,1,0)) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) @@ -6646,7 +6511,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* correct custom element values (fix invalid values for all versions) */ + // correct custom element values (fix invalid values for all versions) if (1) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) @@ -6667,8 +6532,8 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* initialize "can_explode" field for old levels which did not store this */ - /* !!! CHECK THIS -- "<= 3,1,0,0" IS PROBABLY WRONG !!! */ + // initialize "can_explode" field for old levels which did not store this + // !!! CHECK THIS -- "<= 3,1,0,0" IS PROBABLY WRONG !!! if (level->game_version <= VERSION_IDENT(3,1,0,0)) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) @@ -6684,7 +6549,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } - /* correct previously hard-coded move delay values for maze runner style */ + // correct previously hard-coded move delay values for maze runner style if (level->game_version < VERSION_IDENT(3,1,1,0)) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) @@ -6693,56 +6558,73 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) if (element_info[element].move_pattern & MV_MAZE_RUNNER_STYLE) { - /* previously hard-coded and therefore ignored */ + // previously hard-coded and therefore ignored element_info[element].move_delay_fixed = 9; element_info[element].move_delay_random = 0; } } } - /* map elements that have changed in newer versions */ - level->amoeba_content = getMappedElementByVersion(level->amoeba_content, - level->game_version); - 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] = - getMappedElementByVersion(level->yamyam_content[i].e[x][y], - level->game_version); + // set some other uninitialized values of custom elements in older levels + if (level->game_version < VERSION_IDENT(3,1,0,0)) + { + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + + element_info[element].access_direction = MV_ALL_DIRECTIONS; + + element_info[element].explosion_delay = 17; + element_info[element].ignition_delay = 8; + } + } +} + +static void LoadLevel_InitElements(struct LevelInfo *level) +{ + LoadLevel_InitStandardElements(level); + + if (level->file_has_custom_elements) + LoadLevel_InitCustomElements(level); - /* initialize element properties for level editor etc. */ + // initialize element properties for level editor etc. InitElementPropertiesEngine(level->game_version); - InitElementPropertiesAfterLoading(level->game_version); InitElementPropertiesGfxElement(); } -static void LoadLevel_InitPlayfield(struct LevelInfo *level, char *filename) +static void LoadLevel_InitPlayfield(struct LevelInfo *level) { int x, y; - /* map elements that have changed in newer versions */ + // map elements that have changed in newer versions for (y = 0; y < level->fieldy; y++) for (x = 0; x < level->fieldx; x++) level->field[x][y] = getMappedElementByVersion(level->field[x][y], level->game_version); - /* copy elements to runtime playfield array */ + // clear unused playfield data (nicer if level gets resized in editor) + for (x = 0; x < MAX_LEV_FIELDX; x++) + for (y = 0; y < MAX_LEV_FIELDY; y++) + if (x >= level->fieldx || y >= level->fieldy) + level->field[x][y] = EL_EMPTY; + + // copy elements to runtime playfield array for (x = 0; x < MAX_LEV_FIELDX; x++) for (y = 0; y < MAX_LEV_FIELDY; y++) Feld[x][y] = level->field[x][y]; - /* initialize level size variables for faster access */ + // initialize level size variables for faster access lev_fieldx = level->fieldx; lev_fieldy = level->fieldy; - /* determine border element for this level */ + // determine border element for this level if (level->file_info.type == LEVEL_FILE_TYPE_DC) - BorderElement = EL_EMPTY; /* (in editor, SetBorderElement() is used) */ + BorderElement = EL_EMPTY; // (in editor, SetBorderElement() is used) else SetBorderElement(); } -static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename) +static void LoadLevel_InitNativeEngines(struct LevelInfo *level) { struct LevelFileInfo *level_file_info = &level->file_info; @@ -6750,38 +6632,80 @@ static void LoadLevel_InitNativeEngines(struct LevelInfo *level,char *filename) CopyNativeLevel_RND_to_Native(level); } +static void LoadLevelTemplate_LoadAndInit(void) +{ + LoadLevelFromFileInfo(&level_template, &level_template.file_info, FALSE); + + LoadLevel_InitVersion(&level_template); + LoadLevel_InitElements(&level_template); + + ActivateLevelTemplate(); +} + void LoadLevelTemplate(int nr) { - char *filename; + if (!fileExists(getGlobalLevelTemplateFilename())) + { + Error(ERR_WARN, "no level template found for this level"); + + return; + } setLevelFileInfo(&level_template.file_info, nr); - filename = level_template.file_info.filename; - LoadLevelFromFileInfo(&level_template, &level_template.file_info); + LoadLevelTemplate_LoadAndInit(); +} - LoadLevel_InitVersion(&level_template, filename); - LoadLevel_InitElements(&level_template, filename); +static void LoadNetworkLevelTemplate(struct NetworkLevelInfo *network_level) +{ + copyLevelFileInfo(&network_level->tmpl_info, &level_template.file_info); - ActivateLevelTemplate(); + LoadLevelTemplate_LoadAndInit(); +} + +static void LoadLevel_LoadAndInit(struct NetworkLevelInfo *network_level) +{ + LoadLevelFromFileInfo(&level, &level.file_info, FALSE); + + if (level.use_custom_template) + { + if (network_level != NULL) + LoadNetworkLevelTemplate(network_level); + else + LoadLevelTemplate(-1); + } + + LoadLevel_InitVersion(&level); + LoadLevel_InitElements(&level); + LoadLevel_InitPlayfield(&level); + + LoadLevel_InitNativeEngines(&level); } void LoadLevel(int nr) { - char *filename; + SetLevelSetInfo(leveldir_current->identifier, nr); setLevelFileInfo(&level.file_info, nr); - filename = level.file_info.filename; - LoadLevelFromFileInfo(&level, &level.file_info); + LoadLevel_LoadAndInit(NULL); +} + +void LoadLevelInfoOnly(int nr) +{ + setLevelFileInfo(&level.file_info, nr); - if (level.use_custom_template) - LoadLevelTemplate(-1); + LoadLevelFromFileInfo(&level, &level.file_info, TRUE); +} + +void LoadNetworkLevel(struct NetworkLevelInfo *network_level) +{ + SetLevelSetInfo(network_level->leveldir_identifier, + network_level->file_info.nr); - LoadLevel_InitVersion(&level, filename); - LoadLevel_InitElements(&level, filename); - LoadLevel_InitPlayfield(&level, filename); + copyLevelFileInfo(&network_level->file_info, &level.file_info); - LoadLevel_InitNativeEngines(&level, filename); + LoadLevel_LoadAndInit(network_level); } static int SaveLevel_VERS(FILE *file, struct LevelInfo *level) @@ -6805,7 +6729,7 @@ static int SaveLevel_DATE(FILE *file, struct LevelInfo *level) return chunk_size; } -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_HEAD(FILE *file, struct LevelInfo *level) { int i, x, y; @@ -6879,7 +6803,7 @@ static int SaveLevel_AUTH(FILE *file, struct LevelInfo *level) return chunk_size; } -#if 0 +#if ENABLE_HISTORIC_CHUNKS static int SaveLevel_BODY(FILE *file, struct LevelInfo *level) { int chunk_size = 0; @@ -6908,7 +6832,7 @@ static int SaveLevel_BODY(FILE *file, struct LevelInfo *level) return chunk_size; } -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) { int i, x, y; @@ -6928,7 +6852,7 @@ static void SaveLevel_CONT(FILE *file, struct LevelInfo *level) } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) { int i, x, y; @@ -6960,7 +6884,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) } else { - /* chunk header already written -- write empty chunk data */ + // chunk header already written -- write empty chunk data WriteUnusedBytesToFile(file, LEVEL_CHUNK_CNT2_SIZE); Error(ERR_WARN, "cannot save content for element '%d'", element); @@ -6981,7 +6905,7 @@ static void SaveLevel_CNT2(FILE *file, struct LevelInfo *level, int element) } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static int SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element) { int envelope_nr = element - EL_ENVELOPE_1; @@ -7004,7 +6928,7 @@ static int SaveLevel_CNT3(FILE *file, struct LevelInfo *level, int element) } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, int num_changed_custom_elements) { @@ -7030,12 +6954,12 @@ static void SaveLevel_CUS1(FILE *file, struct LevelInfo *level, } } - if (check != num_changed_custom_elements) /* should not happen */ + if (check != num_changed_custom_elements) // should not happen Error(ERR_WARN, "inconsistent number of custom element properties"); } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, int num_changed_custom_elements) { @@ -7059,12 +6983,12 @@ static void SaveLevel_CUS2(FILE *file, struct LevelInfo *level, } } - if (check != num_changed_custom_elements) /* should not happen */ + if (check != num_changed_custom_elements) // should not happen Error(ERR_WARN, "inconsistent number of custom target elements"); } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, int num_changed_custom_elements) { @@ -7088,7 +7012,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile32BitBE(file, ei->properties[EP_BITFIELD_BASE_NR]); - /* some free bytes for future properties and padding */ + // some free bytes for future properties and padding WriteUnusedBytesToFile(file, 7); putFile8Bit(file, ei->use_gfx_element); @@ -7134,7 +7058,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, putFile8Bit(file, ei->slippery_type); - /* some free bytes for future properties and padding */ + // some free bytes for future properties and padding WriteUnusedBytesToFile(file, LEVEL_CPART_CUS3_UNUSED); } @@ -7142,18 +7066,18 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, } } - if (check != num_changed_custom_elements) /* should not happen */ + if (check != num_changed_custom_elements) // should not happen Error(ERR_WARN, "inconsistent number of custom element properties"); } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) { struct ElementInfo *ei = &element_info[element]; int i, j, x, y; - /* ---------- custom element base property values (96 bytes) ------------- */ + // ---------- custom element base property values (96 bytes) ---------------- putFile16BitBE(file, element); @@ -7162,7 +7086,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile32BitBE(file, ei->properties[EP_BITFIELD_BASE_NR]); - WriteUnusedBytesToFile(file, 4); /* reserved for more base properties */ + WriteUnusedBytesToFile(file, 4); // reserved for more base properties putFile8Bit(file, ei->num_change_pages); @@ -7183,7 +7107,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile16BitBE(file, ei->move_delay_fixed); putFile16BitBE(file, ei->move_delay_random); - /* bits 0 - 15 of "move_pattern" ... */ + // bits 0 - 15 of "move_pattern" ... putFile16BitBE(file, ei->move_pattern & 0xffff); putFile8Bit(file, ei->move_direction_initial); putFile8Bit(file, ei->move_stepsize); @@ -7198,7 +7122,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile16BitBE(file, ei->move_leave_element); putFile8Bit(file, ei->move_leave_type); - /* ... bits 16 - 31 of "move_pattern" (not nice, but downward compatible) */ + // ... bits 16 - 31 of "move_pattern" (not nice, but downward compatible) putFile16BitBE(file, (ei->move_pattern >> 16) & 0xffff); putFile8Bit(file, ei->access_direction); @@ -7207,17 +7131,17 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, ei->ignition_delay); putFile8Bit(file, ei->explosion_type); - /* some free bytes for future custom property values and padding */ + // some free bytes for future custom property values and padding WriteUnusedBytesToFile(file, 1); - /* ---------- change page property values (48 bytes) --------------------- */ + // ---------- change page property values (48 bytes) ------------------------ for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; unsigned int event_bits; - /* bits 0 - 31 of "has_event[]" ... */ + // bits 0 - 31 of "has_event[]" ... event_bits = 0; for (j = 0; j < MIN(NUM_CHANGE_EVENTS, 32); j++) if (change->has_event[j]) @@ -7257,7 +7181,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, change->action_mode); putFile16BitBE(file, change->action_arg); - /* ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible) */ + // ... bits 32 - 39 of "has_event[]" (not nice, but downward compatible) event_bits = 0; for (j = 32; j < NUM_CHANGE_EVENTS; j++) if (change->has_event[j]) @@ -7267,7 +7191,7 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) } #endif -#if 0 +#if ENABLE_HISTORIC_CHUNKS static void SaveLevel_GRP1(FILE *file, struct LevelInfo *level, int element) { struct ElementInfo *ei = &element_info[element]; @@ -7286,7 +7210,7 @@ static void SaveLevel_GRP1(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, group->choice_mode); - /* some free bytes for future values and padding */ + // some free bytes for future values and padding WriteUnusedBytesToFile(file, 3); for (i = 0; i < MAX_ELEMENTS_IN_GROUP; i++) @@ -7312,11 +7236,11 @@ static int SaveLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *entry, int value = (data_type == TYPE_BOOLEAN ? *(boolean *)value_ptr : *(int *)value_ptr); - /* check if any settings have been modified before saving them */ + // check if any settings have been modified before saving them if (value != default_value) modified = TRUE; - /* do not save if explicitly told or if unmodified default settings */ + // do not save if explicitly told or if unmodified default settings if ((save_type == SAVE_CONF_NEVER) || (save_type == SAVE_CONF_WHEN_CHANGED && !modified)) return 0; @@ -7337,11 +7261,11 @@ static int SaveLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *entry, int string_length = strlen(string); int i; - /* check if any settings have been modified before saving them */ + // check if any settings have been modified before saving them if (!strEqual(string, default_string)) modified = TRUE; - /* do not save if explicitly told or if unmodified default settings */ + // do not save if explicitly told or if unmodified default settings if ((save_type == SAVE_CONF_NEVER) || (save_type == SAVE_CONF_WHEN_CHANGED && !modified)) return 0; @@ -7361,12 +7285,12 @@ static int SaveLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *entry, int num_elements = *(int *)(entry->num_entities); int i; - /* check if any settings have been modified before saving them */ + // 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; - /* do not save if explicitly told or if unmodified default settings */ + // do not save if explicitly told or if unmodified default settings if ((save_type == SAVE_CONF_NEVER) || (save_type == SAVE_CONF_WHEN_CHANGED && !modified)) return 0; @@ -7386,14 +7310,14 @@ static int SaveLevel_MicroChunk(FILE *file, struct LevelFileConfigInfo *entry, int num_contents = *(int *)(entry->num_entities); int i, x, y; - /* check if any settings have been modified before saving them */ + // 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; - /* do not save if explicitly told or if unmodified default settings */ + // do not save if explicitly told or if unmodified default settings if ((save_type == SAVE_CONF_NEVER) || (save_type == SAVE_CONF_WHEN_CHANGED && !modified)) return 0; @@ -7418,7 +7342,7 @@ static int SaveLevel_INFO(FILE *file, struct LevelInfo *level) int chunk_size = 0; int i; - li = *level; /* copy level data into temporary buffer */ + li = *level; // copy level data into temporary buffer for (i = 0; chunk_config_INFO[i].data_type != -1; i++) chunk_size += SaveLevel_MicroChunk(file, &chunk_config_INFO[i], FALSE); @@ -7431,7 +7355,7 @@ static int SaveLevel_ELEM(FILE *file, struct LevelInfo *level) int chunk_size = 0; int i; - li = *level; /* copy level data into temporary buffer */ + li = *level; // copy level data into temporary buffer for (i = 0; chunk_config_ELEM[i].data_type != -1; i++) chunk_size += SaveLevel_MicroChunk(file, &chunk_config_ELEM[i], TRUE); @@ -7447,7 +7371,7 @@ static int SaveLevel_NOTE(FILE *file, struct LevelInfo *level, int element) chunk_size += putFile16BitBE(file, element); - /* copy envelope data into temporary buffer */ + // copy envelope data into temporary buffer xx_envelope = level->envelope[envelope_nr]; for (i = 0; chunk_config_NOTE[i].data_type != -1; i++) @@ -7464,17 +7388,11 @@ static int SaveLevel_CUSX(FILE *file, struct LevelInfo *level, int element) chunk_size += putFile16BitBE(file, element); - xx_ei = *ei; /* copy element data into temporary buffer */ + xx_ei = *ei; // copy element data into temporary buffer - /* set default description string for this specific element */ + // set default description string for this specific element strcpy(xx_default_description, getDefaultElementDescription(ei)); -#if 0 - /* 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); @@ -7484,7 +7402,7 @@ static int SaveLevel_CUSX(FILE *file, struct LevelInfo *level, int element) xx_current_change_page = i; - xx_change = *change; /* copy change data into temporary buffer */ + xx_change = *change; // copy change data into temporary buffer resetEventBits(); setEventBitsFromEventFlags(change); @@ -7506,10 +7424,10 @@ static int SaveLevel_GRPX(FILE *file, struct LevelInfo *level, int element) chunk_size += putFile16BitBE(file, element); - xx_ei = *ei; /* copy element data into temporary buffer */ - xx_group = *group; /* copy group data into temporary buffer */ + xx_ei = *ei; // copy element data into temporary buffer + xx_group = *group; // copy group data into temporary buffer - /* set default description string for this specific element */ + // set default description string for this specific element strcpy(xx_default_description, getDefaultElementDescription(ei)); for (i = 0; chunk_config_GRPX[i].data_type != -1; i++) @@ -7518,7 +7436,8 @@ static int SaveLevel_GRPX(FILE *file, struct LevelInfo *level, int element) return chunk_size; } -static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) +static void SaveLevelFromFilename(struct LevelInfo *level, char *filename, + boolean save_as_template) { int chunk_size; int i; @@ -7563,7 +7482,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) SaveLevel_BODY(file, level); chunk_size = SaveLevel_ELEM(NULL, level); - if (chunk_size > LEVEL_CHUNK_ELEM_UNCHANGED) /* save if changed */ + if (chunk_size > LEVEL_CHUNK_ELEM_UNCHANGED) // save if changed { putFileChunkBE(file, "ELEM", chunk_size); SaveLevel_ELEM(file, level); @@ -7574,22 +7493,22 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) int element = EL_ENVELOPE_1 + i; chunk_size = SaveLevel_NOTE(NULL, level, element); - if (chunk_size > LEVEL_CHUNK_NOTE_UNCHANGED) /* save if changed */ + if (chunk_size > LEVEL_CHUNK_NOTE_UNCHANGED) // save if changed { putFileChunkBE(file, "NOTE", chunk_size); SaveLevel_NOTE(file, level, element); } } - /* if not using template level, check for non-default custom/group elements */ - if (!level->use_custom_template) + // if not using template level, check for non-default custom/group elements + if (!level->use_custom_template || save_as_template) { for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; chunk_size = SaveLevel_CUSX(NULL, level, element); - if (chunk_size > LEVEL_CHUNK_CUSX_UNCHANGED) /* save if changed */ + if (chunk_size > LEVEL_CHUNK_CUSX_UNCHANGED) // save if changed { putFileChunkBE(file, "CUSX", chunk_size); SaveLevel_CUSX(file, level, element); @@ -7601,7 +7520,7 @@ static void SaveLevelFromFilename(struct LevelInfo *level, char *filename) int element = EL_GROUP_START + i; chunk_size = SaveLevel_GRPX(NULL, level, element); - if (chunk_size > LEVEL_CHUNK_GRPX_UNCHANGED) /* save if changed */ + if (chunk_size > LEVEL_CHUNK_GRPX_UNCHANGED) // save if changed { putFileChunkBE(file, "GRPX", chunk_size); SaveLevel_GRPX(file, level, element); @@ -7618,14 +7537,14 @@ void SaveLevel(int nr) { char *filename = getDefaultLevelFilename(nr); - SaveLevelFromFilename(&level, filename); + SaveLevelFromFilename(&level, filename, FALSE); } -void SaveLevelTemplate() +void SaveLevelTemplate(void) { - char *filename = getDefaultLevelFilename(-1); + char *filename = getLocalLevelTemplateFilename(); - SaveLevelFromFilename(&level, filename); + SaveLevelFromFilename(&level, filename, TRUE); } boolean SaveLevelChecked(int nr) @@ -7634,12 +7553,12 @@ boolean SaveLevelChecked(int nr) boolean new_level = !fileExists(filename); boolean level_saved = FALSE; - if (new_level || Request("Save this level and kill the old ?", REQ_ASK)) + if (new_level || Request("Save this level and kill the old?", REQ_ASK)) { SaveLevel(nr); if (new_level) - Request("Level saved !", REQ_CONFIRM); + Request("Level saved!", REQ_CONFIRM); level_saved = TRUE; } @@ -7649,61 +7568,61 @@ boolean SaveLevelChecked(int nr) void DumpLevel(struct LevelInfo *level) { - if (level->no_valid_file) + if (level->no_level_file || level->no_valid_file) { Error(ERR_WARN, "cannot dump -- no valid level file found"); return; } - printf_line("-", 79); - printf("Level xxx (file version %08d, game version %08d)\n", - level->file_version, level->game_version); - printf_line("-", 79); + PrintLine("-", 79); + Print("Level xxx (file version %08d, game version %08d)\n", + level->file_version, level->game_version); + PrintLine("-", 79); - printf("Level author: '%s'\n", level->author); - printf("Level title: '%s'\n", level->name); - printf("\n"); - printf("Playfield size: %d x %d\n", level->fieldx, level->fieldy); - printf("\n"); - printf("Level time: %d seconds\n", level->time); - printf("Gems needed: %d\n", level->gems_needed); - printf("\n"); - printf("Time for magic wall: %d seconds\n", level->time_magic_wall); - printf("Time for wheel: %d seconds\n", level->time_wheel); - printf("Time for light: %d seconds\n", level->time_light); - printf("Time for timegate: %d seconds\n", level->time_timegate); - printf("\n"); - printf("Amoeba speed: %d\n", level->amoeba_speed); - printf("\n"); + Print("Level author: '%s'\n", level->author); + Print("Level title: '%s'\n", level->name); + Print("\n"); + Print("Playfield size: %d x %d\n", level->fieldx, level->fieldy); + Print("\n"); + Print("Level time: %d seconds\n", level->time); + Print("Gems needed: %d\n", level->gems_needed); + Print("\n"); + Print("Time for magic wall: %d seconds\n", level->time_magic_wall); + Print("Time for wheel: %d seconds\n", level->time_wheel); + Print("Time for light: %d seconds\n", level->time_light); + Print("Time for timegate: %d seconds\n", level->time_timegate); + Print("\n"); + Print("Amoeba speed: %d\n", level->amoeba_speed); + Print("\n"); - 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")); - printf("use spring bug: %s\n", (level->use_spring_bug ? "yes" : "no")); - printf("use step counter: %s\n", (level->use_step_counter ? "yes" : "no")); + Print("EM style slippery gems: %s\n", (level->em_slippery_gems ? "yes" : "no")); + Print("Player blocks last field: %s\n", (level->block_last_field ? "yes" : "no")); + Print("SP player blocks last field: %s\n", (level->sp_block_last_field ? "yes" : "no")); + Print("use spring bug: %s\n", (level->use_spring_bug ? "yes" : "no")); + Print("use step counter: %s\n", (level->use_step_counter ? "yes" : "no")); - printf_line("-", 79); + PrintLine("-", 79); } -/* ========================================================================= */ -/* tape file functions */ -/* ========================================================================= */ +// ============================================================================ +// tape file functions +// ============================================================================ -static void setTapeInfoToDefaults() +static void setTapeInfoToDefaults(void) { int i; - /* always start with reliable default values (empty tape) */ + // always start with reliable default values (empty tape) TapeErase(); - /* default values (also for pre-1.2 tapes) with only the first player */ + // default values (also for pre-1.2 tapes) with only the first player tape.player_participates[0] = TRUE; for (i = 1; i < MAX_PLAYERS; i++) tape.player_participates[i] = FALSE; - /* at least one (default: the first) player participates in every tape */ + // at least one (default: the first) player participates in every tape tape.num_participating_players = 1; tape.level_nr = level_nr; @@ -7717,7 +7636,7 @@ static void setTapeInfoToDefaults() tape.no_valid_file = FALSE; } -static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape) +static int LoadTape_VERS(File *file, int chunk_size, struct TapeInfo *tape) { tape->file_version = getFileVersion(file); tape->game_version = getFileVersion(file); @@ -7725,7 +7644,7 @@ static int LoadTape_VERS(FILE *file, int chunk_size, struct TapeInfo *tape) return chunk_size; } -static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) +static int LoadTape_HEAD(File *file, int chunk_size, struct TapeInfo *tape) { int i; @@ -7733,13 +7652,13 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) tape->date = getFile32BitBE(file); tape->length = getFile32BitBE(file); - /* read header fields that are new since version 1.2 */ + // read header fields that are new since version 1.2 if (tape->file_version >= FILE_VERSION_1_2) { byte store_participating_players = getFile8Bit(file); int engine_version; - /* since version 1.2, tapes store which players participate in the tape */ + // since version 1.2, tapes store which players participate in the tape tape->num_participating_players = 0; for (i = 0; i < MAX_PLAYERS; i++) { @@ -7752,6 +7671,8 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) } } + tape->use_mouse = (getFile8Bit(file) == 1 ? TRUE : FALSE); + ReadUnusedBytesFromFile(file, TAPE_CHUNK_HEAD_UNUSED); engine_version = getFileVersion(file); @@ -7764,7 +7685,7 @@ static int LoadTape_HEAD(FILE *file, int chunk_size, struct TapeInfo *tape) return chunk_size; } -static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape) +static int LoadTape_INFO(File *file, int chunk_size, struct TapeInfo *tape) { int level_identifier_size; int i; @@ -7784,11 +7705,12 @@ static int LoadTape_INFO(FILE *file, int chunk_size, struct TapeInfo *tape) return chunk_size; } -static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) +static int LoadTape_BODY(File *file, int chunk_size, struct TapeInfo *tape) { int i, j; - int chunk_size_expected = - (tape->num_participating_players + 1) * tape->length; + int tape_pos_size = + (tape->use_mouse ? 3 : tape->num_participating_players) + 1; + int chunk_size_expected = tape_pos_size * tape->length; if (chunk_size_expected != chunk_size) { @@ -7799,22 +7721,42 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { if (i >= MAX_TAPE_LEN) + { + Error(ERR_WARN, "tape truncated -- size exceeds maximum tape size %d", + MAX_TAPE_LEN); + + // tape too large; read and ignore remaining tape data from this chunk + for (;i < tape->length; i++) + ReadUnusedBytesFromFile(file, tape->num_participating_players + 1); + break; + } + + if (tape->use_mouse) + { + tape->pos[i].action[TAPE_ACTION_LX] = getFile8Bit(file); + tape->pos[i].action[TAPE_ACTION_LY] = getFile8Bit(file); + tape->pos[i].action[TAPE_ACTION_BUTTON] = getFile8Bit(file); - for (j = 0; j < MAX_PLAYERS; j++) + tape->pos[i].action[TAPE_ACTION_UNUSED] = 0; + } + else { - tape->pos[i].action[j] = MV_NONE; + for (j = 0; j < MAX_PLAYERS; j++) + { + tape->pos[i].action[j] = MV_NONE; - if (tape->player_participates[j]) - tape->pos[i].action[j] = getFile8Bit(file); + if (tape->player_participates[j]) + tape->pos[i].action[j] = getFile8Bit(file); + } } tape->pos[i].delay = getFile8Bit(file); if (tape->file_version == FILE_VERSION_1_0) { - /* eliminate possible diagonal moves in old tapes */ - /* this is only for backward compatibility */ + // eliminate possible diagonal moves in old tapes + // this is only for backward compatibility byte joy_dir[4] = { JOY_LEFT, JOY_RIGHT, JOY_UP, JOY_DOWN }; byte action = tape->pos[i].action[0]; @@ -7840,15 +7782,15 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) } else if (tape->file_version < FILE_VERSION_2_0) { - /* convert pre-2.0 tapes to new tape format */ + // convert pre-2.0 tapes to new tape format if (tape->pos[i].delay > 1) { - /* action part */ + // action part tape->pos[i + 1] = tape->pos[i]; tape->pos[i + 1].delay = 1; - /* delay part */ + // delay part for (j = 0; j < MAX_PLAYERS; j++) tape->pos[i].action[j] = MV_NONE; tape->pos[i].delay--; @@ -7858,27 +7800,108 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) } } - if (feof(file)) + if (checkEndOfFile(file)) break; } if (i != tape->length) - chunk_size = (tape->num_participating_players + 1) * i; + chunk_size = tape_pos_size * i; return chunk_size; } +static void LoadTape_SokobanSolution(char *filename) +{ + File *file; + int move_delay = TILESIZE / level.initial_player_stepsize[0]; + + if (!(file = openFile(filename, MODE_READ))) + { + tape.no_valid_file = TRUE; + + return; + } + + while (!checkEndOfFile(file)) + { + unsigned char c = getByteFromFile(file); + + if (checkEndOfFile(file)) + break; + + switch (c) + { + case 'u': + case 'U': + tape.pos[tape.length].action[0] = MV_UP; + tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0); + tape.length++; + break; + + case 'd': + case 'D': + tape.pos[tape.length].action[0] = MV_DOWN; + tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0); + tape.length++; + break; + + case 'l': + case 'L': + tape.pos[tape.length].action[0] = MV_LEFT; + tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0); + tape.length++; + break; + + case 'r': + case 'R': + tape.pos[tape.length].action[0] = MV_RIGHT; + tape.pos[tape.length].delay = move_delay + (c < 'a' ? 2 : 0); + tape.length++; + break; + + case '\n': + case '\r': + case '\t': + case ' ': + // ignore white-space characters + break; + + default: + tape.no_valid_file = TRUE; + + Error(ERR_WARN, "unsupported Sokoban solution file '%s' ['%d']", filename, c); + + break; + } + } + + closeFile(file); + + if (tape.no_valid_file) + return; + + tape.length_frames = GetTapeLengthFrames(); + tape.length_seconds = GetTapeLengthSeconds(); +} + void LoadTapeFromFilename(char *filename) { char cookie[MAX_LINE_LEN]; char chunk_name[CHUNK_ID_LEN + 1]; - FILE *file; + File *file; int chunk_size; - /* always start with reliable default values */ + // always start with reliable default values setTapeInfoToDefaults(); - if (!(file = fopen(filename, MODE_READ))) + if (strSuffix(filename, ".sln")) + { + LoadTape_SokobanSolution(filename); + + return; + } + + if (!(file = openFile(filename, MODE_READ))) { tape.no_valid_file = TRUE; @@ -7888,7 +7911,7 @@ void LoadTapeFromFilename(char *filename) getFileChunkBE(file, chunk_name, NULL); if (strEqual(chunk_name, "RND1")) { - getFile32BitBE(file); /* not used */ + getFile32BitBE(file); // not used getFileChunkBE(file, chunk_name, NULL); if (!strEqual(chunk_name, "TAPE")) @@ -7896,14 +7919,17 @@ void LoadTapeFromFilename(char *filename) tape.no_valid_file = TRUE; Error(ERR_WARN, "unknown format of tape file '%s'", filename); - fclose(file); + + closeFile(file); + return; } } - else /* check for pre-2.0 file format with cookie string */ + else // check for pre-2.0 file format with cookie string { strcpy(cookie, chunk_name); - fgets(&cookie[4], MAX_LINE_LEN - 4, file); + if (getStringFromFile(file, &cookie[4], MAX_LINE_LEN - 4) == NULL) + cookie[4] = '\0'; if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; @@ -7912,7 +7938,9 @@ void LoadTapeFromFilename(char *filename) tape.no_valid_file = TRUE; Error(ERR_WARN, "unknown format of tape file '%s'", filename); - fclose(file); + + closeFile(file); + return; } @@ -7921,17 +7949,19 @@ void LoadTapeFromFilename(char *filename) tape.no_valid_file = TRUE; Error(ERR_WARN, "unsupported version of tape file '%s'", filename); - fclose(file); + + closeFile(file); + return; } - /* pre-2.0 tape files have no game version, so use file version here */ + // pre-2.0 tape files have no game version, so use file version here tape.game_version = tape.file_version; } if (tape.file_version < FILE_VERSION_1_2) { - /* tape files from versions before 1.2.0 without chunk structure */ + // tape files from versions before 1.2.0 without chunk structure LoadTape_HEAD(file, TAPE_CHUNK_HEAD_SIZE, &tape); LoadTape_BODY(file, 2 * tape.length, &tape); } @@ -7941,7 +7971,7 @@ void LoadTapeFromFilename(char *filename) { char *name; int size; - int (*loader)(FILE *, int, struct TapeInfo *); + int (*loader)(File *, int, struct TapeInfo *); } chunk_info[] = { @@ -7975,13 +8005,13 @@ void LoadTapeFromFilename(char *filename) } else { - /* call function to load this tape chunk */ + // call function to load this tape chunk int chunk_size_expected = (chunk_info[i].loader)(file, chunk_size, &tape); - /* the size of some chunks cannot be checked before reading other - chunks first (like "HEAD" and "BODY") that contain some header - information, so check them here */ + // the size of some chunks cannot be checked before reading other + // chunks first (like "HEAD" and "BODY") that contain some header + // information, so check them here if (chunk_size_expected != chunk_size) { Error(ERR_WARN, "wrong size (%d) of chunk '%s' in tape file '%s'", @@ -7991,13 +8021,14 @@ void LoadTapeFromFilename(char *filename) } } - fclose(file); + closeFile(file); - tape.length_seconds = GetTapeLength(); + tape.length_frames = GetTapeLengthFrames(); + tape.length_seconds = GetTapeLengthSeconds(); #if 0 - printf("::: tape file version: %d\n", tape.file_version); - printf("::: tape game version: %d\n", tape.game_version); + printf("::: tape file version: %d\n", tape.file_version); + printf("::: tape game version: %d\n", tape.game_version); printf("::: tape engine version: %d\n", tape.engine_version); #endif } @@ -8014,6 +8045,11 @@ void LoadSolutionTape(int nr) char *filename = getSolutionTapeFilename(nr); LoadTapeFromFilename(filename); + + if (TAPE_IS_EMPTY(tape) && + level.game_engine_type == GAME_ENGINE_TYPE_SP && + level.native_sp_level->demo.is_available) + CopyNativeTape_SP_to_RND(&level); } static void SaveTape_VERS(FILE *file, struct TapeInfo *tape) @@ -8027,7 +8063,7 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) int i; byte store_participating_players = 0; - /* set bits for participating players for compact storage */ + // set bits for participating players for compact storage for (i = 0; i < MAX_PLAYERS; i++) if (tape->player_participates[i]) store_participating_players |= (1 << i); @@ -8038,7 +8074,9 @@ static void SaveTape_HEAD(FILE *file, struct TapeInfo *tape) putFile8Bit(file, store_participating_players); - /* unused bytes not at the end here for 4-byte alignment of engine_version */ + putFile8Bit(file, (tape->use_mouse ? 1 : 0)); + + // unused bytes not at the end here for 4-byte alignment of engine_version WriteUnusedBytesToFile(file, TAPE_CHUNK_HEAD_UNUSED); putFileVersion(file, tape->engine_version); @@ -8063,9 +8101,18 @@ static void SaveTape_BODY(FILE *file, struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { - for (j = 0; j < MAX_PLAYERS; j++) - if (tape->player_participates[j]) - putFile8Bit(file, tape->pos[i].action[j]); + if (tape->use_mouse) + { + putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_LX]); + putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_LY]); + putFile8Bit(file, tape->pos[i].action[TAPE_ACTION_BUTTON]); + } + else + { + for (j = 0; j < MAX_PLAYERS; j++) + if (tape->player_participates[j]) + putFile8Bit(file, tape->pos[i].action[j]); + } putFile8Bit(file, tape->pos[i].delay); } @@ -8075,26 +8122,14 @@ void SaveTape(int nr) { char *filename = getTapeFilename(nr); FILE *file; -#if 0 - boolean new_tape = TRUE; -#endif int num_participating_players = 0; + int tape_pos_size; int info_chunk_size; int body_chunk_size; int i; InitTapeDirectory(leveldir_current->subdir); -#if 0 - /* if a tape still exists, ask to overwrite it */ - if (fileExists(filename)) - { - new_tape = FALSE; - if (!Request("Replace old tape ?", REQ_ASK)) - return; - } -#endif - if (!(file = fopen(filename, MODE_WRITE))) { Error(ERR_WARN, "cannot save level recording file '%s'", filename); @@ -8104,13 +8139,15 @@ void SaveTape(int nr) tape.file_version = FILE_VERSION_ACTUAL; tape.game_version = GAME_VERSION_ACTUAL; - /* count number of participating players */ + // count number of participating players for (i = 0; i < MAX_PLAYERS; i++) if (tape.player_participates[i]) num_participating_players++; + tape_pos_size = (tape.use_mouse ? 3 : num_participating_players) + 1; + info_chunk_size = 2 + (strlen(tape.level_identifier) + 1) + 2; - body_chunk_size = (num_participating_players + 1) * tape.length; + body_chunk_size = tape_pos_size * tape.length; putFileChunkBE(file, "RND1", CHUNK_SIZE_UNDEFINED); putFileChunkBE(file, "TAPE", CHUNK_SIZE_NONE); @@ -8132,25 +8169,20 @@ void SaveTape(int nr) SetFilePermissions(filename, PERMS_PRIVATE); tape.changed = FALSE; - -#if 0 - if (new_tape) - Request("Tape saved !", REQ_CONFIRM); -#endif } -boolean SaveTapeChecked(int nr) +static boolean SaveTapeCheckedExt(int nr, char *msg_replace, char *msg_saved) { char *filename = getTapeFilename(nr); boolean new_tape = !fileExists(filename); boolean tape_saved = FALSE; - if (new_tape || Request("Replace old tape ?", REQ_ASK)) + if (new_tape || Request(msg_replace, REQ_ASK)) { SaveTape(nr); if (new_tape) - Request("Tape saved !", REQ_CONFIRM); + Request(msg_saved, REQ_CONFIRM); tape_saved = TRUE; } @@ -8158,6 +8190,17 @@ boolean SaveTapeChecked(int nr) return tape_saved; } +boolean SaveTapeChecked(int nr) +{ + return SaveTapeCheckedExt(nr, "Replace old tape?", "Tape saved!"); +} + +boolean SaveTapeChecked_LevelSolved(int nr) +{ + return SaveTapeCheckedExt(nr, "Level solved! Replace old tape?", + "Level solved! Tape saved!"); +} + void DumpTape(struct TapeInfo *tape) { int tape_frame_counter; @@ -8170,13 +8213,13 @@ void DumpTape(struct TapeInfo *tape) return; } - printf_line("-", 79); - printf("Tape of Level %03d (file version %08d, game version %08d)\n", - tape->level_nr, tape->file_version, tape->game_version); - printf(" (effective engine version %08d)\n", - tape->engine_version); - printf("Level series identifier: '%s'\n", tape->level_identifier); - printf_line("-", 79); + PrintLine("-", 79); + Print("Tape of Level %03d (file version %08d, game version %08d)\n", + tape->level_nr, tape->file_version, tape->game_version); + Print(" (effective engine version %08d)\n", + tape->engine_version); + Print("Level series identifier: '%s'\n", tape->level_identifier); + PrintLine("-", 79); tape_frame_counter = 0; @@ -8185,7 +8228,7 @@ void DumpTape(struct TapeInfo *tape) if (i >= MAX_TAPE_LEN) break; - printf("%04d: ", i); + Print("%04d: ", i); for (j = 0; j < MAX_PLAYERS; j++) { @@ -8193,30 +8236,30 @@ void DumpTape(struct TapeInfo *tape) { int action = tape->pos[i].action[j]; - printf("%d:%02x ", j, action); - printf("[%c%c%c%c|%c%c] - ", - (action & JOY_LEFT ? '<' : ' '), - (action & JOY_RIGHT ? '>' : ' '), - (action & JOY_UP ? '^' : ' '), - (action & JOY_DOWN ? 'v' : ' '), - (action & JOY_BUTTON_1 ? '1' : ' '), - (action & JOY_BUTTON_2 ? '2' : ' ')); + Print("%d:%02x ", j, action); + Print("[%c%c%c%c|%c%c] - ", + (action & JOY_LEFT ? '<' : ' '), + (action & JOY_RIGHT ? '>' : ' '), + (action & JOY_UP ? '^' : ' '), + (action & JOY_DOWN ? 'v' : ' '), + (action & JOY_BUTTON_1 ? '1' : ' '), + (action & JOY_BUTTON_2 ? '2' : ' ')); } } - printf("(%03d) ", tape->pos[i].delay); - printf("[%05d]\n", tape_frame_counter); + Print("(%03d) ", tape->pos[i].delay); + Print("[%05d]\n", tape_frame_counter); tape_frame_counter += tape->pos[i].delay; } - printf_line("-", 79); + PrintLine("-", 79); } -/* ========================================================================= */ -/* score file functions */ -/* ========================================================================= */ +// ============================================================================ +// score file functions +// ============================================================================ void LoadScore(int nr) { @@ -8227,7 +8270,7 @@ void LoadScore(int nr) char *line_ptr; FILE *file; - /* always start with reliable default values */ + // always start with reliable default values for (i = 0; i < MAX_SCORE_ENTRIES; i++) { strcpy(highscore[i].Name, EMPTY_PLAYER_NAME); @@ -8237,8 +8280,9 @@ void LoadScore(int nr) if (!(file = fopen(filename, MODE_READ))) return; - /* check file identifier */ - fgets(cookie, MAX_LINE_LEN, file); + // check file identifier + if (fgets(cookie, MAX_LINE_LEN, file) == NULL) + cookie[0] = '\0'; if (strlen(cookie) > 0 && cookie[strlen(cookie) - 1] == '\n') cookie[strlen(cookie) - 1] = '\0'; @@ -8251,10 +8295,12 @@ void LoadScore(int nr) for (i = 0; i < MAX_SCORE_ENTRIES; i++) { - fscanf(file, "%d", &highscore[i].Score); - fgets(line, MAX_LINE_LEN, file); + if (fscanf(file, "%d", &highscore[i].Score) == EOF) + Error(ERR_WARN, "fscanf() failed; %s", strerror(errno)); + if (fgets(line, MAX_LINE_LEN, file) == NULL) + line[0] = '\0'; - if (line[strlen(line) - 1] == '\n') + if (strlen(line) > 0 && line[strlen(line) - 1] == '\n') line[strlen(line) - 1] = '\0'; for (line_ptr = line; *line_ptr; line_ptr++) @@ -8274,10 +8320,12 @@ void LoadScore(int nr) void SaveScore(int nr) { int i; + int permissions = (program.global_scores ? PERMS_PUBLIC : PERMS_PRIVATE); char *filename = getScoreFilename(nr); FILE *file; - InitScoreDirectory(leveldir_current->subdir); + // used instead of "leveldir_current->subdir" (for network games) + InitScoreDirectory(levelset.identifier); if (!(file = fopen(filename, MODE_WRITE))) { @@ -8292,213 +8340,337 @@ void SaveScore(int nr) fclose(file); - SetFilePermissions(filename, PERMS_PUBLIC); + SetFilePermissions(filename, permissions); } -/* ========================================================================= */ -/* setup file functions */ -/* ========================================================================= */ +// ============================================================================ +// setup file functions +// ============================================================================ #define TOKEN_STR_PLAYER_PREFIX "player_" -/* global setup */ -#define SETUP_TOKEN_PLAYER_NAME 0 -#define SETUP_TOKEN_SOUND 1 -#define SETUP_TOKEN_SOUND_LOOPS 2 -#define SETUP_TOKEN_SOUND_MUSIC 3 -#define SETUP_TOKEN_SOUND_SIMPLE 4 -#define SETUP_TOKEN_TOONS 5 -#define SETUP_TOKEN_SCROLL_DELAY 6 -#define SETUP_TOKEN_SCROLL_DELAY_VALUE 7 -#define SETUP_TOKEN_SOFT_SCROLLING 8 -#define SETUP_TOKEN_FADE_SCREENS 9 -#define SETUP_TOKEN_AUTORECORD 10 -#define SETUP_TOKEN_SHOW_TITLESCREEN 11 -#define SETUP_TOKEN_QUICK_DOORS 12 -#define SETUP_TOKEN_TEAM_MODE 13 -#define SETUP_TOKEN_HANDICAP 14 -#define SETUP_TOKEN_SKIP_LEVELS 15 -#define SETUP_TOKEN_TIME_LIMIT 16 -#define SETUP_TOKEN_FULLSCREEN 17 -#define SETUP_TOKEN_FULLSCREEN_MODE 18 -#define SETUP_TOKEN_ASK_ON_ESCAPE 19 -#define SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR 20 -#define SETUP_TOKEN_QUICK_SWITCH 21 -#define SETUP_TOKEN_INPUT_ON_FOCUS 22 -#define SETUP_TOKEN_PREFER_AGA_GRAPHICS 23 -#define SETUP_TOKEN_GAME_FRAME_DELAY 24 -#define SETUP_TOKEN_GRAPHICS_SET 25 -#define SETUP_TOKEN_SOUNDS_SET 26 -#define SETUP_TOKEN_MUSIC_SET 27 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 28 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 29 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 30 - -#define NUM_GLOBAL_SETUP_TOKENS 31 - -/* editor setup */ -#define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 -#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE 1 -#define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE_CLUB 2 -#define SETUP_TOKEN_EDITOR_EL_MORE 3 -#define SETUP_TOKEN_EDITOR_EL_SOKOBAN 4 -#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX 5 -#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_STEEL_CHARS 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 17 - -/* editor cascade setup */ -#define SETUP_TOKEN_EDITOR_CASCADE_BD 0 -#define SETUP_TOKEN_EDITOR_CASCADE_EM 1 -#define SETUP_TOKEN_EDITOR_CASCADE_EMC 2 -#define SETUP_TOKEN_EDITOR_CASCADE_RND 3 -#define SETUP_TOKEN_EDITOR_CASCADE_SB 4 -#define SETUP_TOKEN_EDITOR_CASCADE_SP 5 -#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_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 15 - -/* shortcut setup */ -#define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 -#define SETUP_TOKEN_SHORTCUT_LOAD_GAME 1 -#define SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE 2 -#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_1 3 -#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_2 4 -#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_3 5 -#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_4 6 -#define SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_ALL 7 - -#define NUM_SHORTCUT_SETUP_TOKENS 8 - -/* player setup */ -#define SETUP_TOKEN_PLAYER_USE_JOYSTICK 0 -#define SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME 1 -#define SETUP_TOKEN_PLAYER_JOY_XLEFT 2 -#define SETUP_TOKEN_PLAYER_JOY_XMIDDLE 3 -#define SETUP_TOKEN_PLAYER_JOY_XRIGHT 4 -#define SETUP_TOKEN_PLAYER_JOY_YUPPER 5 -#define SETUP_TOKEN_PLAYER_JOY_YMIDDLE 6 -#define SETUP_TOKEN_PLAYER_JOY_YLOWER 7 -#define SETUP_TOKEN_PLAYER_JOY_SNAP 8 -#define SETUP_TOKEN_PLAYER_JOY_DROP 9 -#define SETUP_TOKEN_PLAYER_KEY_LEFT 10 -#define SETUP_TOKEN_PLAYER_KEY_RIGHT 11 -#define SETUP_TOKEN_PLAYER_KEY_UP 12 -#define SETUP_TOKEN_PLAYER_KEY_DOWN 13 -#define SETUP_TOKEN_PLAYER_KEY_SNAP 14 -#define SETUP_TOKEN_PLAYER_KEY_DROP 15 - -#define NUM_PLAYER_SETUP_TOKENS 16 - -/* system setup */ -#define SETUP_TOKEN_SYSTEM_SDL_VIDEODRIVER 0 -#define SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER 1 -#define SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE 2 - -#define NUM_SYSTEM_SETUP_TOKENS 3 - -/* options setup */ -#define SETUP_TOKEN_OPTIONS_VERBOSE 0 - -#define NUM_OPTIONS_SETUP_TOKENS 1 +// global setup +enum +{ + SETUP_TOKEN_PLAYER_NAME = 0, + SETUP_TOKEN_SOUND, + SETUP_TOKEN_SOUND_LOOPS, + SETUP_TOKEN_SOUND_MUSIC, + SETUP_TOKEN_SOUND_SIMPLE, + SETUP_TOKEN_TOONS, + SETUP_TOKEN_SCROLL_DELAY, + SETUP_TOKEN_SCROLL_DELAY_VALUE, + SETUP_TOKEN_ENGINE_SNAPSHOT_MODE, + SETUP_TOKEN_ENGINE_SNAPSHOT_MEMORY, + SETUP_TOKEN_FADE_SCREENS, + SETUP_TOKEN_AUTORECORD, + SETUP_TOKEN_SHOW_TITLESCREEN, + SETUP_TOKEN_QUICK_DOORS, + SETUP_TOKEN_TEAM_MODE, + SETUP_TOKEN_HANDICAP, + SETUP_TOKEN_SKIP_LEVELS, + SETUP_TOKEN_INCREMENT_LEVELS, + SETUP_TOKEN_AUTO_PLAY_NEXT_LEVEL, + SETUP_TOKEN_SKIP_SCORES_AFTER_GAME, + SETUP_TOKEN_TIME_LIMIT, + SETUP_TOKEN_FULLSCREEN, + SETUP_TOKEN_WINDOW_SCALING_PERCENT, + SETUP_TOKEN_WINDOW_SCALING_QUALITY, + SETUP_TOKEN_SCREEN_RENDERING_MODE, + SETUP_TOKEN_VSYNC_MODE, + SETUP_TOKEN_ASK_ON_ESCAPE, + SETUP_TOKEN_ASK_ON_ESCAPE_EDITOR, + SETUP_TOKEN_ASK_ON_GAME_OVER, + SETUP_TOKEN_QUICK_SWITCH, + SETUP_TOKEN_INPUT_ON_FOCUS, + SETUP_TOKEN_PREFER_AGA_GRAPHICS, + SETUP_TOKEN_GAME_SPEED_EXTENDED, + SETUP_TOKEN_GAME_FRAME_DELAY, + SETUP_TOKEN_SP_SHOW_BORDER_ELEMENTS, + SETUP_TOKEN_SMALL_GAME_GRAPHICS, + SETUP_TOKEN_SHOW_SNAPSHOT_BUTTONS, + SETUP_TOKEN_GRAPHICS_SET, + SETUP_TOKEN_SOUNDS_SET, + SETUP_TOKEN_MUSIC_SET, + SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS, + SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS, + SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC, + SETUP_TOKEN_VOLUME_SIMPLE, + SETUP_TOKEN_VOLUME_LOOPS, + SETUP_TOKEN_VOLUME_MUSIC, + SETUP_TOKEN_NETWORK_MODE, + SETUP_TOKEN_NETWORK_PLAYER_NR, + SETUP_TOKEN_NETWORK_SERVER_HOSTNAME, + SETUP_TOKEN_TOUCH_CONTROL_TYPE, + SETUP_TOKEN_TOUCH_MOVE_DISTANCE, + SETUP_TOKEN_TOUCH_DROP_DISTANCE, + SETUP_TOKEN_TOUCH_TRANSPARENCY, + SETUP_TOKEN_TOUCH_DRAW_OUTLINED, + SETUP_TOKEN_TOUCH_DRAW_PRESSED, + SETUP_TOKEN_TOUCH_GRID_XSIZE_0, + SETUP_TOKEN_TOUCH_GRID_YSIZE_0, + SETUP_TOKEN_TOUCH_GRID_XSIZE_1, + SETUP_TOKEN_TOUCH_GRID_YSIZE_1, + + NUM_GLOBAL_SETUP_TOKENS +}; + +// auto setup +enum +{ + SETUP_TOKEN_AUTO_EDITOR_ZOOM_TILESIZE = 0, + + NUM_AUTO_SETUP_TOKENS +}; + +// editor setup +enum +{ + SETUP_TOKEN_EDITOR_EL_CLASSIC = 0, + SETUP_TOKEN_EDITOR_EL_CUSTOM, + SETUP_TOKEN_EDITOR_EL_USER_DEFINED, + SETUP_TOKEN_EDITOR_EL_DYNAMIC, + SETUP_TOKEN_EDITOR_EL_HEADLINES, + SETUP_TOKEN_EDITOR_SHOW_ELEMENT_TOKEN, + + NUM_EDITOR_SETUP_TOKENS +}; + +// editor cascade setup +enum +{ + SETUP_TOKEN_EDITOR_CASCADE_BD = 0, + SETUP_TOKEN_EDITOR_CASCADE_EM, + SETUP_TOKEN_EDITOR_CASCADE_EMC, + SETUP_TOKEN_EDITOR_CASCADE_RND, + SETUP_TOKEN_EDITOR_CASCADE_SB, + SETUP_TOKEN_EDITOR_CASCADE_SP, + SETUP_TOKEN_EDITOR_CASCADE_DC, + SETUP_TOKEN_EDITOR_CASCADE_DX, + SETUP_TOKEN_EDITOR_CASCADE_TEXT, + SETUP_TOKEN_EDITOR_CASCADE_STEELTEXT, + SETUP_TOKEN_EDITOR_CASCADE_CE, + SETUP_TOKEN_EDITOR_CASCADE_GE, + SETUP_TOKEN_EDITOR_CASCADE_REF, + SETUP_TOKEN_EDITOR_CASCADE_USER, + SETUP_TOKEN_EDITOR_CASCADE_DYNAMIC, + + NUM_EDITOR_CASCADE_SETUP_TOKENS +}; + +// shortcut setup +enum +{ + SETUP_TOKEN_SHORTCUT_SAVE_GAME = 0, + SETUP_TOKEN_SHORTCUT_LOAD_GAME, + SETUP_TOKEN_SHORTCUT_TOGGLE_PAUSE, + SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_1, + SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_2, + SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_3, + SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_4, + SETUP_TOKEN_SHORTCUT_FOCUS_PLAYER_ALL, + SETUP_TOKEN_SHORTCUT_TAPE_EJECT, + SETUP_TOKEN_SHORTCUT_TAPE_EXTRA, + SETUP_TOKEN_SHORTCUT_TAPE_STOP, + SETUP_TOKEN_SHORTCUT_TAPE_PAUSE, + SETUP_TOKEN_SHORTCUT_TAPE_RECORD, + SETUP_TOKEN_SHORTCUT_TAPE_PLAY, + SETUP_TOKEN_SHORTCUT_SOUND_SIMPLE, + SETUP_TOKEN_SHORTCUT_SOUND_LOOPS, + SETUP_TOKEN_SHORTCUT_SOUND_MUSIC, + SETUP_TOKEN_SHORTCUT_SNAP_LEFT, + SETUP_TOKEN_SHORTCUT_SNAP_RIGHT, + SETUP_TOKEN_SHORTCUT_SNAP_UP, + SETUP_TOKEN_SHORTCUT_SNAP_DOWN, + + NUM_SHORTCUT_SETUP_TOKENS +}; + +// player setup +enum +{ + SETUP_TOKEN_PLAYER_USE_JOYSTICK = 0, + SETUP_TOKEN_PLAYER_JOY_DEVICE_NAME, + SETUP_TOKEN_PLAYER_JOY_XLEFT, + SETUP_TOKEN_PLAYER_JOY_XMIDDLE, + SETUP_TOKEN_PLAYER_JOY_XRIGHT, + SETUP_TOKEN_PLAYER_JOY_YUPPER, + SETUP_TOKEN_PLAYER_JOY_YMIDDLE, + SETUP_TOKEN_PLAYER_JOY_YLOWER, + SETUP_TOKEN_PLAYER_JOY_SNAP, + SETUP_TOKEN_PLAYER_JOY_DROP, + SETUP_TOKEN_PLAYER_KEY_LEFT, + SETUP_TOKEN_PLAYER_KEY_RIGHT, + SETUP_TOKEN_PLAYER_KEY_UP, + SETUP_TOKEN_PLAYER_KEY_DOWN, + SETUP_TOKEN_PLAYER_KEY_SNAP, + SETUP_TOKEN_PLAYER_KEY_DROP, + + NUM_PLAYER_SETUP_TOKENS +}; + +// system setup +enum +{ + SETUP_TOKEN_SYSTEM_SDL_VIDEODRIVER = 0, + SETUP_TOKEN_SYSTEM_SDL_AUDIODRIVER, + SETUP_TOKEN_SYSTEM_AUDIO_FRAGMENT_SIZE, + + NUM_SYSTEM_SETUP_TOKENS +}; + +// internal setup +enum +{ + SETUP_TOKEN_INT_PROGRAM_TITLE = 0, + SETUP_TOKEN_INT_PROGRAM_VERSION, + SETUP_TOKEN_INT_PROGRAM_AUTHOR, + SETUP_TOKEN_INT_PROGRAM_EMAIL, + SETUP_TOKEN_INT_PROGRAM_WEBSITE, + SETUP_TOKEN_INT_PROGRAM_COPYRIGHT, + SETUP_TOKEN_INT_PROGRAM_COMPANY, + SETUP_TOKEN_INT_PROGRAM_ICON_FILE, + SETUP_TOKEN_INT_DEFAULT_GRAPHICS_SET, + SETUP_TOKEN_INT_DEFAULT_SOUNDS_SET, + SETUP_TOKEN_INT_DEFAULT_MUSIC_SET, + SETUP_TOKEN_INT_FALLBACK_GRAPHICS_FILE, + SETUP_TOKEN_INT_FALLBACK_SOUNDS_FILE, + SETUP_TOKEN_INT_FALLBACK_MUSIC_FILE, + SETUP_TOKEN_INT_DEFAULT_LEVEL_SERIES, + SETUP_TOKEN_INT_CHOOSE_FROM_TOP_LEVELDIR, + SETUP_TOKEN_INT_SHOW_SCALING_IN_TITLE, + SETUP_TOKEN_INT_DEFAULT_WINDOW_WIDTH, + SETUP_TOKEN_INT_DEFAULT_WINDOW_HEIGHT, + + NUM_INTERNAL_SETUP_TOKENS +}; + +// debug setup +enum +{ + SETUP_TOKEN_DEBUG_FRAME_DELAY_0 = 0, + SETUP_TOKEN_DEBUG_FRAME_DELAY_1, + SETUP_TOKEN_DEBUG_FRAME_DELAY_2, + SETUP_TOKEN_DEBUG_FRAME_DELAY_3, + SETUP_TOKEN_DEBUG_FRAME_DELAY_4, + SETUP_TOKEN_DEBUG_FRAME_DELAY_5, + SETUP_TOKEN_DEBUG_FRAME_DELAY_6, + SETUP_TOKEN_DEBUG_FRAME_DELAY_7, + SETUP_TOKEN_DEBUG_FRAME_DELAY_8, + SETUP_TOKEN_DEBUG_FRAME_DELAY_9, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_0, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_1, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_2, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_3, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_4, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_5, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_6, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_7, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_8, + SETUP_TOKEN_DEBUG_FRAME_DELAY_KEY_9, + SETUP_TOKEN_DEBUG_FRAME_DELAY_USE_MOD_KEY, + SETUP_TOKEN_DEBUG_FRAME_DELAY_GAME_ONLY, + SETUP_TOKEN_DEBUG_SHOW_FRAMES_PER_SECOND, + + NUM_DEBUG_SETUP_TOKENS +}; + +// options setup +enum +{ + SETUP_TOKEN_OPTIONS_VERBOSE = 0, + + NUM_OPTIONS_SETUP_TOKENS +}; static struct SetupInfo si; +static struct SetupAutoSetupInfo sasi; static struct SetupEditorInfo sei; static struct SetupEditorCascadeInfo seci; static struct SetupShortcutInfo ssi; static struct SetupInputInfo sii; static struct SetupSystemInfo syi; +static struct SetupInternalInfo sxi; +static struct SetupDebugInfo sdi; static struct OptionInfo soi; static struct TokenInfo global_setup_tokens[] = { - { TYPE_STRING, &si.player_name, "player_name" }, - { TYPE_SWITCH, &si.sound, "sound" }, - { TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" }, - { TYPE_SWITCH, &si.sound_music, "background_music" }, - { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, - { TYPE_SWITCH, &si.toons, "toons" }, - { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, - { TYPE_INTEGER,&si.scroll_delay_value,"scroll_delay_value" }, - { TYPE_SWITCH, &si.soft_scrolling, "soft_scrolling" }, - { TYPE_SWITCH, &si.fade_screens, "fade_screens" }, - { TYPE_SWITCH, &si.autorecord, "automatic_tape_recording" }, - { TYPE_SWITCH, &si.show_titlescreen, "show_titlescreen" }, - { TYPE_SWITCH, &si.quick_doors, "quick_doors" }, - { TYPE_SWITCH, &si.team_mode, "team_mode" }, - { TYPE_SWITCH, &si.handicap, "handicap" }, - { 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" }, - { TYPE_SWITCH, &si.input_on_focus, "input_on_focus" }, - { TYPE_SWITCH, &si.prefer_aga_graphics, "prefer_aga_graphics" }, - { TYPE_INTEGER,&si.game_frame_delay, "game_frame_delay" }, - { TYPE_STRING, &si.graphics_set, "graphics_set" }, - { TYPE_STRING, &si.sounds_set, "sounds_set" }, - { TYPE_STRING, &si.music_set, "music_set" }, + { TYPE_STRING, &si.player_name, "player_name" }, + { TYPE_SWITCH, &si.sound, "sound" }, + { TYPE_SWITCH, &si.sound_loops, "repeating_sound_loops" }, + { TYPE_SWITCH, &si.sound_music, "background_music" }, + { TYPE_SWITCH, &si.sound_simple, "simple_sound_effects" }, + { TYPE_SWITCH, &si.toons, "toons" }, + { TYPE_SWITCH, &si.scroll_delay, "scroll_delay" }, + { TYPE_INTEGER,&si.scroll_delay_value, "scroll_delay_value" }, + { TYPE_STRING, &si.engine_snapshot_mode, "engine_snapshot_mode" }, + { TYPE_INTEGER,&si.engine_snapshot_memory, "engine_snapshot_memory" }, + { 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" }, + { TYPE_SWITCH, &si.team_mode, "team_mode" }, + { TYPE_SWITCH, &si.handicap, "handicap" }, + { TYPE_SWITCH, &si.skip_levels, "skip_levels" }, + { TYPE_SWITCH, &si.increment_levels, "increment_levels" }, + { TYPE_SWITCH, &si.auto_play_next_level, "auto_play_next_level" }, + { TYPE_SWITCH, &si.skip_scores_after_game, "skip_scores_after_game" }, + { TYPE_SWITCH, &si.time_limit, "time_limit" }, + { TYPE_SWITCH, &si.fullscreen, "fullscreen" }, + { TYPE_INTEGER,&si.window_scaling_percent, "window_scaling_percent" }, + { TYPE_STRING, &si.window_scaling_quality, "window_scaling_quality" }, + { TYPE_STRING, &si.screen_rendering_mode, "screen_rendering_mode" }, + { TYPE_STRING, &si.vsync_mode, "vsync_mode" }, + { TYPE_SWITCH, &si.ask_on_escape, "ask_on_escape" }, + { TYPE_SWITCH, &si.ask_on_escape_editor, "ask_on_escape_editor" }, + { TYPE_SWITCH, &si.ask_on_game_over, "ask_on_game_over" }, + { TYPE_SWITCH, &si.quick_switch, "quick_player_switch" }, + { TYPE_SWITCH, &si.input_on_focus, "input_on_focus" }, + { TYPE_SWITCH, &si.prefer_aga_graphics, "prefer_aga_graphics" }, + { TYPE_SWITCH, &si.game_speed_extended, "game_speed_extended" }, + { TYPE_INTEGER,&si.game_frame_delay, "game_frame_delay" }, + { TYPE_SWITCH, &si.sp_show_border_elements, "sp_show_border_elements" }, + { TYPE_SWITCH, &si.small_game_graphics, "small_game_graphics" }, + { TYPE_SWITCH, &si.show_snapshot_buttons, "show_snapshot_buttons" }, + { TYPE_STRING, &si.graphics_set, "graphics_set" }, + { TYPE_STRING, &si.sounds_set, "sounds_set" }, + { TYPE_STRING, &si.music_set, "music_set" }, { TYPE_SWITCH3,&si.override_level_graphics, "override_level_graphics" }, { TYPE_SWITCH3,&si.override_level_sounds, "override_level_sounds" }, { TYPE_SWITCH3,&si.override_level_music, "override_level_music" }, + { TYPE_INTEGER,&si.volume_simple, "volume_simple" }, + { TYPE_INTEGER,&si.volume_loops, "volume_loops" }, + { TYPE_INTEGER,&si.volume_music, "volume_music" }, + { TYPE_SWITCH, &si.network_mode, "network_mode" }, + { TYPE_PLAYER, &si.network_player_nr, "network_player" }, + { TYPE_STRING, &si.network_server_hostname, "network_server_hostname" }, + { TYPE_STRING, &si.touch.control_type, "touch.control_type" }, + { TYPE_INTEGER,&si.touch.move_distance, "touch.move_distance" }, + { TYPE_INTEGER,&si.touch.drop_distance, "touch.drop_distance" }, + { TYPE_INTEGER,&si.touch.transparency, "touch.transparency" }, + { TYPE_INTEGER,&si.touch.draw_outlined, "touch.draw_outlined" }, + { TYPE_INTEGER,&si.touch.draw_pressed, "touch.draw_pressed" }, + { TYPE_INTEGER,&si.touch.grid_xsize[0], "touch.virtual_buttons.0.xsize" }, + { TYPE_INTEGER,&si.touch.grid_ysize[0], "touch.virtual_buttons.0.ysize" }, + { TYPE_INTEGER,&si.touch.grid_xsize[1], "touch.virtual_buttons.1.xsize" }, + { TYPE_INTEGER,&si.touch.grid_ysize[1], "touch.virtual_buttons.1.ysize" }, +}; + +static struct TokenInfo auto_setup_tokens[] = +{ + { TYPE_INTEGER,&sasi.editor_zoom_tilesize, "editor.zoom_tilesize" }, }; -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"}, - { TYPE_SWITCH, &sei.el_more, "editor.el_more" }, - { TYPE_SWITCH, &sei.el_sokoban, "editor.el_sokoban" }, - { 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_steel_chars, "editor.el_steel_chars" }, + { TYPE_SWITCH, &sei.el_classic, "editor.el_classic" }, { 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.el_headlines, "editor.el_headlines" }, { TYPE_SWITCH, &sei.show_element_token,"editor.show_element_token" }, }; @@ -8512,6 +8684,8 @@ static struct TokenInfo editor_cascade_setup_tokens[] = { TYPE_SWITCH, &seci.el_sp, "editor.cascade.el_sp" }, { TYPE_SWITCH, &seci.el_dc, "editor.cascade.el_dc" }, { TYPE_SWITCH, &seci.el_dx, "editor.cascade.el_dx" }, + { TYPE_SWITCH, &seci.el_mm, "editor.cascade.el_mm" }, + { TYPE_SWITCH, &seci.el_df, "editor.cascade.el_df" }, { TYPE_SWITCH, &seci.el_chars, "editor.cascade.el_chars" }, { TYPE_SWITCH, &seci.el_steel_chars, "editor.cascade.el_steel_chars" }, { TYPE_SWITCH, &seci.el_ce, "editor.cascade.el_ce" }, @@ -8531,6 +8705,19 @@ static struct TokenInfo shortcut_setup_tokens[] = { TYPE_KEY_X11, &ssi.focus_player[2], "shortcut.focus_player_3" }, { TYPE_KEY_X11, &ssi.focus_player[3], "shortcut.focus_player_4" }, { TYPE_KEY_X11, &ssi.focus_player_all,"shortcut.focus_player_all" }, + { TYPE_KEY_X11, &ssi.tape_eject, "shortcut.tape_eject" }, + { TYPE_KEY_X11, &ssi.tape_extra, "shortcut.tape_extra" }, + { TYPE_KEY_X11, &ssi.tape_stop, "shortcut.tape_stop" }, + { TYPE_KEY_X11, &ssi.tape_pause, "shortcut.tape_pause" }, + { TYPE_KEY_X11, &ssi.tape_record, "shortcut.tape_record" }, + { TYPE_KEY_X11, &ssi.tape_play, "shortcut.tape_play" }, + { TYPE_KEY_X11, &ssi.sound_simple, "shortcut.sound_simple" }, + { TYPE_KEY_X11, &ssi.sound_loops, "shortcut.sound_loops" }, + { TYPE_KEY_X11, &ssi.sound_music, "shortcut.sound_music" }, + { TYPE_KEY_X11, &ssi.snap_left, "shortcut.snap_left" }, + { TYPE_KEY_X11, &ssi.snap_right, "shortcut.snap_right" }, + { TYPE_KEY_X11, &ssi.snap_up, "shortcut.snap_up" }, + { TYPE_KEY_X11, &ssi.snap_down, "shortcut.snap_down" }, }; static struct TokenInfo player_setup_tokens[] = @@ -8555,11 +8742,61 @@ static struct TokenInfo player_setup_tokens[] = static struct TokenInfo system_setup_tokens[] = { - { TYPE_STRING, &syi.sdl_videodriver, "system.sdl_videodriver" }, - { TYPE_STRING, &syi.sdl_audiodriver, "system.sdl_audiodriver" }, + { TYPE_STRING, &syi.sdl_videodriver, "system.sdl_videodriver" }, + { TYPE_STRING, &syi.sdl_audiodriver, "system.sdl_audiodriver" }, { TYPE_INTEGER, &syi.audio_fragment_size,"system.audio_fragment_size" }, }; +static struct TokenInfo internal_setup_tokens[] = +{ + { TYPE_STRING, &sxi.program_title, "program_title" }, + { TYPE_STRING, &sxi.program_version, "program_version" }, + { TYPE_STRING, &sxi.program_author, "program_author" }, + { TYPE_STRING, &sxi.program_email, "program_email" }, + { TYPE_STRING, &sxi.program_website, "program_website" }, + { TYPE_STRING, &sxi.program_copyright, "program_copyright" }, + { TYPE_STRING, &sxi.program_company, "program_company" }, + { TYPE_STRING, &sxi.program_icon_file, "program_icon_file" }, + { TYPE_STRING, &sxi.default_graphics_set, "default_graphics_set" }, + { TYPE_STRING, &sxi.default_sounds_set, "default_sounds_set" }, + { TYPE_STRING, &sxi.default_music_set, "default_music_set" }, + { TYPE_STRING, &sxi.fallback_graphics_file, "fallback_graphics_file"}, + { TYPE_STRING, &sxi.fallback_sounds_file, "fallback_sounds_file" }, + { TYPE_STRING, &sxi.fallback_music_file, "fallback_music_file" }, + { TYPE_STRING, &sxi.default_level_series, "default_level_series" }, + { TYPE_BOOLEAN,&sxi.choose_from_top_leveldir, "choose_from_top_leveldir" }, + { TYPE_BOOLEAN,&sxi.show_scaling_in_title, "show_scaling_in_title" }, + { TYPE_INTEGER,&sxi.default_window_width, "default_window_width" }, + { TYPE_INTEGER,&sxi.default_window_height, "default_window_height" }, +}; + +static struct TokenInfo debug_setup_tokens[] = +{ + { TYPE_INTEGER, &sdi.frame_delay[0], "debug.frame_delay_0" }, + { TYPE_INTEGER, &sdi.frame_delay[1], "debug.frame_delay_1" }, + { TYPE_INTEGER, &sdi.frame_delay[2], "debug.frame_delay_2" }, + { TYPE_INTEGER, &sdi.frame_delay[3], "debug.frame_delay_3" }, + { TYPE_INTEGER, &sdi.frame_delay[4], "debug.frame_delay_4" }, + { TYPE_INTEGER, &sdi.frame_delay[5], "debug.frame_delay_5" }, + { TYPE_INTEGER, &sdi.frame_delay[6], "debug.frame_delay_6" }, + { TYPE_INTEGER, &sdi.frame_delay[7], "debug.frame_delay_7" }, + { TYPE_INTEGER, &sdi.frame_delay[8], "debug.frame_delay_8" }, + { TYPE_INTEGER, &sdi.frame_delay[9], "debug.frame_delay_9" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[0], "debug.key.frame_delay_0" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[1], "debug.key.frame_delay_1" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[2], "debug.key.frame_delay_2" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[3], "debug.key.frame_delay_3" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[4], "debug.key.frame_delay_4" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[5], "debug.key.frame_delay_5" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[6], "debug.key.frame_delay_6" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[7], "debug.key.frame_delay_7" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[8], "debug.key.frame_delay_8" }, + { TYPE_KEY_X11, &sdi.frame_delay_key[9], "debug.key.frame_delay_9" }, + { TYPE_BOOLEAN, &sdi.frame_delay_use_mod_key,"debug.frame_delay.use_mod_key"}, + { TYPE_BOOLEAN, &sdi.frame_delay_game_only, "debug.frame_delay.game_only" }, + { TYPE_BOOLEAN, &sdi.show_frames_per_second, "debug.show_frames_per_second" }, +}; + static struct TokenInfo options_setup_tokens[] = { { TYPE_BOOLEAN, &soi.verbose, "options.verbose" }, @@ -8567,13 +8804,13 @@ static struct TokenInfo options_setup_tokens[] = static char *get_corrected_login_name(char *login_name) { - /* needed because player name must be a fixed length string */ + // needed because player name must be a fixed length string char *login_name_new = checked_malloc(MAX_PLAYER_NAME_LEN + 1); strncpy(login_name_new, login_name, MAX_PLAYER_NAME_LEN); login_name_new[MAX_PLAYER_NAME_LEN] = '\0'; - if (strlen(login_name) > MAX_PLAYER_NAME_LEN) /* name has been cut */ + if (strlen(login_name) > MAX_PLAYER_NAME_LEN) // name has been cut if (strchr(login_name_new, ' ')) *strchr(login_name_new, ' ') = '\0'; @@ -8593,7 +8830,8 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->toons = TRUE; si->scroll_delay = TRUE; si->scroll_delay_value = STD_SCROLL_DELAY; - si->soft_scrolling = TRUE; + si->engine_snapshot_mode = getStringCopy(STR_SNAPSHOT_MODE_DEFAULT); + si->engine_snapshot_memory = SNAPSHOT_MEMORY_DEFAULT; si->fade_screens = TRUE; si->autorecord = TRUE; si->show_titlescreen = TRUE; @@ -8601,23 +8839,99 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->team_mode = FALSE; si->handicap = TRUE; si->skip_levels = TRUE; + si->increment_levels = TRUE; + si->auto_play_next_level = TRUE; + si->skip_scores_after_game = FALSE; si->time_limit = TRUE; si->fullscreen = FALSE; - si->fullscreen_mode = getStringCopy(DEFAULT_FULLSCREEN_MODE); + si->window_scaling_percent = STD_WINDOW_SCALING_PERCENT; + si->window_scaling_quality = getStringCopy(SCALING_QUALITY_DEFAULT); + si->screen_rendering_mode = getStringCopy(STR_SPECIAL_RENDERING_DEFAULT); + si->vsync_mode = getStringCopy(STR_VSYNC_MODE_DEFAULT); si->ask_on_escape = TRUE; si->ask_on_escape_editor = TRUE; + si->ask_on_game_over = TRUE; si->quick_switch = FALSE; si->input_on_focus = FALSE; si->prefer_aga_graphics = TRUE; + si->game_speed_extended = FALSE; si->game_frame_delay = GAME_FRAME_DELAY; + si->sp_show_border_elements = FALSE; + si->small_game_graphics = FALSE; + si->show_snapshot_buttons = FALSE; + + si->graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); + si->sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); + si->music_set = getStringCopy(MUS_CLASSIC_SUBDIR); - si->graphics_set = getStringCopy(GFX_DEFAULT_SUBDIR); - si->sounds_set = getStringCopy(SND_DEFAULT_SUBDIR); - si->music_set = getStringCopy(MUS_DEFAULT_SUBDIR); si->override_level_graphics = FALSE; si->override_level_sounds = FALSE; si->override_level_music = FALSE; + si->volume_simple = 100; // percent + si->volume_loops = 100; // percent + si->volume_music = 100; // percent + + si->network_mode = FALSE; + si->network_player_nr = 0; // first player + si->network_server_hostname = getStringCopy(STR_NETWORK_AUTO_DETECT); + + si->touch.control_type = getStringCopy(TOUCH_CONTROL_DEFAULT); + si->touch.move_distance = TOUCH_MOVE_DISTANCE_DEFAULT; // percent + si->touch.drop_distance = TOUCH_DROP_DISTANCE_DEFAULT; // percent + si->touch.transparency = TOUCH_TRANSPARENCY_DEFAULT; // percent + si->touch.draw_outlined = TRUE; + si->touch.draw_pressed = TRUE; + + for (i = 0; i < 2; i++) + { + char *default_grid_button[6][2] = + { + { " ", " ^^ " }, + { " ", " ^^ " }, + { " ", "<< >>" }, + { " ", "<< >>" }, + { "111222", " vv " }, + { "111222", " vv " } + }; + int grid_xsize = DEFAULT_GRID_XSIZE(i); + int grid_ysize = DEFAULT_GRID_YSIZE(i); + int min_xsize = MIN(6, grid_xsize); + int min_ysize = MIN(6, grid_ysize); + int startx = grid_xsize - min_xsize; + int starty = grid_ysize - min_ysize; + int x, y; + + // virtual buttons grid can only be set to defaults if video is initialized + // (this will be repeated if virtual buttons are not loaded from setup file) + if (video.initialized) + { + si->touch.grid_xsize[i] = grid_xsize; + si->touch.grid_ysize[i] = grid_ysize; + } + else + { + si->touch.grid_xsize[i] = -1; + si->touch.grid_ysize[i] = -1; + } + + for (x = 0; x < MAX_GRID_XSIZE; x++) + for (y = 0; y < MAX_GRID_YSIZE; y++) + si->touch.grid_button[i][x][y] = CHAR_GRID_BUTTON_NONE; + + for (x = 0; x < min_xsize; x++) + for (y = 0; y < min_ysize; y++) + si->touch.grid_button[i][x][starty + y] = + default_grid_button[y][0][x]; + + for (x = 0; x < min_xsize; x++) + for (y = 0; y < min_ysize; y++) + si->touch.grid_button[i][startx + x][starty + y] = + default_grid_button[y][1][x]; + } + + si->touch.grid_initialized = video.initialized; + si->editor.el_boulderdash = TRUE; si->editor.el_emerald_mine = TRUE; si->editor.el_emerald_mine_club = TRUE; @@ -8626,15 +8940,24 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->editor.el_supaplex = TRUE; si->editor.el_diamond_caves = TRUE; si->editor.el_dx_boulderdash = TRUE; + + si->editor.el_mirror_magic = TRUE; + si->editor.el_deflektor = TRUE; + si->editor.el_chars = TRUE; si->editor.el_steel_chars = TRUE; + + si->editor.el_classic = TRUE; si->editor.el_custom = TRUE; - si->editor.el_headlines = TRUE; - si->editor.el_user_defined = FALSE; - si->editor.el_dynamic = TRUE; + si->editor.el_user_defined = FALSE; + si->editor.el_dynamic = TRUE; - si->editor.show_element_token = FALSE; + si->editor.el_headlines = TRUE; + + si->editor.show_element_token = FALSE; + + si->editor.use_template_for_new_levels = TRUE; si->shortcut.save_game = DEFAULT_KEY_SAVE_GAME; si->shortcut.load_game = DEFAULT_KEY_LOAD_GAME; @@ -8646,6 +8969,22 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->shortcut.focus_player[3] = DEFAULT_KEY_FOCUS_PLAYER_4; si->shortcut.focus_player_all = DEFAULT_KEY_FOCUS_PLAYER_ALL; + si->shortcut.tape_eject = DEFAULT_KEY_TAPE_EJECT; + si->shortcut.tape_extra = DEFAULT_KEY_TAPE_EXTRA; + si->shortcut.tape_stop = DEFAULT_KEY_TAPE_STOP; + si->shortcut.tape_pause = DEFAULT_KEY_TAPE_PAUSE; + si->shortcut.tape_record = DEFAULT_KEY_TAPE_RECORD; + si->shortcut.tape_play = DEFAULT_KEY_TAPE_PLAY; + + si->shortcut.sound_simple = DEFAULT_KEY_SOUND_SIMPLE; + si->shortcut.sound_loops = DEFAULT_KEY_SOUND_LOOPS; + si->shortcut.sound_music = DEFAULT_KEY_SOUND_MUSIC; + + si->shortcut.snap_left = DEFAULT_KEY_SNAP_LEFT; + si->shortcut.snap_right = DEFAULT_KEY_SNAP_RIGHT; + si->shortcut.snap_up = DEFAULT_KEY_SNAP_UP; + si->shortcut.snap_down = DEFAULT_KEY_SNAP_DOWN; + for (i = 0; i < MAX_PLAYERS; i++) { si->input[i].use_joystick = FALSE; @@ -8670,17 +9009,70 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->system.sdl_audiodriver = getStringCopy(ARG_DEFAULT); si->system.audio_fragment_size = DEFAULT_AUDIO_FRAGMENT_SIZE; + si->internal.program_title = getStringCopy(PROGRAM_TITLE_STRING); + si->internal.program_version = getStringCopy(getProgramRealVersionString()); + si->internal.program_author = getStringCopy(PROGRAM_AUTHOR_STRING); + si->internal.program_email = getStringCopy(PROGRAM_EMAIL_STRING); + si->internal.program_website = getStringCopy(PROGRAM_WEBSITE_STRING); + si->internal.program_copyright = getStringCopy(PROGRAM_COPYRIGHT_STRING); + si->internal.program_company = getStringCopy(PROGRAM_COMPANY_STRING); + + si->internal.program_icon_file = getStringCopy(PROGRAM_ICON_FILENAME); + + si->internal.default_graphics_set = getStringCopy(GFX_CLASSIC_SUBDIR); + si->internal.default_sounds_set = getStringCopy(SND_CLASSIC_SUBDIR); + si->internal.default_music_set = getStringCopy(MUS_CLASSIC_SUBDIR); + + si->internal.fallback_graphics_file = getStringCopy(UNDEFINED_FILENAME); + si->internal.fallback_sounds_file = getStringCopy(UNDEFINED_FILENAME); + si->internal.fallback_music_file = getStringCopy(UNDEFINED_FILENAME); + + si->internal.default_level_series = getStringCopy(UNDEFINED_LEVELSET); + si->internal.choose_from_top_leveldir = FALSE; + si->internal.show_scaling_in_title = TRUE; + + si->internal.default_window_width = WIN_XSIZE_DEFAULT; + si->internal.default_window_height = WIN_YSIZE_DEFAULT; + + si->debug.frame_delay[0] = DEFAULT_FRAME_DELAY_0; + si->debug.frame_delay[1] = DEFAULT_FRAME_DELAY_1; + si->debug.frame_delay[2] = DEFAULT_FRAME_DELAY_2; + si->debug.frame_delay[3] = DEFAULT_FRAME_DELAY_3; + si->debug.frame_delay[4] = DEFAULT_FRAME_DELAY_4; + si->debug.frame_delay[5] = DEFAULT_FRAME_DELAY_5; + si->debug.frame_delay[6] = DEFAULT_FRAME_DELAY_6; + si->debug.frame_delay[7] = DEFAULT_FRAME_DELAY_7; + si->debug.frame_delay[8] = DEFAULT_FRAME_DELAY_8; + si->debug.frame_delay[9] = DEFAULT_FRAME_DELAY_9; + + si->debug.frame_delay_key[0] = DEFAULT_KEY_FRAME_DELAY_0; + si->debug.frame_delay_key[1] = DEFAULT_KEY_FRAME_DELAY_1; + si->debug.frame_delay_key[2] = DEFAULT_KEY_FRAME_DELAY_2; + si->debug.frame_delay_key[3] = DEFAULT_KEY_FRAME_DELAY_3; + si->debug.frame_delay_key[4] = DEFAULT_KEY_FRAME_DELAY_4; + si->debug.frame_delay_key[5] = DEFAULT_KEY_FRAME_DELAY_5; + si->debug.frame_delay_key[6] = DEFAULT_KEY_FRAME_DELAY_6; + si->debug.frame_delay_key[7] = DEFAULT_KEY_FRAME_DELAY_7; + si->debug.frame_delay_key[8] = DEFAULT_KEY_FRAME_DELAY_8; + si->debug.frame_delay_key[9] = DEFAULT_KEY_FRAME_DELAY_9; + + si->debug.frame_delay_use_mod_key = DEFAULT_FRAME_DELAY_USE_MOD_KEY; + si->debug.frame_delay_game_only = DEFAULT_FRAME_DELAY_GAME_ONLY; + + si->debug.show_frames_per_second = FALSE; + si->options.verbose = FALSE; -#if defined(CREATE_SPECIAL_EDITION_RND_JUE) - si->handicap = FALSE; +#if defined(PLATFORM_ANDROID) si->fullscreen = TRUE; - si->override_level_graphics = AUTO; - si->override_level_sounds = AUTO; - si->override_level_music = AUTO; #endif } +static void setSetupInfoToDefaults_AutoSetup(struct SetupInfo *si) +{ + si->auto_setup.editor_zoom_tilesize = MINI_TILESIZE; +} + static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) { si->editor_cascade.el_bd = TRUE; @@ -8692,6 +9084,9 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) si->editor_cascade.el_dc = TRUE; si->editor_cascade.el_dx = TRUE; + si->editor_cascade.el_mm = TRUE; + si->editor_cascade.el_df = TRUE; + si->editor_cascade.el_chars = FALSE; si->editor_cascade.el_steel_chars = FALSE; si->editor_cascade.el_ce = FALSE; @@ -8701,6 +9096,65 @@ static void setSetupInfoToDefaults_EditorCascade(struct SetupInfo *si) si->editor_cascade.el_dynamic = FALSE; } +#define MAX_HIDE_SETUP_TOKEN_SIZE 20 + +static char *getHideSetupToken(void *setup_value) +{ + static char hide_setup_token[MAX_HIDE_SETUP_TOKEN_SIZE]; + + if (setup_value != NULL) + snprintf(hide_setup_token, MAX_HIDE_SETUP_TOKEN_SIZE, "%p", setup_value); + + return hide_setup_token; +} + +void setHideSetupEntry(void *setup_value) +{ + char *hide_setup_token = getHideSetupToken(setup_value); + + if (setup_value != NULL) + setHashEntry(hide_setup_hash, hide_setup_token, ""); +} + +static void setHideSetupEntryRaw(char *token_text, void *setup_value_raw) +{ + // !!! DIRTY WORKAROUND; TO BE FIXED AFTER THE MM ENGINE RELEASE !!! + void *setup_value = setup_value_raw - (void *)&si + (void *)&setup; + + setHideSetupEntry(setup_value); +} + +boolean hideSetupEntry(void *setup_value) +{ + char *hide_setup_token = getHideSetupToken(setup_value); + + return (setup_value != NULL && + getHashEntry(hide_setup_hash, hide_setup_token) != NULL); +} + +static void setSetupInfoFromTokenText(SetupFileHash *setup_file_hash, + struct TokenInfo *token_info, + int token_nr, char *token_text) +{ + char *token_hide_text = getStringCat2(token_text, ".hide"); + char *token_hide_value = getHashEntry(setup_file_hash, token_hide_text); + + // set the value of this setup option in the setup option structure + setSetupInfo(token_info, token_nr, getHashEntry(setup_file_hash, token_text)); + + // check if this setup option should be hidden in the setup menu + if (token_hide_value != NULL && get_boolean_from_string(token_hide_value)) + setHideSetupEntryRaw(token_text, token_info[token_nr].value); +} + +static void setSetupInfoFromTokenInfo(SetupFileHash *setup_file_hash, + struct TokenInfo *token_info, + int token_nr) +{ + setSetupInfoFromTokenText(setup_file_hash, token_info, token_nr, + token_info[token_nr].text); +} + static void decodeSetupFileHash(SetupFileHash *setup_file_hash) { int i, pnr; @@ -8708,28 +9162,67 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash) if (!setup_file_hash) return; - /* global setup */ + if (hide_setup_hash == NULL) + hide_setup_hash = newSetupFileHash(); + + // global setup si = setup; for (i = 0; i < NUM_GLOBAL_SETUP_TOKENS; i++) - setSetupInfo(global_setup_tokens, i, - getHashEntry(setup_file_hash, global_setup_tokens[i].text)); + setSetupInfoFromTokenInfo(setup_file_hash, global_setup_tokens, i); setup = si; - /* editor setup */ + // virtual buttons setup + setup.touch.grid_initialized = TRUE; + for (i = 0; i < 2; i++) + { + int grid_xsize = setup.touch.grid_xsize[i]; + int grid_ysize = setup.touch.grid_ysize[i]; + int x, y; + + // if virtual buttons are not loaded from setup file, repeat initializing + // virtual buttons grid with default values later when video is initialized + if (grid_xsize == -1 || + grid_ysize == -1) + { + setup.touch.grid_initialized = FALSE; + + continue; + } + + for (y = 0; y < grid_ysize; y++) + { + char token_string[MAX_LINE_LEN]; + + sprintf(token_string, "touch.virtual_buttons.%d.%02d", i, y); + + char *value_string = getHashEntry(setup_file_hash, token_string); + + if (value_string == NULL) + continue; + + for (x = 0; x < grid_xsize; x++) + { + char c = value_string[x]; + + setup.touch.grid_button[i][x][y] = + (c == '.' ? CHAR_GRID_BUTTON_NONE : c); + } + } + } + + // editor setup sei = setup.editor; for (i = 0; i < NUM_EDITOR_SETUP_TOKENS; i++) - setSetupInfo(editor_setup_tokens, i, - getHashEntry(setup_file_hash,editor_setup_tokens[i].text)); + setSetupInfoFromTokenInfo(setup_file_hash, editor_setup_tokens, i); setup.editor = sei; - /* shortcut setup */ + // shortcut setup ssi = setup.shortcut; for (i = 0; i < NUM_SHORTCUT_SETUP_TOKENS; i++) - setSetupInfo(shortcut_setup_tokens, i, - getHashEntry(setup_file_hash,shortcut_setup_tokens[i].text)); + setSetupInfoFromTokenInfo(setup_file_hash, shortcut_setup_tokens, i); setup.shortcut = ssi; - /* player setup */ + // player setup for (pnr = 0; pnr < MAX_PLAYERS; pnr++) { char prefix[30]; @@ -8742,25 +9235,53 @@ static void decodeSetupFileHash(SetupFileHash *setup_file_hash) char full_token[100]; sprintf(full_token, "%s%s", prefix, player_setup_tokens[i].text); - setSetupInfo(player_setup_tokens, i, - getHashEntry(setup_file_hash, full_token)); + setSetupInfoFromTokenText(setup_file_hash, player_setup_tokens, i, + full_token); } setup.input[pnr] = sii; } - /* system setup */ + // system setup syi = setup.system; for (i = 0; i < NUM_SYSTEM_SETUP_TOKENS; i++) - setSetupInfo(system_setup_tokens, i, - getHashEntry(setup_file_hash, system_setup_tokens[i].text)); + setSetupInfoFromTokenInfo(setup_file_hash, system_setup_tokens, i); setup.system = syi; - /* options setup */ + // internal setup + sxi = setup.internal; + for (i = 0; i < NUM_INTERNAL_SETUP_TOKENS; i++) + setSetupInfoFromTokenInfo(setup_file_hash, internal_setup_tokens, i); + setup.internal = sxi; + + // debug setup + sdi = setup.debug; + for (i = 0; i < NUM_DEBUG_SETUP_TOKENS; i++) + setSetupInfoFromTokenInfo(setup_file_hash, debug_setup_tokens, i); + setup.debug = sdi; + + // options setup soi = setup.options; for (i = 0; i < NUM_OPTIONS_SETUP_TOKENS; i++) - setSetupInfo(options_setup_tokens, i, - getHashEntry(setup_file_hash, options_setup_tokens[i].text)); + setSetupInfoFromTokenInfo(setup_file_hash, options_setup_tokens, i); setup.options = soi; + + setHideRelatedSetupEntries(); +} + +static void decodeSetupFileHash_AutoSetup(SetupFileHash *setup_file_hash) +{ + int i; + + if (!setup_file_hash) + return; + + // auto setup + sasi = setup.auto_setup; + for (i = 0; i < NUM_AUTO_SETUP_TOKENS; i++) + setSetupInfo(auto_setup_tokens, i, + getHashEntry(setup_file_hash, + auto_setup_tokens[i].text)); + setup.auto_setup = sasi; } static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash) @@ -8770,7 +9291,7 @@ static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash) if (!setup_file_hash) return; - /* editor cascade setup */ + // editor cascade setup seci = setup.editor_cascade; for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++) setSetupInfo(editor_cascade_setup_tokens, i, @@ -8779,58 +9300,96 @@ static void decodeSetupFileHash_EditorCascade(SetupFileHash *setup_file_hash) setup.editor_cascade = seci; } -void LoadSetup() +void LoadSetupFromFilename(char *filename) { - char *filename = getSetupFilename(); - SetupFileHash *setup_file_hash = NULL; - - /* always start with reliable default values */ - setSetupInfoToDefaults(&setup); - - setup_file_hash = loadSetupFileHash(filename); + SetupFileHash *setup_file_hash = loadSetupFileHash(filename); if (setup_file_hash) { - char *player_name_new; - - checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP")); decodeSetupFileHash(setup_file_hash); freeSetupFileHash(setup_file_hash); + } + else + { + Error(ERR_DEBUG, "using default setup values"); + } +} - /* needed to work around problems with fixed length strings */ - player_name_new = get_corrected_login_name(setup.player_name); - free(setup.player_name); - setup.player_name = player_name_new; +static void LoadSetup_SpecialPostProcessing(void) +{ + char *player_name_new; - /* "scroll_delay: on(3) / off(0)" was replaced by scroll delay value */ - if (setup.scroll_delay == FALSE) - { - setup.scroll_delay_value = MIN_SCROLL_DELAY; - setup.scroll_delay = TRUE; /* now always "on" */ - } + // needed to work around problems with fixed length strings + player_name_new = get_corrected_login_name(setup.player_name); + free(setup.player_name); + setup.player_name = player_name_new; + + // "scroll_delay: on(3) / off(0)" was replaced by scroll delay value + if (setup.scroll_delay == FALSE) + { + setup.scroll_delay_value = MIN_SCROLL_DELAY; + setup.scroll_delay = TRUE; // now always "on" + } + + // make sure that scroll delay value stays inside valid range + setup.scroll_delay_value = + MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY); +} + +void LoadSetup(void) +{ + char *filename; + + // always start with reliable default values + setSetupInfoToDefaults(&setup); + + // try to load setup values from default setup file + filename = getDefaultSetupFilename(); + + if (fileExists(filename)) + LoadSetupFromFilename(filename); + + // try to load setup values from user setup file + filename = getSetupFilename(); + + LoadSetupFromFilename(filename); + + LoadSetup_SpecialPostProcessing(); +} + +void LoadSetup_AutoSetup(void) +{ + char *filename = getPath2(getSetupDir(), AUTOSETUP_FILENAME); + SetupFileHash *setup_file_hash = NULL; + + // always start with reliable default values + setSetupInfoToDefaults_AutoSetup(&setup); + + setup_file_hash = loadSetupFileHash(filename); + + if (setup_file_hash) + { + decodeSetupFileHash_AutoSetup(setup_file_hash); - /* make sure that scroll delay value stays inside valid range */ - setup.scroll_delay_value = - MIN(MAX(MIN_SCROLL_DELAY, setup.scroll_delay_value), MAX_SCROLL_DELAY); + freeSetupFileHash(setup_file_hash); } - else - Error(ERR_WARN, "using default setup values"); + + free(filename); } -void LoadSetup_EditorCascade() +void LoadSetup_EditorCascade(void) { char *filename = getPath2(getSetupDir(), EDITORCASCADE_FILENAME); SetupFileHash *setup_file_hash = NULL; - /* always start with reliable default values */ + // always start with reliable default values setSetupInfoToDefaults_EditorCascade(&setup); setup_file_hash = loadSetupFileHash(filename); if (setup_file_hash) { - checkSetupFileHashIdentifier(setup_file_hash, filename,getCookie("SETUP")); decodeSetupFileHash_EditorCascade(setup_file_hash); freeSetupFileHash(setup_file_hash); @@ -8839,7 +9398,56 @@ void LoadSetup_EditorCascade() free(filename); } -void SaveSetup() +static void addGameControllerMappingToHash(SetupFileHash *mappings_hash, + char *mapping_line) +{ + char mapping_guid[MAX_LINE_LEN]; + char *mapping_start, *mapping_end; + + // get GUID from game controller mapping line: copy complete line + strncpy(mapping_guid, mapping_line, MAX_LINE_LEN - 1); + mapping_guid[MAX_LINE_LEN - 1] = '\0'; + + // get GUID from game controller mapping line: cut after GUID part + mapping_start = strchr(mapping_guid, ','); + if (mapping_start != NULL) + *mapping_start = '\0'; + + // cut newline from game controller mapping line + mapping_end = strchr(mapping_line, '\n'); + if (mapping_end != NULL) + *mapping_end = '\0'; + + // add mapping entry to game controller mappings hash + setHashEntry(mappings_hash, mapping_guid, mapping_line); +} + +static void LoadSetup_ReadGameControllerMappings(SetupFileHash *mappings_hash, + char *filename) +{ + FILE *file; + + if (!(file = fopen(filename, MODE_READ))) + { + Error(ERR_WARN, "cannot read game controller mappings file '%s'", filename); + + return; + } + + while (!feof(file)) + { + char line[MAX_LINE_LEN]; + + if (!fgets(line, MAX_LINE_LEN, file)) + break; + + addGameControllerMappingToHash(mappings_hash, line); + } + + fclose(file); +} + +void SaveSetup(void) { char *filename = getSetupFilename(); FILE *file; @@ -8853,35 +9461,67 @@ void SaveSetup() return; } - fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, - getCookie("SETUP"))); - fprintf(file, "\n"); + fprintFileHeader(file, SETUP_FILENAME); - /* global setup */ + // global setup si = setup; for (i = 0; i < NUM_GLOBAL_SETUP_TOKENS; i++) { - /* just to make things nicer :) */ + // just to make things nicer :) if (i == SETUP_TOKEN_PLAYER_NAME + 1 || - i == SETUP_TOKEN_GRAPHICS_SET) + i == SETUP_TOKEN_GRAPHICS_SET || + i == SETUP_TOKEN_VOLUME_SIMPLE || + i == SETUP_TOKEN_NETWORK_MODE || + i == SETUP_TOKEN_TOUCH_CONTROL_TYPE || + i == SETUP_TOKEN_TOUCH_GRID_XSIZE_0 || + i == SETUP_TOKEN_TOUCH_GRID_XSIZE_1) fprintf(file, "\n"); fprintf(file, "%s\n", getSetupLine(global_setup_tokens, "", i)); } - /* editor setup */ + // virtual buttons setup + for (i = 0; i < 2; i++) + { + int grid_xsize = setup.touch.grid_xsize[i]; + int grid_ysize = setup.touch.grid_ysize[i]; + int x, y; + + fprintf(file, "\n"); + + for (y = 0; y < grid_ysize; y++) + { + char token_string[MAX_LINE_LEN]; + char value_string[MAX_LINE_LEN]; + + sprintf(token_string, "touch.virtual_buttons.%d.%02d", i, y); + + for (x = 0; x < grid_xsize; x++) + { + char c = setup.touch.grid_button[i][x][y]; + + value_string[x] = (c == CHAR_GRID_BUTTON_NONE ? '.' : c); + } + + value_string[grid_xsize] = '\0'; + + fprintf(file, "%s\n", getFormattedSetupEntry(token_string, value_string)); + } + } + + // editor setup sei = setup.editor; fprintf(file, "\n"); for (i = 0; i < NUM_EDITOR_SETUP_TOKENS; i++) fprintf(file, "%s\n", getSetupLine(editor_setup_tokens, "", i)); - /* shortcut setup */ + // shortcut setup ssi = setup.shortcut; fprintf(file, "\n"); for (i = 0; i < NUM_SHORTCUT_SETUP_TOKENS; i++) fprintf(file, "%s\n", getSetupLine(shortcut_setup_tokens, "", i)); - /* player setup */ + // player setup for (pnr = 0; pnr < MAX_PLAYERS; pnr++) { char prefix[30]; @@ -8894,13 +9534,22 @@ void SaveSetup() fprintf(file, "%s\n", getSetupLine(player_setup_tokens, prefix, i)); } - /* system setup */ + // system setup syi = setup.system; fprintf(file, "\n"); for (i = 0; i < NUM_SYSTEM_SETUP_TOKENS; i++) fprintf(file, "%s\n", getSetupLine(system_setup_tokens, "", i)); - /* options setup */ + // internal setup + // (internal setup values not saved to user setup file) + + // debug setup + sdi = setup.debug; + fprintf(file, "\n"); + for (i = 0; i < NUM_DEBUG_SETUP_TOKENS; i++) + fprintf(file, "%s\n", getSetupLine(debug_setup_tokens, "", i)); + + // options setup soi = setup.options; fprintf(file, "\n"); for (i = 0; i < NUM_OPTIONS_SETUP_TOKENS; i++) @@ -8911,7 +9560,35 @@ void SaveSetup() SetFilePermissions(filename, PERMS_PRIVATE); } -void SaveSetup_EditorCascade() +void SaveSetup_AutoSetup(void) +{ + char *filename = getPath2(getSetupDir(), AUTOSETUP_FILENAME); + FILE *file; + int i; + + InitUserDataDirectory(); + + if (!(file = fopen(filename, MODE_WRITE))) + { + Error(ERR_WARN, "cannot write auto setup file '%s'", filename); + free(filename); + return; + } + + fprintFileHeader(file, AUTOSETUP_FILENAME); + + sasi = setup.auto_setup; + for (i = 0; i < NUM_AUTO_SETUP_TOKENS; i++) + fprintf(file, "%s\n", getSetupLine(auto_setup_tokens, "", i)); + + fclose(file); + + SetFilePermissions(filename, PERMS_PRIVATE); + + free(filename); +} + +void SaveSetup_EditorCascade(void) { char *filename = getPath2(getSetupDir(), EDITORCASCADE_FILENAME); FILE *file; @@ -8926,12 +9603,9 @@ void SaveSetup_EditorCascade() return; } - fprintf(file, "%s\n", getFormattedSetupEntry(TOKEN_STR_FILE_IDENTIFIER, - getCookie("SETUP"))); - fprintf(file, "\n"); + fprintFileHeader(file, EDITORCASCADE_FILENAME); seci = setup.editor_cascade; - fprintf(file, "\n"); for (i = 0; i < NUM_EDITOR_CASCADE_SETUP_TOKENS; i++) fprintf(file, "%s\n", getSetupLine(editor_cascade_setup_tokens, "", i)); @@ -8942,7 +9616,48 @@ void SaveSetup_EditorCascade() free(filename); } -void LoadCustomElementDescriptions() +static void SaveSetup_WriteGameControllerMappings(SetupFileHash *mappings_hash, + char *filename) +{ + FILE *file; + + if (!(file = fopen(filename, MODE_WRITE))) + { + Error(ERR_WARN, "cannot write game controller mappings file '%s'",filename); + + return; + } + + BEGIN_HASH_ITERATION(mappings_hash, itr) + { + fprintf(file, "%s\n", HASH_ITERATION_VALUE(itr)); + } + END_HASH_ITERATION(mappings_hash, itr) + + fclose(file); +} + +void SaveSetup_AddGameControllerMapping(char *mapping) +{ + char *filename = getPath2(getSetupDir(), GAMECONTROLLER_BASENAME); + SetupFileHash *mappings_hash = newSetupFileHash(); + + InitUserDataDirectory(); + + // load existing personal game controller mappings + LoadSetup_ReadGameControllerMappings(mappings_hash, filename); + + // add new mapping to personal game controller mappings + addGameControllerMappingToHash(mappings_hash, mapping); + + // save updated personal game controller mappings + SaveSetup_WriteGameControllerMappings(mappings_hash, filename); + + freeSetupFileHash(mappings_hash); + free(filename); +} + +void LoadCustomElementDescriptions(void) { char *filename = getCustomArtworkConfigFilename(ARTWORK_TYPE_GRAPHICS); SetupFileHash *setup_file_hash; @@ -8976,19 +9691,10 @@ void LoadCustomElementDescriptions() static int getElementFromToken(char *token) { -#if 1 char *value = getHashEntry(element_token_hash, token); if (value != NULL) return atoi(value); -#else - int i; - - /* !!! OPTIMIZE THIS BY USING HASH !!! */ - for (i = 0; i < MAX_NUM_ELEMENTS; i++) - if (strEqual(token, element_info[i].token_name)) - return i; -#endif Error(ERR_WARN, "unknown element token '%s'", token); @@ -9006,51 +9712,18 @@ static int get_token_parameter_value(char *token, char *value_raw) if (suffix == NULL) suffix = token; -#if 1 if (strEqual(suffix, ".element")) return getElementFromToken(value_raw); -#endif - -#if 0 - if (strncmp(suffix, ".font", 5) == 0) - { - int i; - - /* !!! OPTIMIZE THIS BY USING HASH !!! */ - for (i = 0; i < NUM_FONTS; i++) - if (strEqual(value_raw, font_info[i].token_name)) - return i; - - /* if font not found, use reliable default value */ - return FONT_INITIAL_1; - } -#endif - /* !!! USE CORRECT VALUE TYPE (currently works also for TYPE_BOOLEAN) !!! */ + // !!! USE CORRECT VALUE TYPE (currently works also for TYPE_BOOLEAN) !!! return get_parameter_value(value_raw, suffix, TYPE_INTEGER); } -void InitMenuDesignSettings_Static() +void InitMenuDesignSettings_Static(void) { -#if 0 - static SetupFileHash *image_config_hash = NULL; -#endif int i; -#if 0 - if (image_config_hash == NULL) - { - image_config_hash = newSetupFileHash(); - - for (i = 0; image_config[i].token != NULL; i++) - setHashEntry(image_config_hash, - image_config[i].token, - image_config[i].value); - } -#endif - -#if 1 - /* always start with reliable default values from static default config */ + // always start with reliable default values from static default config for (i = 0; image_config_vars[i].token != NULL; i++) { char *value = getHashEntry(image_config_hash, image_config_vars[i].token); @@ -9059,29 +9732,49 @@ void InitMenuDesignSettings_Static() *image_config_vars[i].value = get_token_parameter_value(image_config_vars[i].token, value); } - -#else - - int j; - - /* always start with reliable default values from static default config */ - for (i = 0; image_config_vars[i].token != NULL; i++) - for (j = 0; image_config[j].token != NULL; j++) - if (strEqual(image_config_vars[i].token, image_config[j].token)) - *image_config_vars[i].value = - get_token_parameter_value(image_config_vars[i].token, - image_config[j].value); -#endif } -static void InitMenuDesignSettings_SpecialPreProcessing() +static void InitMenuDesignSettings_SpecialPreProcessing(void) { int i; - /* the following initializes hierarchical values from static configuration */ - - /* special case: initialize "ARG_DEFAULT" values in static default config */ - /* (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") */ + // the following initializes hierarchical values from static configuration + + // special case: initialize "ARG_DEFAULT" values in static default config + // (e.g., initialize "[titlemessage].fade_mode" from "[title].fade_mode") + titlescreen_initial_first_default.fade_mode = + title_initial_first_default.fade_mode; + titlescreen_initial_first_default.fade_delay = + title_initial_first_default.fade_delay; + titlescreen_initial_first_default.post_delay = + title_initial_first_default.post_delay; + titlescreen_initial_first_default.auto_delay = + title_initial_first_default.auto_delay; + titlescreen_first_default.fade_mode = title_first_default.fade_mode; + titlescreen_first_default.fade_delay = title_first_default.fade_delay; + titlescreen_first_default.post_delay = title_first_default.post_delay; + titlescreen_first_default.auto_delay = title_first_default.auto_delay; + titlemessage_initial_first_default.fade_mode = + title_initial_first_default.fade_mode; + titlemessage_initial_first_default.fade_delay = + title_initial_first_default.fade_delay; + titlemessage_initial_first_default.post_delay = + title_initial_first_default.post_delay; + titlemessage_initial_first_default.auto_delay = + title_initial_first_default.auto_delay; + titlemessage_first_default.fade_mode = title_first_default.fade_mode; + titlemessage_first_default.fade_delay = title_first_default.fade_delay; + titlemessage_first_default.post_delay = title_first_default.post_delay; + titlemessage_first_default.auto_delay = title_first_default.auto_delay; + + titlescreen_initial_default.fade_mode = title_initial_default.fade_mode; + titlescreen_initial_default.fade_delay = title_initial_default.fade_delay; + titlescreen_initial_default.post_delay = title_initial_default.post_delay; + titlescreen_initial_default.auto_delay = title_initial_default.auto_delay; + titlescreen_default.fade_mode = title_default.fade_mode; + titlescreen_default.fade_delay = title_default.fade_delay; + titlescreen_default.post_delay = title_default.post_delay; + titlescreen_default.auto_delay = title_default.auto_delay; titlemessage_initial_default.fade_mode = title_initial_default.fade_mode; titlemessage_initial_default.fade_delay = title_initial_default.fade_delay; titlemessage_initial_default.post_delay = title_initial_default.post_delay; @@ -9091,33 +9784,131 @@ static void InitMenuDesignSettings_SpecialPreProcessing() titlemessage_default.post_delay = title_default.post_delay; titlemessage_default.auto_delay = title_default.auto_delay; - /* special case: initialize "ARG_DEFAULT" values in static default config */ - /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ + // special case: initialize "ARG_DEFAULT" values in static default config + // (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") for (i = 0; i < MAX_NUM_TITLE_MESSAGES; i++) { + titlescreen_initial_first[i] = titlescreen_initial_first_default; + titlescreen_first[i] = titlescreen_first_default; + titlemessage_initial_first[i] = titlemessage_initial_first_default; + titlemessage_first[i] = titlemessage_first_default; + + titlescreen_initial[i] = titlescreen_initial_default; + titlescreen[i] = titlescreen_default; titlemessage_initial[i] = titlemessage_initial_default; titlemessage[i] = titlemessage_default; } - /* special case: initialize "ARG_DEFAULT" values in static default config */ - /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */ + // special case: initialize "ARG_DEFAULT" values in static default config + // (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) { + if (i == GFX_SPECIAL_ARG_TITLE) // title values already initialized + continue; + menu.enter_screen[i] = menu.enter_screen[GFX_SPECIAL_ARG_DEFAULT]; menu.leave_screen[i] = menu.leave_screen[GFX_SPECIAL_ARG_DEFAULT]; + menu.next_screen[i] = menu.next_screen[GFX_SPECIAL_ARG_DEFAULT]; + } + + // special case: initialize "ARG_DEFAULT" values in static default config + // (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") + for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) + { + viewport.window[i] = viewport.window[GFX_SPECIAL_ARG_DEFAULT]; + viewport.playfield[i] = viewport.playfield[GFX_SPECIAL_ARG_DEFAULT]; + viewport.door_1[i] = viewport.door_1[GFX_SPECIAL_ARG_DEFAULT]; + + if (i == GFX_SPECIAL_ARG_EDITOR) // editor values already initialized + continue; + + viewport.door_2[i] = viewport.door_2[GFX_SPECIAL_ARG_DEFAULT]; } } -static void InitMenuDesignSettings_SpecialPostProcessing() +static void InitMenuDesignSettings_SpecialPostProcessing(void) { - /* special case: initialize later added SETUP list size from LEVELS value */ + static struct + { + struct XY *dst, *src; + } + game_buttons_xy[] = + { + { &game.button.save, &game.button.stop }, + { &game.button.pause2, &game.button.pause }, + { &game.button.load, &game.button.play }, + { &game.button.undo, &game.button.stop }, + { &game.button.redo, &game.button.play }, + + { NULL, NULL } + }; + int i; + + // special case: initialize later added SETUP list size from LEVELS value if (menu.list_size[GAME_MODE_SETUP] == -1) menu.list_size[GAME_MODE_SETUP] = menu.list_size[GAME_MODE_LEVELS]; + + // set default position for snapshot buttons to stop/pause/play buttons + for (i = 0; game_buttons_xy[i].dst != NULL; i++) + if ((*game_buttons_xy[i].dst).x == -1 && + (*game_buttons_xy[i].dst).y == -1) + *game_buttons_xy[i].dst = *game_buttons_xy[i].src; +} + +static void InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics(void) +{ + static struct + { + struct XYTileSize *dst, *src; + int graphic; + } + editor_buttons_xy[] = + { + { + &editor.button.element_left, &editor.palette.element_left, + IMG_GFX_EDITOR_BUTTON_ELEMENT_LEFT + }, + { + &editor.button.element_middle, &editor.palette.element_middle, + IMG_GFX_EDITOR_BUTTON_ELEMENT_MIDDLE + }, + { + &editor.button.element_right, &editor.palette.element_right, + IMG_GFX_EDITOR_BUTTON_ELEMENT_RIGHT + }, + + { NULL, NULL } + }; + int i; + + // set default position for element buttons to element graphics + for (i = 0; editor_buttons_xy[i].dst != NULL; i++) + { + if ((*editor_buttons_xy[i].dst).x == -1 && + (*editor_buttons_xy[i].dst).y == -1) + { + struct GraphicInfo *gd = &graphic_info[editor_buttons_xy[i].graphic]; + + gd->width = gd->height = editor_buttons_xy[i].src->tile_size; + + *editor_buttons_xy[i].dst = *editor_buttons_xy[i].src; + } + } } static void LoadMenuDesignSettingsFromFilename(char *filename) { + static struct TitleFadingInfo tfi; static struct TitleMessageInfo tmi; + static struct TokenInfo title_tokens[] = + { + { TYPE_INTEGER, &tfi.fade_mode, ".fade_mode" }, + { TYPE_INTEGER, &tfi.fade_delay, ".fade_delay" }, + { TYPE_INTEGER, &tfi.post_delay, ".post_delay" }, + { TYPE_INTEGER, &tfi.auto_delay, ".auto_delay" }, + + { -1, NULL, NULL } + }; static struct TokenInfo titlemessage_tokens[] = { { TYPE_INTEGER, &tmi.x, ".x" }, @@ -9141,12 +9932,60 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) { -1, NULL, NULL } }; static struct + { + struct TitleFadingInfo *info; + char *text; + } + title_info[] = + { + // initialize first titles from "enter screen" definitions, if defined + { &title_initial_first_default, "menu.enter_screen.TITLE" }, + { &title_first_default, "menu.enter_screen.TITLE" }, + + // initialize title screens from "next screen" definitions, if defined + { &title_initial_default, "menu.next_screen.TITLE" }, + { &title_default, "menu.next_screen.TITLE" }, + + { NULL, NULL } + }; + static struct { struct TitleMessageInfo *array; char *text; } titlemessage_arrays[] = { + // initialize first titles from "enter screen" definitions, if defined + { titlescreen_initial_first, "menu.enter_screen.TITLE" }, + { titlescreen_first, "menu.enter_screen.TITLE" }, + { titlemessage_initial_first, "menu.enter_screen.TITLE" }, + { titlemessage_first, "menu.enter_screen.TITLE" }, + + // initialize titles from "next screen" definitions, if defined + { titlescreen_initial, "menu.next_screen.TITLE" }, + { titlescreen, "menu.next_screen.TITLE" }, + { titlemessage_initial, "menu.next_screen.TITLE" }, + { titlemessage, "menu.next_screen.TITLE" }, + + // overwrite titles with title definitions, if defined + { titlescreen_initial_first, "[title_initial]" }, + { titlescreen_first, "[title]" }, + { titlemessage_initial_first, "[title_initial]" }, + { titlemessage_first, "[title]" }, + + { titlescreen_initial, "[title_initial]" }, + { titlescreen, "[title]" }, + { titlemessage_initial, "[title_initial]" }, + { titlemessage, "[title]" }, + + // overwrite titles with title screen/message definitions, if defined + { titlescreen_initial_first, "[titlescreen_initial]" }, + { titlescreen_first, "[titlescreen]" }, + { titlemessage_initial_first, "[titlemessage_initial]" }, + { titlemessage_first, "[titlemessage]" }, + + { titlescreen_initial, "[titlescreen_initial]" }, + { titlescreen, "[titlescreen]" }, { titlemessage_initial, "[titlemessage_initial]" }, { titlemessage, "[titlemessage]" }, @@ -9155,17 +9994,13 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) SetupFileHash *setup_file_hash; int i, j, k; -#if 0 - printf("LoadMenuDesignSettings from file '%s' ...\n", filename); -#endif - if ((setup_file_hash = loadSetupFileHash(filename)) == NULL) return; - /* the following initializes hierarchical values from dynamic configuration */ + // the following initializes hierarchical values from dynamic configuration - /* special case: initialize with default values that may be overwritten */ - /* (e.g., init "menu.draw_xoffset.INFO" from "menu.draw_xoffset") */ + // special case: initialize with default values that may be overwritten + // (e.g., init "menu.draw_xoffset.INFO" from "menu.draw_xoffset") for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) { char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset"); @@ -9180,8 +10015,8 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) menu.list_size[i] = get_integer_from_string(value_3); } - /* special case: initialize with default values that may be overwritten */ - /* (eg, init "menu.draw_xoffset.INFO[XXX]" from "menu.draw_xoffset.INFO") */ + // special case: initialize with default values that may be overwritten + // (eg, init "menu.draw_xoffset.INFO[XXX]" from "menu.draw_xoffset.INFO") for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++) { char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset.INFO"); @@ -9191,10 +10026,18 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) menu.draw_xoffset_info[i] = get_integer_from_string(value_1); if (value_2 != NULL) menu.draw_yoffset_info[i] = get_integer_from_string(value_2); + + if (i == GFX_SPECIAL_ARG_INFO_ELEMENTS) + { + char *value_1 = getHashEntry(setup_file_hash, "menu.list_size.INFO"); + + if (value_1 != NULL) + menu.list_size_info[i] = get_integer_from_string(value_1); + } } - /* special case: initialize with default values that may be overwritten */ - /* (eg, init "menu.draw_xoffset.SETUP[XXX]" from "menu.draw_xoffset.SETUP") */ + // special case: initialize with default values that may be overwritten + // (eg, init "menu.draw_xoffset.SETUP[XXX]" from "menu.draw_xoffset.SETUP") for (i = 0; i < NUM_SPECIAL_GFX_SETUP_ARGS; i++) { char *value_1 = getHashEntry(setup_file_hash, "menu.draw_xoffset.SETUP"); @@ -9206,8 +10049,42 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) menu.draw_yoffset_setup[i] = get_integer_from_string(value_2); } - /* special case: initialize with default values that may be overwritten */ - /* (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") */ + // special case: initialize with default values that may be overwritten + // (eg, init "menu.line_spacing.INFO[XXX]" from "menu.line_spacing.INFO") + for (i = 0; i < NUM_SPECIAL_GFX_INFO_ARGS; i++) + { + char *value_1 = getHashEntry(setup_file_hash,"menu.left_spacing.INFO"); + char *value_2 = getHashEntry(setup_file_hash,"menu.right_spacing.INFO"); + char *value_3 = getHashEntry(setup_file_hash,"menu.top_spacing.INFO"); + char *value_4 = getHashEntry(setup_file_hash,"menu.bottom_spacing.INFO"); + char *value_5 = getHashEntry(setup_file_hash,"menu.paragraph_spacing.INFO"); + char *value_6 = getHashEntry(setup_file_hash,"menu.headline1_spacing.INFO"); + char *value_7 = getHashEntry(setup_file_hash,"menu.headline2_spacing.INFO"); + char *value_8 = getHashEntry(setup_file_hash,"menu.line_spacing.INFO"); + char *value_9 = getHashEntry(setup_file_hash,"menu.extra_spacing.INFO"); + + if (value_1 != NULL) + menu.left_spacing_info[i] = get_integer_from_string(value_1); + if (value_2 != NULL) + menu.right_spacing_info[i] = get_integer_from_string(value_2); + if (value_3 != NULL) + menu.top_spacing_info[i] = get_integer_from_string(value_3); + if (value_4 != NULL) + menu.bottom_spacing_info[i] = get_integer_from_string(value_4); + if (value_5 != NULL) + menu.paragraph_spacing_info[i] = get_integer_from_string(value_5); + if (value_6 != NULL) + menu.headline1_spacing_info[i] = get_integer_from_string(value_6); + if (value_7 != NULL) + menu.headline2_spacing_info[i] = get_integer_from_string(value_7); + if (value_8 != NULL) + menu.line_spacing_info[i] = get_integer_from_string(value_8); + if (value_9 != NULL) + menu.extra_spacing_info[i] = get_integer_from_string(value_9); + } + + // special case: initialize with default values that may be overwritten + // (eg, init "menu.enter_screen.SCORES.xyz" from "menu.enter_screen.xyz") for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) { char *token_1 = "menu.enter_screen.fade_mode"; @@ -9216,12 +10093,18 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) char *token_4 = "menu.leave_screen.fade_mode"; char *token_5 = "menu.leave_screen.fade_delay"; char *token_6 = "menu.leave_screen.post_delay"; + char *token_7 = "menu.next_screen.fade_mode"; + char *token_8 = "menu.next_screen.fade_delay"; + char *token_9 = "menu.next_screen.post_delay"; char *value_1 = getHashEntry(setup_file_hash, token_1); char *value_2 = getHashEntry(setup_file_hash, token_2); char *value_3 = getHashEntry(setup_file_hash, token_3); char *value_4 = getHashEntry(setup_file_hash, token_4); char *value_5 = getHashEntry(setup_file_hash, token_5); char *value_6 = getHashEntry(setup_file_hash, token_6); + char *value_7 = getHashEntry(setup_file_hash, token_7); + char *value_8 = getHashEntry(setup_file_hash, token_8); + char *value_9 = getHashEntry(setup_file_hash, token_9); if (value_1 != NULL) menu.enter_screen[i].fade_mode = get_token_parameter_value(token_1, @@ -9241,10 +10124,126 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) if (value_6 != NULL) menu.leave_screen[i].post_delay = get_token_parameter_value(token_6, value_6); + if (value_7 != NULL) + menu.next_screen[i].fade_mode = get_token_parameter_value(token_7, + value_7); + if (value_8 != NULL) + menu.next_screen[i].fade_delay = get_token_parameter_value(token_8, + value_8); + if (value_9 != NULL) + menu.next_screen[i].post_delay = get_token_parameter_value(token_9, + value_9); + } + + // special case: initialize with default values that may be overwritten + // (eg, init "viewport.door_1.MAIN.xyz" from "viewport.door_1.xyz") + for (i = 0; i < NUM_SPECIAL_GFX_ARGS; i++) + { + char *token_w1 = "viewport.window.width"; + char *token_w2 = "viewport.window.height"; + char *token_01 = "viewport.playfield.x"; + char *token_02 = "viewport.playfield.y"; + char *token_03 = "viewport.playfield.width"; + char *token_04 = "viewport.playfield.height"; + char *token_05 = "viewport.playfield.border_size"; + char *token_06 = "viewport.door_1.x"; + char *token_07 = "viewport.door_1.y"; + char *token_08 = "viewport.door_1.width"; + char *token_09 = "viewport.door_1.height"; + char *token_10 = "viewport.door_1.border_size"; + char *token_11 = "viewport.door_2.x"; + char *token_12 = "viewport.door_2.y"; + char *token_13 = "viewport.door_2.width"; + char *token_14 = "viewport.door_2.height"; + char *token_15 = "viewport.door_2.border_size"; + char *value_w1 = getHashEntry(setup_file_hash, token_w1); + char *value_w2 = getHashEntry(setup_file_hash, token_w2); + char *value_01 = getHashEntry(setup_file_hash, token_01); + char *value_02 = getHashEntry(setup_file_hash, token_02); + char *value_03 = getHashEntry(setup_file_hash, token_03); + char *value_04 = getHashEntry(setup_file_hash, token_04); + char *value_05 = getHashEntry(setup_file_hash, token_05); + char *value_06 = getHashEntry(setup_file_hash, token_06); + char *value_07 = getHashEntry(setup_file_hash, token_07); + char *value_08 = getHashEntry(setup_file_hash, token_08); + char *value_09 = getHashEntry(setup_file_hash, token_09); + char *value_10 = getHashEntry(setup_file_hash, token_10); + char *value_11 = getHashEntry(setup_file_hash, token_11); + char *value_12 = getHashEntry(setup_file_hash, token_12); + char *value_13 = getHashEntry(setup_file_hash, token_13); + char *value_14 = getHashEntry(setup_file_hash, token_14); + char *value_15 = getHashEntry(setup_file_hash, token_15); + + if (value_w1 != NULL) + viewport.window[i].width = get_token_parameter_value(token_w1, value_w1); + if (value_w2 != NULL) + viewport.window[i].height = get_token_parameter_value(token_w2, value_w2); + if (value_01 != NULL) + viewport.playfield[i].x = get_token_parameter_value(token_01, value_01); + if (value_02 != NULL) + viewport.playfield[i].y = get_token_parameter_value(token_02, value_02); + if (value_03 != NULL) + viewport.playfield[i].width = get_token_parameter_value(token_03, + value_03); + if (value_04 != NULL) + viewport.playfield[i].height = get_token_parameter_value(token_04, + value_04); + if (value_05 != NULL) + viewport.playfield[i].border_size = get_token_parameter_value(token_05, + value_05); + if (value_06 != NULL) + viewport.door_1[i].x = get_token_parameter_value(token_06, value_06); + if (value_07 != NULL) + viewport.door_1[i].y = get_token_parameter_value(token_07, value_07); + if (value_08 != NULL) + viewport.door_1[i].width = get_token_parameter_value(token_08, value_08); + if (value_09 != NULL) + viewport.door_1[i].height = get_token_parameter_value(token_09, value_09); + if (value_10 != NULL) + viewport.door_1[i].border_size = get_token_parameter_value(token_10, + value_10); + if (value_11 != NULL) + viewport.door_2[i].x = get_token_parameter_value(token_11, value_11); + if (value_12 != NULL) + viewport.door_2[i].y = get_token_parameter_value(token_12, value_12); + if (value_13 != NULL) + viewport.door_2[i].width = get_token_parameter_value(token_13, value_13); + if (value_14 != NULL) + viewport.door_2[i].height = get_token_parameter_value(token_14, value_14); + if (value_15 != NULL) + viewport.door_1[i].border_size = get_token_parameter_value(token_15, + value_15); + } + + // special case: initialize with default values that may be overwritten + // (e.g., init "[title].fade_mode" from "menu.next_screen.TITLE.fade_mode") + for (i = 0; title_info[i].info != NULL; i++) + { + struct TitleFadingInfo *info = title_info[i].info; + char *base_token = title_info[i].text; + + for (j = 0; title_tokens[j].type != -1; j++) + { + char *token = getStringCat2(base_token, title_tokens[j].text); + char *value = getHashEntry(setup_file_hash, token); + + if (value != NULL) + { + int parameter_value = get_token_parameter_value(token, value); + + tfi = *info; + + *(int *)title_tokens[j].value = (int)parameter_value; + + *info = tfi; + } + + free(token); + } } - /* special case: initialize with default values that may be overwritten */ - /* (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") */ + // special case: initialize with default values that may be overwritten + // (e.g., init "titlemessage_1.fade_mode" from "[titlemessage].fade_mode") for (i = 0; titlemessage_arrays[i].array != NULL; i++) { struct TitleMessageInfo *array = titlemessage_arrays[i].array; @@ -9264,9 +10263,9 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) tmi = array[k]; if (titlemessage_tokens[j].type == TYPE_INTEGER) - *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value; - else *(int *)titlemessage_tokens[j].value = (int)parameter_value; + else + *(boolean *)titlemessage_tokens[j].value = (boolean)parameter_value; array[k] = tmi; } @@ -9276,12 +10275,12 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) } } - /* read (and overwrite with) values that may be specified in config file */ + // read (and overwrite with) values that may be specified in config file for (i = 0; image_config_vars[i].token != NULL; i++) { char *value = getHashEntry(setup_file_hash, image_config_vars[i].token); - /* (ignore definitions set to "[DEFAULT]" which are already initialized) */ + // (ignore definitions set to "[DEFAULT]" which are already initialized) if (value != NULL && !strEqual(value, ARG_DEFAULT)) *image_config_vars[i].value = get_token_parameter_value(image_config_vars[i].token, value); @@ -9290,20 +10289,16 @@ static void LoadMenuDesignSettingsFromFilename(char *filename) freeSetupFileHash(setup_file_hash); } -void LoadMenuDesignSettings() +void LoadMenuDesignSettings(void) { char *filename_base = UNDEFINED_FILENAME, *filename_local; InitMenuDesignSettings_Static(); InitMenuDesignSettings_SpecialPreProcessing(); -#if 1 if (!GFX_OVERRIDE_ARTWORK(ARTWORK_TYPE_GRAPHICS)) -#else - if (!SETUP_OVERRIDE_ARTWORK(setup, ARTWORK_TYPE_GRAPHICS)) -#endif { - /* first look for special settings configured in level series config */ + // first look for special settings configured in level series config filename_base = getCustomArtworkLevelConfigFilename(ARTWORK_TYPE_GRAPHICS); if (fileExists(filename_base)) @@ -9318,6 +10313,11 @@ void LoadMenuDesignSettings() InitMenuDesignSettings_SpecialPostProcessing(); } +void LoadMenuDesignSettings_AfterGraphics(void) +{ + InitMenuDesignSettings_SpecialPostProcessing_AfterGraphics(); +} + void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { char *filename = getEditorSetupFilename(); @@ -9334,18 +10334,18 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) for (i = 0; i < NUM_FILE_ELEMENTS; i++) setHashEntry(element_hash, element_info[i].token_name, i_to_a(i)); - /* determined size may be larger than needed (due to unknown elements) */ + // determined size may be larger than needed (due to unknown elements) *num_elements = 0; for (list = setup_file_list; list != NULL; list = list->next) (*num_elements)++; - /* add space for up to 3 more elements for padding that may be needed */ + // add space for up to 3 more elements for padding that may be needed *num_elements += 3; - /* free memory for old list of elements, if needed */ + // free memory for old list of elements, if needed checked_free(*elements); - /* allocate memory for new list of elements */ + // allocate memory for new list of elements *elements = checked_malloc(*num_elements * sizeof(int)); *num_elements = 0; @@ -9353,7 +10353,7 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { char *value = getHashEntry(element_hash, list->token); - if (value == NULL) /* try to find obsolete token mapping */ + if (value == NULL) // try to find obsolete token mapping { char *mapped_token = get_mapped_token(list->token); @@ -9387,7 +10387,7 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) if (num_unknown_tokens > 0) Error(ERR_INFO_LINE, "-"); - while (*num_elements % 4) /* pad with empty elements, if needed */ + while (*num_elements % 4) // pad with empty elements, if needed (*elements)[(*num_elements)++] = EL_EMPTY; freeSetupFileList(setup_file_list); @@ -9433,17 +10433,13 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, if (filename_music == NULL) return NULL; - /* ---------- try to replace file extension ---------- */ + // ---------- try to replace file extension ---------- filename_prefix = getStringCopy(filename_music); if (strrchr(filename_prefix, '.') != NULL) *strrchr(filename_prefix, '.') = '\0'; filename_info = getStringCat2(filename_prefix, ".txt"); -#if 0 - printf("trying to load file '%s'...\n", filename_info); -#endif - if (fileExists(filename_info)) setup_file_hash = loadSetupFileHash(filename_info); @@ -9452,15 +10448,11 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, if (setup_file_hash == NULL) { - /* ---------- try to add file extension ---------- */ + // ---------- try to add file extension ---------- filename_prefix = getStringCopy(filename_music); filename_info = getStringCat2(filename_prefix, ".txt"); -#if 0 - printf("trying to load file '%s'...\n", filename_info); -#endif - if (fileExists(filename_info)) setup_file_hash = loadSetupFileHash(filename_info); @@ -9471,7 +10463,7 @@ static struct MusicFileInfo *get_music_file_info_ext(char *basename, int music, if (setup_file_hash == NULL) return NULL; - /* ---------- music file info found ---------- */ + // ---------- music file info found ---------- clear_mem(&tmp_music_file_info, sizeof(struct MusicFileInfo)); @@ -9523,14 +10515,14 @@ static boolean sound_info_listed(struct MusicFileInfo *list, char *basename) return music_info_listed_ext(list, basename, TRUE); } -void LoadMusicInfo() +void LoadMusicInfo(void) { char *music_directory = getCustomMusicDirectory(); int num_music = getMusicListSize(); int num_music_noconf = 0; int num_sounds = getSoundListSize(); - DIR *dir; - struct dirent *dir_entry; + Directory *dir; + DirectoryEntry *dir_entry; struct FileInfo *music, *sound; struct MusicFileInfo *next, **new; int i; @@ -9568,35 +10560,32 @@ void LoadMusicInfo() if (strEqual(music->filename, UNDEFINED_FILENAME)) continue; - /* a configured file may be not recognized as music */ + // a configured file may be not recognized as music if (!FileIsMusic(music->filename)) continue; -#if 0 - printf("::: -> '%s' (configured)\n", music->filename); -#endif - if (!music_info_listed(music_file_info, music->filename)) { *new = get_music_file_info(music->filename, i); + if (*new != NULL) new = &(*new)->next; } } - if ((dir = opendir(music_directory)) == NULL) + if ((dir = openDirectory(music_directory)) == NULL) { Error(ERR_WARN, "cannot read music directory '%s'", music_directory); return; } - while ((dir_entry = readdir(dir)) != NULL) /* loop until last dir entry */ + while ((dir_entry = readDirectory(dir)) != NULL) // loop all entries { - char *basename = dir_entry->d_name; + char *basename = dir_entry->basename; boolean music_already_used = FALSE; int i; - /* skip all music files that are configured in music config file */ + // skip all music files that are configured in music config file for (i = 0; i < num_music; i++) { music = getMusicListEntry(i); @@ -9614,16 +10603,13 @@ void LoadMusicInfo() if (music_already_used) continue; - if (!FileIsMusic(basename)) + if (!FileIsMusic(dir_entry->filename)) continue; -#if 0 - printf("::: -> '%s' (found in directory)\n", basename); -#endif - if (!music_info_listed(music_file_info, basename)) { *new = get_music_file_info(basename, MAP_NOCONF_MUSIC(num_music_noconf)); + if (*new != NULL) new = &(*new)->next; } @@ -9631,7 +10617,7 @@ void LoadMusicInfo() num_music_noconf++; } - closedir(dir); + closeDirectory(dir); for (i = 0; i < num_sounds; i++) { @@ -9643,14 +10629,10 @@ void LoadMusicInfo() if (strEqual(sound->filename, UNDEFINED_FILENAME)) continue; - /* a configured file may be not recognized as sound */ + // a configured file may be not recognized as sound if (!FileIsSound(sound->filename)) continue; -#if 0 - printf("::: -> '%s' (configured)\n", sound->filename); -#endif - if (!sound_info_listed(music_file_info, sound->filename)) { *new = get_sound_file_info(sound->filename, i); @@ -9658,15 +10640,10 @@ void LoadMusicInfo() new = &(*new)->next; } } - -#if 0 - for (next = music_file_info; next != NULL; next = next->next) - printf("::: title == '%s'\n", next->title); -#endif } -void add_helpanim_entry(int element, int action, int direction, int delay, - int *num_list_entries) +static void add_helpanim_entry(int element, int action, int direction, + int delay, int *num_list_entries) { struct HelpAnimInfo *new_list_entry; (*num_list_entries)++; @@ -9682,7 +10659,7 @@ void add_helpanim_entry(int element, int action, int direction, int delay, new_list_entry->delay = delay; } -void print_unknown_token(char *filename, char *token, int token_nr) +static void print_unknown_token(char *filename, char *token, int token_nr) { if (token_nr == 0) { @@ -9694,13 +10671,13 @@ void print_unknown_token(char *filename, char *token, int token_nr) Error(ERR_INFO, "- token: '%s'", token); } -void print_unknown_token_end(int token_nr) +static void print_unknown_token_end(int token_nr) { if (token_nr > 0) Error(ERR_INFO_LINE, "-"); } -void LoadHelpAnimInfo() +void LoadHelpAnimInfo(void) { char *filename = getHelpAnimFilename(); SetupFileList *setup_file_list = NULL, *list; @@ -9714,7 +10691,7 @@ void LoadHelpAnimInfo() if (setup_file_list == NULL) { - /* use reliable default values from static configuration */ + // use reliable default values from static configuration SetupFileList *insert_ptr; insert_ptr = setup_file_list = @@ -9738,7 +10715,7 @@ void LoadHelpAnimInfo() setHashEntry(action_hash, element_action_info[i].suffix, i_to_a(element_action_info[i].value)); - /* do not store direction index (bit) here, but direction value! */ + // do not store direction index (bit) here, but direction value! for (i = 0; i < NUM_DIRECTIONS_FULL; i++) setHashEntry(direction_hash, element_direction_info[i].suffix, i_to_a(1 << element_direction_info[i].value)); @@ -9760,35 +10737,35 @@ void LoadHelpAnimInfo() if this does not work, also accept combined "element[.act][.dir]" elements (like "dynamite.active"), which are unique elements */ - if (strchr(list->token, '.') == NULL) /* token contains no '.' */ + if (strchr(list->token, '.') == NULL) // token contains no '.' { element_value = getHashEntry(element_hash, list->token); - if (element_value != NULL) /* element found */ + if (element_value != NULL) // element found add_helpanim_entry(atoi(element_value), -1, -1, delay, &num_list_entries); else { - /* no further suffixes found -- this is not an element */ + // no further suffixes found -- this is not an element print_unknown_token(filename, list->token, num_unknown_tokens++); } continue; } - /* token has format "." */ + // token has format "." - action_token = strchr(list->token, '.'); /* suffix may be action ... */ - direction_token = action_token; /* ... or direction */ + action_token = strchr(list->token, '.'); // suffix may be action ... + direction_token = action_token; // ... or direction element_token = getStringCopy(list->token); *strchr(element_token, '.') = '\0'; element_value = getHashEntry(element_hash, element_token); - if (element_value == NULL) /* this is no element */ + if (element_value == NULL) // this is no element { element_value = getHashEntry(element_hash, list->token); - if (element_value != NULL) /* combined element found */ + if (element_value != NULL) // combined element found add_helpanim_entry(atoi(element_value), -1, -1, delay, &num_list_entries); else @@ -9801,7 +10778,7 @@ void LoadHelpAnimInfo() action_value = getHashEntry(action_hash, action_token); - if (action_value != NULL) /* action found */ + if (action_value != NULL) // action found { add_helpanim_entry(atoi(element_value), atoi(action_value), -1, delay, &num_list_entries); @@ -9813,7 +10790,7 @@ void LoadHelpAnimInfo() direction_value = getHashEntry(direction_hash, direction_token); - if (direction_value != NULL) /* direction found */ + if (direction_value != NULL) // direction found { add_helpanim_entry(atoi(element_value), -1, atoi(direction_value), delay, &num_list_entries); @@ -9825,10 +10802,10 @@ void LoadHelpAnimInfo() if (strchr(action_token + 1, '.') == NULL) { - /* no further suffixes found -- this is not an action nor direction */ + // no further suffixes found -- this is not an action nor direction element_value = getHashEntry(element_hash, list->token); - if (element_value != NULL) /* combined element found */ + if (element_value != NULL) // combined element found add_helpanim_entry(atoi(element_value), -1, -1, delay, &num_list_entries); else @@ -9839,7 +10816,7 @@ void LoadHelpAnimInfo() continue; } - /* token has format ".." */ + // token has format ".." direction_token = strchr(action_token + 1, '.'); @@ -9848,10 +10825,10 @@ void LoadHelpAnimInfo() action_value = getHashEntry(action_hash, action_token); - if (action_value == NULL) /* this is no action */ + if (action_value == NULL) // this is no action { element_value = getHashEntry(element_hash, list->token); - if (element_value != NULL) /* combined element found */ + if (element_value != NULL) // combined element found add_helpanim_entry(atoi(element_value), -1, -1, delay, &num_list_entries); else @@ -9865,7 +10842,7 @@ void LoadHelpAnimInfo() direction_value = getHashEntry(direction_hash, direction_token); - if (direction_value != NULL) /* direction found */ + if (direction_value != NULL) // direction found { add_helpanim_entry(atoi(element_value), atoi(action_value), atoi(direction_value), delay, &num_list_entries); @@ -9876,10 +10853,10 @@ void LoadHelpAnimInfo() continue; } - /* this is no direction */ + // this is no direction element_value = getHashEntry(element_hash, list->token); - if (element_value != NULL) /* combined element found */ + if (element_value != NULL) // combined element found add_helpanim_entry(atoi(element_value), -1, -1, delay, &num_list_entries); else @@ -9910,7 +10887,7 @@ void LoadHelpAnimInfo() #endif } -void LoadHelpTextInfo() +void LoadHelpTextInfo(void) { char *filename = getHelpTextFilename(); int i; @@ -9926,7 +10903,7 @@ void LoadHelpTextInfo() if (helptext_info == NULL) { - /* use reliable default values from static configuration */ + // use reliable default values from static configuration helptext_info = newSetupFileHash(); for (i = 0; helptext_config[i].token; i++) @@ -9946,13 +10923,13 @@ void LoadHelpTextInfo() } -/* ------------------------------------------------------------------------- */ -/* convert levels */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// convert levels +// ---------------------------------------------------------------------------- #define MAX_NUM_CONVERT_LEVELS 1000 -void ConvertLevels() +void ConvertLevels(void) { static LevelDirTree *convert_leveldir = NULL; static int convert_level_nr = -1; @@ -9978,15 +10955,15 @@ void ConvertLevels() convert_level_nr = convert_leveldir->first_level; - printf_line("=", 79); - printf("Converting levels\n"); - printf_line("-", 79); - printf("Level series identifier: '%s'\n", convert_leveldir->identifier); - printf("Level series name: '%s'\n", convert_leveldir->name); - printf("Level series author: '%s'\n", convert_leveldir->author); - printf("Number of levels: %d\n", convert_leveldir->levels); - printf_line("=", 79); - printf("\n"); + PrintLine("=", 79); + Print("Converting levels\n"); + PrintLine("-", 79); + Print("Level series identifier: '%s'\n", convert_leveldir->identifier); + Print("Level series name: '%s'\n", convert_leveldir->name); + Print("Level series author: '%s'\n", convert_leveldir->author); + Print("Number of levels: %d\n", convert_leveldir->levels); + PrintLine("=", 79); + Print("\n"); for (i = 0; i < MAX_NUM_CONVERT_LEVELS; i++) levels_failed[i] = FALSE; @@ -9998,16 +10975,16 @@ void ConvertLevels() level_nr = convert_level_nr++; - printf("Level %03d: ", level_nr); + Print("Level %03d: ", level_nr); LoadLevel(level_nr); - if (level.no_valid_file) + if (level.no_level_file || level.no_valid_file) { - printf("(no level)\n"); + Print("(no level)\n"); continue; } - printf("converting level ... "); + Print("converting level ... "); level_filename = getDefaultLevelFilename(level_nr); new_level = !fileExists(level_filename); @@ -10018,28 +10995,28 @@ void ConvertLevels() num_levels_converted++; - printf("converted.\n"); + Print("converted.\n"); } else { if (level_nr >= 0 && level_nr < MAX_NUM_CONVERT_LEVELS) levels_failed[level_nr] = TRUE; - printf("NOT CONVERTED -- LEVEL ALREADY EXISTS.\n"); + Print("NOT CONVERTED -- LEVEL ALREADY EXISTS.\n"); } num_levels_handled++; } - printf("\n"); - printf_line("=", 79); - printf("Number of levels handled: %d\n", num_levels_handled); - printf("Number of levels converted: %d (%d%%)\n", num_levels_converted, + Print("\n"); + PrintLine("=", 79); + Print("Number of levels handled: %d\n", num_levels_handled); + Print("Number of levels converted: %d (%d%%)\n", num_levels_converted, (num_levels_handled ? num_levels_converted * 100 / num_levels_handled : 0)); - printf_line("-", 79); - printf("Summary (for automatic parsing by scripts):\n"); - printf("LEVELDIR '%s', CONVERTED %d/%d (%d%%)", + PrintLine("-", 79); + Print("Summary (for automatic parsing by scripts):\n"); + Print("LEVELDIR '%s', CONVERTED %d/%d (%d%%)", convert_leveldir->identifier, num_levels_converted, num_levels_handled, (num_levels_handled ? @@ -10047,24 +11024,24 @@ void ConvertLevels() if (num_levels_handled != num_levels_converted) { - printf(", FAILED:"); + Print(", FAILED:"); for (i = 0; i < MAX_NUM_CONVERT_LEVELS; i++) if (levels_failed[i]) - printf(" %03d", i); + Print(" %03d", i); } - printf("\n"); - printf_line("=", 79); + Print("\n"); + PrintLine("=", 79); CloseAllAndExit(0); } -/* ------------------------------------------------------------------------- */ -/* create and save images for use in level sketches (raw BMP format) */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// create and save images for use in level sketches (raw BMP format) +// ---------------------------------------------------------------------------- -void CreateLevelSketchImages() +void CreateLevelSketchImages(void) { #if defined(TARGET_SDL) Bitmap *bitmap1; @@ -10093,8 +11070,9 @@ void CreateLevelSketchImages() filename1 = getPath2(global.create_images_dir, basename1); filename2 = getPath2(global.create_images_dir, basename2); - getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, bitmap1, src_x, src_y, TILEX, TILEY, 0, 0); + getFixedGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, bitmap1, src_x, src_y, TILEX, TILEY, + 0, 0); if (SDL_SaveBMP(bitmap1->surface, filename1) != 0) Error(ERR_EXIT, "cannot save level sketch image file '%s'", filename1); @@ -10125,28 +11103,33 @@ void CreateLevelSketchImages() } -/* ------------------------------------------------------------------------- */ -/* create and save images for custom and group elements (raw BMP format) */ -/* ------------------------------------------------------------------------- */ +// ---------------------------------------------------------------------------- +// create and save images for custom and group elements (raw BMP format) +// ---------------------------------------------------------------------------- -void CreateCustomElementImages() +void CreateCustomElementImages(char *directory) { #if defined(TARGET_SDL) - char *filename = "graphics.classic/RocksCE.bmp"; - Bitmap *bitmap; + char *src_basename = "RocksCE-template.ilbm"; + char *dst_basename = "RocksCE.bmp"; + char *src_filename = getPath2(directory, src_basename); + char *dst_filename = getPath2(directory, dst_basename); Bitmap *src_bitmap; - int dummy_graphic = IMG_CUSTOM_99; + Bitmap *bitmap; int yoffset_ce = 0; int yoffset_ge = (TILEY * NUM_CUSTOM_ELEMENTS / 16); - int src_x, src_y; int i; + SDLInitVideoDisplay(); + + ReCreateBitmap(&backbuffer, video.width, video.height); + + src_bitmap = LoadImage(src_filename); + bitmap = CreateBitmap(TILEX * 16 * 2, TILEY * (NUM_CUSTOM_ELEMENTS + NUM_GROUP_ELEMENTS) / 16, DEFAULT_DEPTH); - getGraphicSource(dummy_graphic, 0, &src_bitmap, &src_x, &src_y); - for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int x = i % 16; @@ -10157,18 +11140,22 @@ void CreateCustomElementImages() BlitBitmap(src_bitmap, bitmap, 0, 0, TILEX, TILEY, TILEX * x, TILEY * y + yoffset_ce); - BlitBitmap(src_bitmap, bitmap, 0, TILEY, TILEX, TILEY, - TILEX * x + TILEX * 16, TILEY * y + yoffset_ce); + BlitBitmap(src_bitmap, bitmap, 0, TILEY, + TILEX, TILEY, + TILEX * x + TILEX * 16, + TILEY * y + yoffset_ce); for (j = 2; j >= 0; j--) { int c = ii % 10; - BlitBitmap(src_bitmap, bitmap, TILEX + c * 7, 0, 6, 10, + BlitBitmap(src_bitmap, bitmap, + TILEX + c * 7, 0, 6, 10, TILEX * x + 6 + j * 7, TILEY * y + 11 + yoffset_ce); - BlitBitmap(src_bitmap, bitmap, TILEX + c * 8, TILEY, 6, 10, + BlitBitmap(src_bitmap, bitmap, + TILEX + c * 8, TILEY, 6, 10, TILEX * 16 + TILEX * x + 6 + j * 8, TILEY * y + 10 + yoffset_ce); @@ -10186,8 +11173,10 @@ void CreateCustomElementImages() BlitBitmap(src_bitmap, bitmap, 0, 0, TILEX, TILEY, TILEX * x, TILEY * y + yoffset_ge); - BlitBitmap(src_bitmap, bitmap, 0, TILEY, TILEX, TILEY, - TILEX * x + TILEX * 16, TILEY * y + yoffset_ge); + BlitBitmap(src_bitmap, bitmap, 0, TILEY, + TILEX, TILEY, + TILEX * x + TILEX * 16, + TILEY * y + yoffset_ge); for (j = 1; j >= 0; j--) { @@ -10197,7 +11186,8 @@ void CreateCustomElementImages() TILEX * x + 6 + j * 10, TILEY * y + 11 + yoffset_ge); - BlitBitmap(src_bitmap, bitmap, TILEX + c * 8, TILEY + 12, 6, 10, + BlitBitmap(src_bitmap, bitmap, + TILEX + c * 8, TILEY + 12, 6, 10, TILEX * 16 + TILEX * x + 10 + j * 8, TILEY * y + 10 + yoffset_ge); @@ -10205,18 +11195,11 @@ void CreateCustomElementImages() } } - if (SDL_SaveBMP(bitmap->surface, filename) != 0) - Error(ERR_EXIT, "cannot save CE graphics file '%s'", filename); + if (SDL_SaveBMP(bitmap->surface, dst_filename) != 0) + Error(ERR_EXIT, "cannot save CE graphics file '%s'", dst_filename); FreeBitmap(bitmap); CloseAllAndExit(0); #endif } - -#if 0 -void CreateLevelSketchImages_TEST() -{ - void CreateCustomElementImages() -} -#endif