X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ffiles.c;h=8d3cbc9986c90b83e4536bf78bc15e59f8a1ffb8;hb=1e57e2856183b3ea50b298ec6ffb4307b584c056;hp=601c74cf8e9f3814e0d20f82cb776855fb8e8daa;hpb=afc13e1c0cca61ea29a91198f1e36d22c0c9e7e4;p=rocksndiamonds.git diff --git a/src/files.c b/src/files.c index 601c74cf..8d3cbc99 100644 --- a/src/files.c +++ b/src/files.c @@ -49,6 +49,23 @@ #define TAPE_COOKIE_TMPL "ROCKSNDIAMONDS_TAPE_FILE_VERSION_x.x" #define SCORE_COOKIE "ROCKSNDIAMONDS_SCORE_FILE_VERSION_1.2" +static struct +{ + int filetype; + char *id; +} +filetype_id_list[] = +{ + { LEVEL_FILE_TYPE_RND, "RND" }, + { LEVEL_FILE_TYPE_BD, "BD" }, + { LEVEL_FILE_TYPE_EM, "EM" }, + { LEVEL_FILE_TYPE_SP, "SP" }, + { LEVEL_FILE_TYPE_DX, "DX" }, + { LEVEL_FILE_TYPE_SB, "SB" }, + { LEVEL_FILE_TYPE_DC, "DC" }, + { -1, NULL }, +}; + /* ========================================================================= */ /* level file functions */ @@ -71,11 +88,12 @@ void setElementChangePages(struct ElementInfo *ei, int change_pages) void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) { - int x, y; + int i, x, y; change->can_change = FALSE; - change->events = CE_BITMASK_DEFAULT; + for (i = 0; i < NUM_CHANGE_EVENTS; i++) + change->has_event[i] = FALSE; change->trigger_player = CH_PLAYER_ANY; change->trigger_side = CH_SIDE_ANY; @@ -96,6 +114,11 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) change->random_percentage = 100; change->replace_when = CP_WHEN_EMPTY; + change->use_action = FALSE; + change->action_type = CA_NO_ACTION; + change->action_mode = CA_MODE_UNDEFINED; + change->action_arg = CA_ARG_UNDEFINED; + for (x = 0; x < 3; x++) for (y = 0; y < 3; y++) change->target_content[x][y] = EL_EMPTY_SPACE; @@ -111,9 +134,10 @@ void setElementChangeInfoToDefaults(struct ElementChangeInfo *change) static void setLevelInfoToDefaults(struct LevelInfo *level) { static boolean clipboard_elements_initialized = FALSE; - int i, j, x, y; + setLevelInfoToDefaults_EM(); + level->native_em_level = &native_em_level; level->game_engine_type = GAME_ENGINE_TYPE_RND; @@ -153,8 +177,11 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->block_last_field = FALSE; /* EM does not block by default */ level->sp_block_last_field = TRUE; /* SP blocks the last field */ + +#if 0 /* !!! THIS IS NOT A LEVEL SETTING => LOGIC MOVED TO "game.c" !!! */ level->block_delay = 8; /* when blocking, block 8 frames */ level->sp_block_delay = 9; /* SP indeed blocks 9 frames, not 8 */ +#endif level->can_move_into_acid_bits = ~0; /* everything can move into acid */ level->dont_collide_with_bits = ~0; /* always deadly when colliding */ @@ -162,6 +189,25 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) level->use_spring_bug = FALSE; level->use_step_counter = FALSE; + /* values for the new EMC elements */ + level->android_move_time = 10; + level->android_clone_time = 10; + level->ball_random = FALSE; + level->ball_state_initial = FALSE; + level->ball_time = 10; + level->lenses_score = 10; + level->magnify_score = 10; + level->slurp_score = 10; + level->lenses_time = 10; + level->magnify_time = 10; + level->wind_direction_initial = MV_NO_MOVING; + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (x = 0; x < 3; x++) + for (y = 0; y < 3; y++) + level->ball_content[i][x][y] = EL_EMPTY; + for (i = 0; i < 16; i++) + level->android_array[i] = FALSE; + level->use_custom_template = FALSE; for (i = 0; i < MAX_LEVEL_NAME_LEN; i++) @@ -252,6 +298,9 @@ static void setLevelInfoToDefaults(struct LevelInfo *level) element_info[element].explosion_delay = 16; element_info[element].ignition_delay = 8; + element_info[element].counter_initial = 0; + element_info[element].counter = 0; + for (x = 0; x < 3; x++) for (y = 0; y < 3; y++) element_info[element].content[x][y] = EL_EMPTY_SPACE; @@ -391,34 +440,14 @@ static int getFileTypeFromBasename(char *basename) return LEVEL_FILE_TYPE_UNKNOWN; } -static char *getSingleLevelBasename(int nr, int type) +static char *getSingleLevelBasename(int nr) { static char basename[MAX_FILENAME_LEN]; - char *level_filename = getStringCopy(leveldir_current->level_filename); - - if (level_filename == NULL) - level_filename = getStringCat2("%03d.", LEVELFILE_EXTENSION); - - switch (type) - { - case LEVEL_FILE_TYPE_RND: - if (nr < 0) - sprintf(basename, "template.%s", LEVELFILE_EXTENSION); - else - sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); - break; - - case LEVEL_FILE_TYPE_EM: - sprintf(basename, "%d", nr); - break; - case LEVEL_FILE_TYPE_UNKNOWN: - default: - sprintf(basename, level_filename, nr); - break; - } - - free(level_filename); + if (nr < 0) + sprintf(basename, "template.%s", LEVELFILE_EXTENSION); + else + sprintf(basename, "%03d.%s", nr, LEVELFILE_EXTENSION); return basename; } @@ -461,9 +490,9 @@ static char *getPackedLevelBasename(int type) return basename; } -static char *getSingleLevelFilename(int nr, int type) +static char *getSingleLevelFilename(int nr) { - return getLevelFilenameFromBasename(getSingleLevelBasename(nr, type)); + return getLevelFilenameFromBasename(getSingleLevelBasename(nr)); } #if 0 @@ -475,9 +504,10 @@ static char *getPackedLevelFilename(int type) char *getDefaultLevelFilename(int nr) { - return getSingleLevelFilename(nr, LEVEL_FILE_TYPE_RND); + return getSingleLevelFilename(nr); } +#if 0 static void setLevelFileInfo_SingleLevelFilename(struct LevelFileInfo *lfi, int type) { @@ -486,6 +516,23 @@ static void setLevelFileInfo_SingleLevelFilename(struct LevelFileInfo *lfi, lfi->basename = getSingleLevelBasename(lfi->nr, lfi->type); lfi->filename = getLevelFilenameFromBasename(lfi->basename); } +#endif + +static void setLevelFileInfo_FormatLevelFilename(struct LevelFileInfo *lfi, + int type, char *format, ...) +{ + static char basename[MAX_FILENAME_LEN]; + va_list ap; + + va_start(ap, format); + vsprintf(basename, format, ap); + va_end(ap); + + lfi->type = type; + lfi->packed = FALSE; + lfi->basename = basename; + lfi->filename = getLevelFilenameFromBasename(lfi->basename); +} static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi, int type) @@ -496,7 +543,37 @@ static void setLevelFileInfo_PackedLevelFilename(struct LevelFileInfo *lfi, lfi->filename = getLevelFilenameFromBasename(lfi->basename); } -static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) +static int getFiletypeFromID(char *filetype_id) +{ + char *filetype_id_lower; + int filetype = LEVEL_FILE_TYPE_UNKNOWN; + int i; + + if (filetype_id == NULL) + return LEVEL_FILE_TYPE_UNKNOWN; + + filetype_id_lower = getStringToLower(filetype_id); + + for (i = 0; filetype_id_list[i].id != NULL; i++) + { + char *id_lower = getStringToLower(filetype_id_list[i].id); + + if (strcmp(filetype_id_lower, id_lower) == 0) + filetype = filetype_id_list[i].filetype; + + free(id_lower); + + if (filetype != LEVEL_FILE_TYPE_UNKNOWN) + break; + } + + free(filetype_id_lower); + + return filetype; +} + +#if 0 +static void OLD_determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) { /* special case: level number is negative => check for level template file */ if (lfi->nr < 0) @@ -508,8 +585,11 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) if (leveldir_current->level_filename != NULL) { + int filetype = getFiletypeFromID(leveldir_current->level_filetype); + /* check for file name/pattern specified in "levelinfo.conf" */ - setLevelFileInfo_SingleLevelFilename(lfi, LEVEL_FILE_TYPE_UNKNOWN); + setLevelFileInfo_SingleLevelFilename(lfi, filetype); + if (fileExists(lfi->filename)) return; } @@ -532,6 +612,79 @@ static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) /* no known level file found -- try to use default values */ setLevelFileInfo_SingleLevelFilename(lfi, LEVEL_FILE_TYPE_UNKNOWN); } +#endif + +static void determineLevelFileInfo_Filename(struct LevelFileInfo *lfi) +{ + int nr = lfi->nr; + + /* 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); + + /* no fallback if template file not existing */ + return; + } + + /* 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); + if (fileExists(lfi->filename)) + return; + } + + /* 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) */ + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "a%c%c", + 'a' + (nr / 10) % 26, '0' + nr % 10); + if (fileExists(lfi->filename)) + return; + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "A%c%c", + 'A' + (nr / 10) % 26, '0' + nr % 10); + if (fileExists(lfi->filename)) + return; + + /* 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) */ + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02ds", nr); + if (fileExists(lfi->filename)) + return; + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02dS", nr); + if (fileExists(lfi->filename)) + return; + + /* check for Emerald Mine level file (V6 / teamwork mode) */ + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02dt", nr); + if (fileExists(lfi->filename)) + return; + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_EM, "%02dT", nr); + if (fileExists(lfi->filename)) + return; + + /* 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) */ + setLevelFileInfo_FormatLevelFilename(lfi, LEVEL_FILE_TYPE_RND, + "%03d.%s", nr, LEVELFILE_EXTENSION); +} static void determineLevelFileInfo_Filetype(struct LevelFileInfo *lfi) { @@ -946,6 +1099,7 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) for (i = 0; i < num_changed_custom_elements; i++) { int element = getFile16BitBE(file); + unsigned long event_bits; if (!IS_CUSTOM_ELEMENT(element)) { @@ -984,7 +1138,10 @@ static int LoadLevel_CUS3(FILE *file, int chunk_size, struct LevelInfo *level) element_info[element].content[x][y] = getMappedElement(getFile16BitBE(file)); - element_info[element].change->events = getFile32BitBE(file); + event_bits = getFile32BitBE(file); + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (event_bits & (1 << j)) + element_info[element].change->has_event[j] = TRUE; element_info[element].change->target_element = getMappedElement(getFile16BitBE(file)); @@ -1026,7 +1183,7 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) struct ElementInfo *ei; int chunk_size_expected; int element; - int i, x, y; + int i, j, x, y; element = getFile16BitBE(file); @@ -1108,11 +1265,15 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; + unsigned long event_bits; /* always start with reliable default values */ setElementChangeInfoToDefaults(change); - change->events = getFile32BitBE(file); + event_bits = getFile32BitBE(file); + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (event_bits & (1 << j)) + change->has_event[j] = TRUE; change->target_element = getMappedElement(getFile16BitBE(file)); @@ -1145,8 +1306,18 @@ static int LoadLevel_CUS4(FILE *file, int chunk_size, struct LevelInfo *level) change->trigger_page = (change->trigger_page == CH_PAGE_ANY_FILE ? CH_PAGE_ANY : (1 << change->trigger_page)); +#if 1 + change->use_action = getFile8Bit(file); + change->action_type = getFile8Bit(file); + change->action_mode = getFile8Bit(file); + change->action_arg = getFile16BitBE(file); + + /* some free bytes for future change property values and padding */ + ReadUnusedBytesFromFile(file, 1); +#else /* some free bytes for future change property values and padding */ ReadUnusedBytesFromFile(file, 6); +#endif #else @@ -1767,648 +1938,29 @@ static void OLD_LoadLevelFromFileInfo_EM(struct LevelInfo *level, #else -static int map_element_RND_to_EM(int element_rnd) -{ - static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS]; - static boolean mapping_initialized = FALSE; - - struct - { - int element_em; - int element_rnd; - } - mapping_RND_to_EM_list[] = - { - { Xblank, EL_EMPTY }, - { Xstone, EL_ROCK }, - { Xnut, EL_NUT }, - { Xbug_n, EL_BUG_UP }, - { Xbug_e, EL_BUG_RIGHT }, - { Xbug_s, EL_BUG_DOWN }, - { Xbug_w, EL_BUG_LEFT }, - { Xtank_n, EL_SPACESHIP_UP }, - { Xtank_e, EL_SPACESHIP_RIGHT }, - { Xtank_s, EL_SPACESHIP_DOWN }, - { Xtank_w, EL_SPACESHIP_LEFT }, - { Xandroid, EL_EMC_ANDROID }, - { Xandroid_1_n, EL_EMC_ANDROID_UP }, - { Xandroid_1_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_1_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_1_s, EL_EMC_ANDROID_DOWN }, - { Xspring, EL_SPRING }, - { Xeater_n, EL_YAMYAM }, - { Xalien, EL_ROBOT }, - { Xemerald, EL_EMERALD }, - { Xdiamond, EL_DIAMOND }, - { Xdrip_fall, EL_AMOEBA_DROP }, - { Xbomb, EL_BOMB }, - { Xballoon, EL_BALLOON }, - { Xgrass, EL_EMC_GRASS }, - { Xdirt, EL_SAND }, - { Xacid_ne, EL_ACID_POOL_TOPRIGHT }, - { Xacid_se, EL_ACID_POOL_BOTTOMRIGHT }, - { Xacid_s, EL_ACID_POOL_BOTTOM }, - { Xacid_sw, EL_ACID_POOL_BOTTOMLEFT }, - { Xacid_nw, EL_ACID_POOL_TOPLEFT }, - { Xacid_1, EL_ACID }, - { Xball_1, EL_EMC_GENERATOR_BALL }, - { Xgrow_ns, EL_EMC_GROW }, - { Xwonderwall, EL_MAGIC_WALL }, - { Xameuba_1, EL_AMOEBA_WET }, - { Xdoor_1, EL_EM_GATE_1 }, - { Xdoor_2, EL_EM_GATE_2 }, - { Xdoor_3, EL_EM_GATE_3 }, - { Xdoor_4, EL_EM_GATE_4 }, - { Xdoor_5, EL_EMC_GATE_5 }, - { Xdoor_6, EL_EMC_GATE_6 }, - { Xdoor_7, EL_EMC_GATE_7 }, - { Xdoor_8, EL_EMC_GATE_8 }, - { Xkey_1, EL_EM_KEY_1 }, - { Xkey_2, EL_EM_KEY_2 }, - { Xkey_3, EL_EM_KEY_3 }, - { Xkey_4, EL_EM_KEY_4 }, - { Xkey_5, EL_EMC_KEY_5 }, - { Xkey_6, EL_EMC_KEY_6 }, - { Xkey_7, EL_EMC_KEY_7 }, - { Xkey_8, EL_EMC_KEY_8 }, - { Xwind_n, EL_BALLOON_SWITCH_UP }, - { Xwind_e, EL_BALLOON_SWITCH_RIGHT }, - { Xwind_s, EL_BALLOON_SWITCH_DOWN }, - { Xwind_w, EL_BALLOON_SWITCH_LEFT }, - { Xwind_nesw, EL_BALLOON_SWITCH_ANY }, - { Xwind_stop, EL_BALLOON_SWITCH_NONE }, - { Xexit, EL_EXIT_CLOSED }, - { Xexit_1, EL_EXIT_OPEN }, - { Xdynamite, EL_DYNAMITE }, - { Xdynamite_1, EL_DYNAMITE_ACTIVE }, - { Xbumper, EL_EMC_BUMPER }, - { Xwheel, EL_ROBOT_WHEEL }, - { Xswitch, EL_UNKNOWN }, - { Xsand, EL_QUICKSAND_EMPTY }, - { Xsand_stone, EL_QUICKSAND_FULL }, - { Xplant, EL_EMC_PLANT }, - { Xlenses, EL_EMC_LENSES }, - { Xmagnify, EL_EMC_MAGNIFY }, - { Xdripper, EL_UNKNOWN }, - { Xfake_blank, EL_INVISIBLE_WALL }, - { Xfake_grass, EL_INVISIBLE_SAND }, - { Xfake_door_1, EL_EM_GATE_1_GRAY }, - { Xfake_door_2, EL_EM_GATE_2_GRAY }, - { Xfake_door_3, EL_EM_GATE_3_GRAY }, - { Xfake_door_4, EL_EM_GATE_4_GRAY }, - { Xfake_door_5, EL_EMC_GATE_5_GRAY }, - { Xfake_door_6, EL_EMC_GATE_6_GRAY }, - { Xfake_door_7, EL_EMC_GATE_7_GRAY }, - { Xfake_door_8, EL_EMC_GATE_8_GRAY }, - { Xsteel_1, EL_STEELWALL }, - { Xsteel_2, EL_UNKNOWN }, - { Xsteel_3, EL_EMC_STEELWALL_1 }, - { Xsteel_4, EL_UNKNOWN }, - { Xwall_1, EL_WALL }, - { Xwall_2, EL_UNKNOWN }, - { Xwall_3, EL_UNKNOWN }, - { Xwall_4, EL_UNKNOWN }, - { Xround_wall_1, EL_WALL_SLIPPERY }, - { Xround_wall_2, EL_UNKNOWN }, - { Xround_wall_3, EL_UNKNOWN }, - { Xround_wall_4, EL_UNKNOWN }, - { Xdecor_1, EL_UNKNOWN }, - { Xdecor_2, EL_EMC_WALL_6 }, - { Xdecor_3, EL_EMC_WALL_4 }, - { Xdecor_4, EL_EMC_WALL_5 }, - { Xdecor_5, EL_EMC_WALL_7 }, - { Xdecor_6, EL_EMC_WALL_8 }, - { Xdecor_7, EL_UNKNOWN }, - { Xdecor_8, EL_EMC_WALL_1 }, - { Xdecor_9, EL_EMC_WALL_2 }, - { Xdecor_10, EL_EMC_WALL_3 }, - { Xdecor_11, EL_UNKNOWN }, - { Xdecor_12, EL_UNKNOWN }, - { Xalpha_0, EL_CHAR('0') }, - { Xalpha_1, EL_CHAR('1') }, - { Xalpha_2, EL_CHAR('2') }, - { Xalpha_3, EL_CHAR('3') }, - { Xalpha_4, EL_CHAR('4') }, - { Xalpha_5, EL_CHAR('5') }, - { Xalpha_6, EL_CHAR('6') }, - { Xalpha_7, EL_CHAR('7') }, - { Xalpha_8, EL_CHAR('8') }, - { Xalpha_9, EL_CHAR('9') }, - { Xalpha_excla, EL_CHAR('!') }, - { Xalpha_quote, EL_CHAR('"') }, - { Xalpha_comma, EL_CHAR(',') }, - { Xalpha_minus, EL_CHAR('-') }, - { Xalpha_perio, EL_CHAR('.') }, - { Xalpha_colon, EL_CHAR(':') }, - { Xalpha_quest, EL_CHAR('?') }, - { Xalpha_a, EL_CHAR('A') }, - { Xalpha_b, EL_CHAR('B') }, - { Xalpha_c, EL_CHAR('C') }, - { Xalpha_d, EL_CHAR('D') }, - { Xalpha_e, EL_CHAR('E') }, - { Xalpha_f, EL_CHAR('F') }, - { Xalpha_g, EL_CHAR('G') }, - { Xalpha_h, EL_CHAR('H') }, - { Xalpha_i, EL_CHAR('I') }, - { Xalpha_j, EL_CHAR('J') }, - { Xalpha_k, EL_CHAR('K') }, - { Xalpha_l, EL_CHAR('L') }, - { Xalpha_m, EL_CHAR('M') }, - { Xalpha_n, EL_CHAR('N') }, - { Xalpha_o, EL_CHAR('O') }, - { Xalpha_p, EL_CHAR('P') }, - { Xalpha_q, EL_CHAR('Q') }, - { Xalpha_r, EL_CHAR('R') }, - { Xalpha_s, EL_CHAR('S') }, - { Xalpha_t, EL_CHAR('T') }, - { Xalpha_u, EL_CHAR('U') }, - { Xalpha_v, EL_CHAR('V') }, - { Xalpha_w, EL_CHAR('W') }, - { Xalpha_x, EL_CHAR('X') }, - { Xalpha_y, EL_CHAR('Y') }, - { Xalpha_z, EL_CHAR('Z') }, - { Xalpha_arrow_e, EL_CHAR('>') }, - { Xalpha_arrow_w, EL_CHAR('<') }, - { Xalpha_copyr, EL_CHAR('©') }, - - { Zplayer, EL_PLAYER_1 }, - { Zplayer, EL_PLAYER_2 }, - { Zplayer, EL_PLAYER_3 }, - { Zplayer, EL_PLAYER_4 }, - - { ZBORDER, EL_EMC_LEVEL_BORDER }, - - { -1, -1 } - }; - - if (!mapping_initialized) - { - int i; - - /* return "Xalpha_quest" for all undefined elements in mapping array */ - for (i = 0; i < NUM_FILE_ELEMENTS; i++) - mapping_RND_to_EM[i] = Xalpha_quest; - - for (i = 0; mapping_RND_to_EM_list[i].element_rnd != -1; i++) - mapping_RND_to_EM[mapping_RND_to_EM_list[i].element_rnd] = - mapping_RND_to_EM_list[i].element_em; - - mapping_initialized = TRUE; - } - - if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS) - return mapping_RND_to_EM[element_rnd]; - - Error(ERR_WARN, "invalid RND level element %d", element_rnd); - - return EL_UNKNOWN; -} - -static int map_element_EM_to_RND(int element_em) -{ - static unsigned short mapping_EM_to_RND[TILE_MAX]; - static boolean mapping_initialized = FALSE; - - struct - { - int element_em; - int element_rnd; - } - mapping_EM_to_RND_list[] = - { - { Xblank, EL_EMPTY }, - { Yacid_splash_eB, EL_EMPTY }, - { Yacid_splash_wB, EL_EMPTY }, - -#ifdef EM_ENGINE_BAD_ROLL - { Xstone_force_e, EL_ROCK }, - { Xstone_force_w, EL_ROCK }, - { Xnut_force_e, EL_NUT }, - { Xnut_force_w, EL_NUT }, - { Xspring_force_e, EL_SPRING }, - { Xspring_force_w, EL_SPRING }, - { Xemerald_force_e, EL_EMERALD }, - { Xemerald_force_w, EL_EMERALD }, - { Xdiamond_force_e, EL_DIAMOND }, - { Xdiamond_force_w, EL_DIAMOND }, - { Xbomb_force_e, EL_BOMB }, - { Xbomb_force_w, EL_BOMB }, -#endif - - { Xstone, EL_ROCK }, - { Xstone_pause, EL_ROCK }, - { Xstone_fall, EL_ROCK }, - { Ystone_s, EL_ROCK }, - { Ystone_sB, EL_ROCK }, - { Ystone_e, EL_ROCK }, - { Ystone_eB, EL_ROCK }, - { Ystone_w, EL_ROCK }, - { Ystone_wB, EL_ROCK }, - { Xnut, EL_NUT }, - { Xnut_pause, EL_NUT }, - { Xnut_fall, EL_NUT }, - { Ynut_s, EL_NUT }, - { Ynut_sB, EL_NUT }, - { Ynut_e, EL_NUT }, - { Ynut_eB, EL_NUT }, - { Ynut_w, EL_NUT }, - { Ynut_wB, EL_NUT }, - { Xbug_n, EL_BUG_UP }, - { Xbug_e, EL_BUG_RIGHT }, - { Xbug_s, EL_BUG_DOWN }, - { Xbug_w, EL_BUG_LEFT }, - { Xbug_gon, EL_BUG_UP }, - { Xbug_goe, EL_BUG_RIGHT }, - { Xbug_gos, EL_BUG_DOWN }, - { Xbug_gow, EL_BUG_LEFT }, - { Ybug_n, EL_BUG_UP }, - { Ybug_nB, EL_BUG_UP }, - { Ybug_e, EL_BUG_RIGHT }, - { Ybug_eB, EL_BUG_RIGHT }, - { Ybug_s, EL_BUG_DOWN }, - { Ybug_sB, EL_BUG_DOWN }, - { Ybug_w, EL_BUG_LEFT }, - { Ybug_wB, EL_BUG_LEFT }, - { Ybug_w_n, EL_BUG_UP }, - { Ybug_n_e, EL_BUG_RIGHT }, - { Ybug_e_s, EL_BUG_DOWN }, - { Ybug_s_w, EL_BUG_LEFT }, - { Ybug_e_n, EL_BUG_UP }, - { Ybug_s_e, EL_BUG_RIGHT }, - { Ybug_w_s, EL_BUG_DOWN }, - { Ybug_n_w, EL_BUG_LEFT }, - { Ybug_stone, EL_ROCK }, - { Ybug_spring, EL_SPRING }, - { Xtank_n, EL_SPACESHIP_UP }, - { Xtank_e, EL_SPACESHIP_RIGHT }, - { Xtank_s, EL_SPACESHIP_DOWN }, - { Xtank_w, EL_SPACESHIP_LEFT }, - { Xtank_gon, EL_SPACESHIP_UP }, - { Xtank_goe, EL_SPACESHIP_RIGHT }, - { Xtank_gos, EL_SPACESHIP_DOWN }, - { Xtank_gow, EL_SPACESHIP_LEFT }, - { Ytank_n, EL_SPACESHIP_UP }, - { Ytank_nB, EL_SPACESHIP_UP }, - { Ytank_e, EL_SPACESHIP_RIGHT }, - { Ytank_eB, EL_SPACESHIP_RIGHT }, - { Ytank_s, EL_SPACESHIP_DOWN }, - { Ytank_sB, EL_SPACESHIP_DOWN }, - { Ytank_w, EL_SPACESHIP_LEFT }, - { Ytank_wB, EL_SPACESHIP_LEFT }, - { Ytank_w_n, EL_SPACESHIP_UP }, - { Ytank_n_e, EL_SPACESHIP_RIGHT }, - { Ytank_e_s, EL_SPACESHIP_DOWN }, - { Ytank_s_w, EL_SPACESHIP_LEFT }, - { Ytank_e_n, EL_SPACESHIP_UP }, - { Ytank_s_e, EL_SPACESHIP_RIGHT }, - { Ytank_w_s, EL_SPACESHIP_DOWN }, - { Ytank_n_w, EL_SPACESHIP_LEFT }, - { Ytank_stone, EL_ROCK }, - { Ytank_spring, EL_SPRING }, - { Xandroid, EL_EMC_ANDROID }, - { Xandroid_1_n, EL_EMC_ANDROID_UP }, - { Xandroid_2_n, EL_EMC_ANDROID_UP }, - { Xandroid_1_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_2_e, EL_EMC_ANDROID_RIGHT }, - { Xandroid_1_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_2_w, EL_EMC_ANDROID_LEFT }, - { Xandroid_1_s, EL_EMC_ANDROID_DOWN }, - { Xandroid_2_s, EL_EMC_ANDROID_DOWN }, - { Yandroid_n, EL_EMC_ANDROID_UP }, - { Yandroid_nB, EL_EMC_ANDROID_UP }, - { Yandroid_ne, EL_EMC_ANDROID_RIGHT_UP }, - { Yandroid_neB, EL_EMC_ANDROID_RIGHT_UP }, - { Yandroid_e, EL_EMC_ANDROID_RIGHT }, - { Yandroid_eB, EL_EMC_ANDROID_RIGHT }, - { Yandroid_se, EL_EMC_ANDROID_RIGHT_DOWN }, - { Yandroid_seB, EL_EMC_ANDROID_RIGHT_DOWN }, - { Yandroid_s, EL_EMC_ANDROID_DOWN }, - { Yandroid_sB, EL_EMC_ANDROID_DOWN }, - { Yandroid_sw, EL_EMC_ANDROID_LEFT_DOWN }, - { Yandroid_swB, EL_EMC_ANDROID_LEFT_DOWN }, - { Yandroid_w, EL_EMC_ANDROID_LEFT }, - { Yandroid_wB, EL_EMC_ANDROID_LEFT }, - { Yandroid_nw, EL_EMC_ANDROID_LEFT_UP }, - { Yandroid_nwB, EL_EMC_ANDROID_LEFT_UP }, - { Xspring, EL_SPRING }, - { Xspring_pause, EL_SPRING }, - { Xspring_e, EL_SPRING }, - { Xspring_w, EL_SPRING }, - { Xspring_fall, EL_SPRING }, - { Yspring_s, EL_SPRING }, - { Yspring_sB, EL_SPRING }, - { Yspring_e, EL_SPRING }, - { Yspring_eB, EL_SPRING }, - { Yspring_w, EL_SPRING }, - { Yspring_wB, EL_SPRING }, - { Yspring_kill_e, EL_SPRING }, - { Yspring_kill_eB, EL_SPRING }, - { Yspring_kill_w, EL_SPRING }, - { Yspring_kill_wB, EL_SPRING }, - { Xeater_n, EL_YAMYAM }, - { Xeater_e, EL_YAMYAM }, - { Xeater_w, EL_YAMYAM }, - { Xeater_s, EL_YAMYAM }, - { Yeater_n, EL_YAMYAM }, - { Yeater_nB, EL_YAMYAM }, - { Yeater_e, EL_YAMYAM }, - { Yeater_eB, EL_YAMYAM }, - { Yeater_s, EL_YAMYAM }, - { Yeater_sB, EL_YAMYAM }, - { Yeater_w, EL_YAMYAM }, - { Yeater_wB, EL_YAMYAM }, - { Yeater_stone, EL_ROCK }, - { Yeater_spring, EL_SPRING }, - { Xalien, EL_ROBOT }, - { Xalien_pause, EL_ROBOT }, - { Yalien_n, EL_ROBOT }, - { Yalien_nB, EL_ROBOT }, - { Yalien_e, EL_ROBOT }, - { Yalien_eB, EL_ROBOT }, - { Yalien_s, EL_ROBOT }, - { Yalien_sB, EL_ROBOT }, - { Yalien_w, EL_ROBOT }, - { Yalien_wB, EL_ROBOT }, - { Yalien_stone, EL_ROCK }, - { Yalien_spring, EL_SPRING }, - { Xemerald, EL_EMERALD }, - { Xemerald_pause, EL_EMERALD }, - { Xemerald_fall, EL_EMERALD }, - { Xemerald_shine, EL_EMERALD }, - { Yemerald_s, EL_EMERALD }, - { Yemerald_sB, EL_EMERALD }, - { Yemerald_e, EL_EMERALD }, - { Yemerald_eB, EL_EMERALD }, - { Yemerald_w, EL_EMERALD }, - { Yemerald_wB, EL_EMERALD }, - { Yemerald_eat, EL_EMERALD }, - { Yemerald_stone, EL_ROCK }, - { Xdiamond, EL_DIAMOND }, - { Xdiamond_pause, EL_DIAMOND }, - { Xdiamond_fall, EL_DIAMOND }, - { Xdiamond_shine, EL_DIAMOND }, - { Ydiamond_s, EL_DIAMOND }, - { Ydiamond_sB, EL_DIAMOND }, - { Ydiamond_e, EL_DIAMOND }, - { Ydiamond_eB, EL_DIAMOND }, - { Ydiamond_w, EL_DIAMOND }, - { Ydiamond_wB, EL_DIAMOND }, - { Ydiamond_eat, EL_DIAMOND }, - { Ydiamond_stone, EL_ROCK }, - { Xdrip_fall, EL_AMOEBA_DROP }, - { Xdrip_stretch, EL_AMOEBA_DROP }, - { Xdrip_stretchB, EL_AMOEBA_DROP }, - { Xdrip_eat, EL_AMOEBA_DROP }, - { Ydrip_s1, EL_AMOEBA_DROP }, - { Ydrip_s1B, EL_AMOEBA_DROP }, - { Ydrip_s2, EL_AMOEBA_DROP }, - { Ydrip_s2B, EL_AMOEBA_DROP }, - { Xbomb, EL_BOMB }, - { Xbomb_pause, EL_BOMB }, - { Xbomb_fall, EL_BOMB }, - { Ybomb_s, EL_BOMB }, - { Ybomb_sB, EL_BOMB }, - { Ybomb_e, EL_BOMB }, - { Ybomb_eB, EL_BOMB }, - { Ybomb_w, EL_BOMB }, - { Ybomb_wB, EL_BOMB }, - { Ybomb_eat, EL_BOMB }, - { Xballoon, EL_BALLOON }, - { Yballoon_n, EL_BALLOON }, - { Yballoon_nB, EL_BALLOON }, - { Yballoon_e, EL_BALLOON }, - { Yballoon_eB, EL_BALLOON }, - { Yballoon_s, EL_BALLOON }, - { Yballoon_sB, EL_BALLOON }, - { Yballoon_w, EL_BALLOON }, - { Yballoon_wB, EL_BALLOON }, - { Xgrass, EL_SAND }, - { Ygrass_nB, EL_SAND }, - { Ygrass_eB, EL_SAND }, - { Ygrass_sB, EL_SAND }, - { Ygrass_wB, EL_SAND }, - { Xdirt, EL_SAND }, - { Ydirt_nB, EL_SAND }, - { Ydirt_eB, EL_SAND }, - { Ydirt_sB, EL_SAND }, - { Ydirt_wB, EL_SAND }, - { Xacid_ne, EL_ACID_POOL_TOPRIGHT }, - { Xacid_se, EL_ACID_POOL_BOTTOMRIGHT }, - { Xacid_s, EL_ACID_POOL_BOTTOM }, - { Xacid_sw, EL_ACID_POOL_BOTTOMLEFT }, - { Xacid_nw, EL_ACID_POOL_TOPLEFT }, - { Xacid_1, EL_ACID }, - { Xacid_2, EL_ACID }, - { Xacid_3, EL_ACID }, - { Xacid_4, EL_ACID }, - { Xacid_5, EL_ACID }, - { Xacid_6, EL_ACID }, - { Xacid_7, EL_ACID }, - { Xacid_8, EL_ACID }, - { Xball_1, EL_EMC_GENERATOR_BALL }, - { Xball_1B, EL_EMC_GENERATOR_BALL }, - { Xball_2, EL_EMC_GENERATOR_BALL }, - { Xball_2B, EL_EMC_GENERATOR_BALL }, - { Yball_eat, EL_EMC_GENERATOR_BALL }, - { Xgrow_ns, EL_EMC_GROW }, - { Ygrow_ns_eat, EL_EMC_GROW }, - { Xgrow_ew, EL_EMC_GROW }, - { Ygrow_ew_eat, EL_EMC_GROW }, - { Xwonderwall, EL_MAGIC_WALL }, - { XwonderwallB, EL_MAGIC_WALL }, - { Xameuba_1, EL_AMOEBA_WET }, - { Xameuba_2, EL_AMOEBA_WET }, - { Xameuba_3, EL_AMOEBA_WET }, - { Xameuba_4, EL_AMOEBA_WET }, - { Xameuba_5, EL_AMOEBA_WET }, - { Xameuba_6, EL_AMOEBA_WET }, - { Xameuba_7, EL_AMOEBA_WET }, - { Xameuba_8, EL_AMOEBA_WET }, - { Xdoor_1, EL_EM_GATE_1 }, - { Xdoor_2, EL_EM_GATE_2 }, - { Xdoor_3, EL_EM_GATE_3 }, - { Xdoor_4, EL_EM_GATE_4 }, - { Xdoor_5, EL_EMC_GATE_5 }, - { Xdoor_6, EL_EMC_GATE_6 }, - { Xdoor_7, EL_EMC_GATE_7 }, - { Xdoor_8, EL_EMC_GATE_8 }, - { Xkey_1, EL_EM_KEY_1 }, - { Xkey_2, EL_EM_KEY_2 }, - { Xkey_3, EL_EM_KEY_3 }, - { Xkey_4, EL_EM_KEY_4 }, - { Xkey_5, EL_EMC_KEY_5 }, - { Xkey_6, EL_EMC_KEY_6 }, - { Xkey_7, EL_EMC_KEY_7 }, - { Xkey_8, EL_EMC_KEY_8 }, - { Xwind_n, EL_BALLOON_SWITCH_UP }, - { Xwind_e, EL_BALLOON_SWITCH_RIGHT }, - { Xwind_s, EL_BALLOON_SWITCH_DOWN }, - { Xwind_w, EL_BALLOON_SWITCH_LEFT }, - { Xwind_nesw, EL_BALLOON_SWITCH_ANY }, - { Xwind_stop, EL_BALLOON_SWITCH_NONE }, - { Xexit, EL_EXIT_CLOSED }, - { Xexit_1, EL_EXIT_OPEN }, - { Xexit_2, EL_EXIT_OPEN }, - { Xexit_3, EL_EXIT_OPEN }, - { Xdynamite, EL_DYNAMITE }, - { Ydynamite_eat, EL_DYNAMITE }, - { Xdynamite_1, EL_DYNAMITE_ACTIVE }, - { Xdynamite_2, EL_DYNAMITE_ACTIVE }, - { Xdynamite_3, EL_DYNAMITE_ACTIVE }, - { Xdynamite_4, EL_DYNAMITE_ACTIVE }, - { Xbumper, EL_EMC_BUMPER }, - { XbumperB, EL_EMC_BUMPER }, - { Xwheel, EL_ROBOT_WHEEL }, - { XwheelB, EL_ROBOT_WHEEL }, - { Xswitch, EL_UNKNOWN }, - { XswitchB, EL_UNKNOWN }, - { Xsand, EL_QUICKSAND_EMPTY }, - { Xsand_stone, EL_QUICKSAND_FULL }, - { Xsand_stonein_1, EL_QUICKSAND_FULL }, - { Xsand_stonein_2, EL_QUICKSAND_FULL }, - { Xsand_stonein_3, EL_QUICKSAND_FULL }, - { Xsand_stonein_4, EL_QUICKSAND_FULL }, - { Xsand_stonesand_1, EL_QUICKSAND_FULL }, - { Xsand_stonesand_2, EL_QUICKSAND_FULL }, - { Xsand_stonesand_3, EL_QUICKSAND_FULL }, - { Xsand_stonesand_4, EL_QUICKSAND_FULL }, - { Xsand_stoneout_1, EL_QUICKSAND_FULL }, - { Xsand_stoneout_2, EL_QUICKSAND_FULL }, - { Xsand_sandstone_1, EL_QUICKSAND_FULL }, - { Xsand_sandstone_2, EL_QUICKSAND_FULL }, - { Xsand_sandstone_3, EL_QUICKSAND_FULL }, - { Xsand_sandstone_4, EL_QUICKSAND_FULL }, - { Xplant, EL_EMC_PLANT }, - { Yplant, EL_EMC_PLANT }, - { Xlenses, EL_EMC_LENSES }, - { Xmagnify, EL_EMC_MAGNIFY }, - { Xdripper, EL_UNKNOWN }, - { XdripperB, EL_UNKNOWN }, - { Xfake_blank, EL_INVISIBLE_WALL }, - { Xfake_blankB, EL_INVISIBLE_WALL }, - { Xfake_grass, EL_INVISIBLE_SAND }, - { Xfake_grassB, EL_INVISIBLE_SAND }, - { Xfake_door_1, EL_EM_GATE_1_GRAY }, - { Xfake_door_2, EL_EM_GATE_2_GRAY }, - { Xfake_door_3, EL_EM_GATE_3_GRAY }, - { Xfake_door_4, EL_EM_GATE_4_GRAY }, - { Xfake_door_5, EL_EMC_GATE_5_GRAY }, - { Xfake_door_6, EL_EMC_GATE_6_GRAY }, - { Xfake_door_7, EL_EMC_GATE_7_GRAY }, - { Xfake_door_8, EL_EMC_GATE_8_GRAY }, - { Xsteel_1, EL_STEELWALL }, - { Xsteel_2, EL_UNKNOWN }, - { Xsteel_3, EL_EMC_STEELWALL_1 }, - { Xsteel_4, EL_UNKNOWN }, - { Xwall_1, EL_WALL }, - { Xwall_2, EL_UNKNOWN }, - { Xwall_3, EL_UNKNOWN }, - { Xwall_4, EL_UNKNOWN }, - { Xround_wall_1, EL_WALL_SLIPPERY }, - { Xround_wall_2, EL_UNKNOWN }, - { Xround_wall_3, EL_UNKNOWN }, - { Xround_wall_4, EL_UNKNOWN }, - { Xdecor_1, EL_UNKNOWN }, - { Xdecor_2, EL_EMC_WALL_6 }, - { Xdecor_3, EL_EMC_WALL_4 }, - { Xdecor_4, EL_EMC_WALL_5 }, - { Xdecor_5, EL_EMC_WALL_7 }, - { Xdecor_6, EL_EMC_WALL_8 }, - { Xdecor_7, EL_UNKNOWN }, - { Xdecor_8, EL_EMC_WALL_1 }, - { Xdecor_9, EL_EMC_WALL_2 }, - { Xdecor_10, EL_EMC_WALL_3 }, - { Xdecor_11, EL_UNKNOWN }, - { Xdecor_12, EL_UNKNOWN }, - { Xalpha_0, EL_CHAR('0') }, - { Xalpha_1, EL_CHAR('1') }, - { Xalpha_2, EL_CHAR('2') }, - { Xalpha_3, EL_CHAR('3') }, - { Xalpha_4, EL_CHAR('4') }, - { Xalpha_5, EL_CHAR('5') }, - { Xalpha_6, EL_CHAR('6') }, - { Xalpha_7, EL_CHAR('7') }, - { Xalpha_8, EL_CHAR('8') }, - { Xalpha_9, EL_CHAR('9') }, - { Xalpha_excla, EL_CHAR('!') }, - { Xalpha_quote, EL_CHAR('"') }, - { Xalpha_comma, EL_CHAR(',') }, - { Xalpha_minus, EL_CHAR('-') }, - { Xalpha_perio, EL_CHAR('.') }, - { Xalpha_colon, EL_CHAR(':') }, - { Xalpha_quest, EL_CHAR('?') }, - { Xalpha_a, EL_CHAR('A') }, - { Xalpha_b, EL_CHAR('B') }, - { Xalpha_c, EL_CHAR('C') }, - { Xalpha_d, EL_CHAR('D') }, - { Xalpha_e, EL_CHAR('E') }, - { Xalpha_f, EL_CHAR('F') }, - { Xalpha_g, EL_CHAR('G') }, - { Xalpha_h, EL_CHAR('H') }, - { Xalpha_i, EL_CHAR('I') }, - { Xalpha_j, EL_CHAR('J') }, - { Xalpha_k, EL_CHAR('K') }, - { Xalpha_l, EL_CHAR('L') }, - { Xalpha_m, EL_CHAR('M') }, - { Xalpha_n, EL_CHAR('N') }, - { Xalpha_o, EL_CHAR('O') }, - { Xalpha_p, EL_CHAR('P') }, - { Xalpha_q, EL_CHAR('Q') }, - { Xalpha_r, EL_CHAR('R') }, - { Xalpha_s, EL_CHAR('S') }, - { Xalpha_t, EL_CHAR('T') }, - { Xalpha_u, EL_CHAR('U') }, - { Xalpha_v, EL_CHAR('V') }, - { Xalpha_w, EL_CHAR('W') }, - { Xalpha_x, EL_CHAR('X') }, - { Xalpha_y, EL_CHAR('Y') }, - { Xalpha_z, EL_CHAR('Z') }, - { Xalpha_arrow_e, EL_CHAR('>') }, - { Xalpha_arrow_w, EL_CHAR('<') }, - { Xalpha_copyr, EL_CHAR('©') }, - - { Zplayer, EL_PLAYER_1 }, - - { ZBORDER, EL_EMC_LEVEL_BORDER }, - - { -1, -1 } - }; - - if (!mapping_initialized) - { - int i; - - /* return "EL_UNKNOWN" for all undefined elements in mapping array */ - for (i = 0; i < TILE_MAX; i++) - mapping_EM_to_RND[i] = EL_UNKNOWN; - - for (i = 0; mapping_EM_to_RND_list[i].element_em != -1; i++) - mapping_EM_to_RND[mapping_EM_to_RND_list[i].element_em] = - mapping_EM_to_RND_list[i].element_rnd; - - mapping_initialized = TRUE; - } - - if (element_em >= 0 && element_em < TILE_MAX) - return mapping_EM_to_RND[element_em]; - - Error(ERR_WARN, "invalid EM level element %d", element_em); - - return EL_UNKNOWN; -} - void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) { + static int ball_xy[8][2] = + { + { 0, 0 }, + { 1, 0 }, + { 2, 0 }, + { 0, 1 }, + { 2, 1 }, + { 0, 2 }, + { 1, 2 }, + { 2, 2 }, + }; struct LevelInfo_EM *level_em = level->native_em_level; struct LEVEL *lev = level_em->lev; struct PLAYER *ply1 = level_em->ply1; struct PLAYER *ply2 = level_em->ply2; - int i, x, y; + int i, j, x, y; lev->width = MIN(level->fieldx, EM_MAX_CAVE_WIDTH); lev->height = MIN(level->fieldy, EM_MAX_CAVE_HEIGHT); - lev->time_initial = level->time; + lev->time_seconds = level->time; lev->required_initial = level->gems_needed; lev->emerald_score = level->score[SC_EMERALD]; @@ -2419,7 +1971,8 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) lev->eater_score = level->score[SC_YAMYAM]; lev->nut_score = level->score[SC_NUT]; lev->dynamite_score = level->score[SC_DYNAMITE]; - lev->key_score = level->score[SC_TIME_BONUS]; /* ??? CHECK THIS */ + lev->key_score = level->score[SC_KEY]; + lev->exit_score = level->score[SC_TIME_BONUS]; for (i = 0; i < MAX_ELEMENT_CONTENTS; i++) for (y = 0; y < 3; y++) @@ -2427,10 +1980,33 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) lev->eater_array[i][y * 3 + x] = map_element_RND_to_EM(level->yamyam_content[i][x][y]); - lev->ameuba_time = level->amoeba_speed; + lev->amoeba_time = level->amoeba_speed; lev->wonderwall_time_initial = level->time_magic_wall; lev->wheel_time = level->time_wheel; + lev->android_move_time = level->android_move_time; + lev->android_clone_time = level->android_clone_time; + lev->ball_random = level->ball_random; + lev->ball_state_initial = level->ball_state_initial; + lev->ball_time = level->ball_time; + + lev->lenses_score = level->lenses_score; + lev->magnify_score = level->magnify_score; + lev->slurp_score = level->slurp_score; + + lev->lenses_time = level->lenses_time; + lev->magnify_time = level->magnify_time; + lev->wind_direction_initial = level->wind_direction_initial; + + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (j = 0; j < 8; j++) + lev->ball_array[i][j] = + map_element_RND_to_EM(level-> + ball_content[i][ball_xy[j][0]][ball_xy[j][1]]); + + for (i = 0; i < 16; i++) + lev->android_array[i] = FALSE; /* !!! YET TO COME !!! */ + /* 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++) @@ -2441,6 +2017,9 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) { int new_element = map_element_RND_to_EM(level->field[x][y]); + if (level->field[x][y] == EL_AMOEBA_DEAD) + new_element = map_element_RND_to_EM(EL_AMOEBA_WET); + level_em->cave[x + 1][y + 1] = new_element; } @@ -2450,34 +2029,47 @@ void CopyNativeLevel_RND_to_EM(struct LevelInfo *level) ply2->x_initial = 0; ply2->y_initial = 0; - /* at last, set the two players at their positions in 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 (level->field[x][y] == EL_PLAYER_1) { ply1->x_initial = x + 1; ply1->y_initial = y + 1; + level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); } else if (level->field[x][y] == EL_PLAYER_2) { ply2->x_initial = x + 1; ply2->y_initial = y + 1; + level_em->cave[x + 1][y + 1] = map_element_RND_to_EM(EL_EMPTY); } } } void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) { + static int ball_xy[8][2] = + { + { 0, 0 }, + { 1, 0 }, + { 2, 0 }, + { 0, 1 }, + { 2, 1 }, + { 0, 2 }, + { 1, 2 }, + { 2, 2 }, + }; struct LevelInfo_EM *level_em = level->native_em_level; struct LEVEL *lev = level_em->lev; struct PLAYER *ply1 = level_em->ply1; struct PLAYER *ply2 = level_em->ply2; - int i, x, y; + int i, j, x, y; level->fieldx = MIN(lev->width, MAX_LEV_FIELDX); level->fieldy = MIN(lev->height, MAX_LEV_FIELDY); - level->time = lev->time_initial; + level->time = lev->time_seconds; level->gems_needed = lev->required_initial; sprintf(level->name, "Level %d", level->file_info.nr); @@ -2490,7 +2082,8 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->score[SC_YAMYAM] = lev->eater_score; level->score[SC_NUT] = lev->nut_score; level->score[SC_DYNAMITE] = lev->dynamite_score; - level->score[SC_TIME_BONUS] = lev->key_score; /* ??? CHECK THIS */ + level->score[SC_KEY] = lev->key_score; + level->score[SC_TIME_BONUS] = lev->exit_score; level->num_yamyam_contents = MAX_ELEMENT_CONTENTS; @@ -2500,10 +2093,33 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->yamyam_content[i][x][y] = map_element_EM_to_RND(lev->eater_array[i][y * 3 + x]); - level->amoeba_speed = lev->ameuba_time; + level->amoeba_speed = lev->amoeba_time; level->time_magic_wall = lev->wonderwall_time_initial; level->time_wheel = lev->wheel_time; + level->android_move_time = lev->android_move_time; + level->android_clone_time = lev->android_clone_time; + level->ball_random = lev->ball_random; + level->ball_state_initial = lev->ball_state_initial; + level->ball_time = lev->ball_time; + + level->lenses_score = lev->lenses_score; + level->magnify_score = lev->magnify_score; + level->slurp_score = lev->slurp_score; + + level->lenses_time = lev->lenses_time; + level->magnify_time = lev->magnify_time; + level->wind_direction_initial = lev->wind_direction_initial; + + for (i = 0; i < NUM_MAGIC_BALL_CONTENTS; i++) + for (j = 0; j < 8; j++) + level->ball_content[i][ball_xy[j][0]][ball_xy[j][1]] = + map_element_EM_to_RND(lev->ball_array[i][j]); + + for (i = 0; i < 16; i++) + level->android_array[i] = FALSE; /* !!! YET TO COME !!! */ + + /* 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]); @@ -2514,8 +2130,13 @@ void CopyNativeLevel_EM_to_RND(struct LevelInfo *level) level->field[x][y] = new_element; } - level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; + /* in case of both players set to the same field, use the first player */ level->field[ply2->x_initial - 1][ply2->y_initial - 1] = EL_PLAYER_2; + level->field[ply1->x_initial - 1][ply1->y_initial - 1] = EL_PLAYER_1; + +#if 0 + printf("::: native Emerald Mine file version: %d\n", level_em->file_version); +#endif } static void LoadLevelFromFileInfo_EM(struct LevelInfo *level, @@ -2910,10 +2531,17 @@ void LoadLevelFromFileInfo(struct LevelInfo *level, break; } + /* if level file is invalid, restore level structure to default values */ + if (level->no_valid_file) + setLevelInfoToDefaults(level); + if (level->game_engine_type == GAME_ENGINE_TYPE_UNKNOWN) level->game_engine_type = GAME_ENGINE_TYPE_RND; - CopyNativeLevel_Native_to_RND(level); + if (level_file_info->type == LEVEL_FILE_TYPE_RND) + CopyNativeLevel_RND_to_Native(level); + else + CopyNativeLevel_Native_to_RND(level); } void LoadLevelFromFilename(struct LevelInfo *level, char *filename) @@ -2991,10 +2619,13 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) level->use_spring_bug = TRUE; /* 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)) { int i, j; + /* correct "can move into acid" settings (all zero in old levels) */ + level->can_move_into_acid_bits = 0; /* nothing can move into acid */ level->dont_collide_with_bits = 0; /* nothing is deadly when colliding */ @@ -3006,6 +2637,8 @@ 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) */ + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { int element = EL_CUSTOM_START + i; @@ -3021,6 +2654,7 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) } } +#if 0 /* !!! MOVED TO "game.c", BECAUSE CAN CHANGE INSIDE LEVEL EDITOR !!! */ #if 1 /* USE_NEW_BLOCK_STYLE */ /* blocking the last field when moving was corrected in version 3.1.1 */ if (level->game_version < VERSION_IDENT(3,1,1,0)) @@ -3037,6 +2671,8 @@ static void LoadLevel_InitVersion(struct LevelInfo *level, char *filename) level->sp_block_last_field = TRUE; } #endif +#endif + } else /* always use the latest game engine version */ { @@ -3085,7 +2721,8 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) int i, j, x, y; /* map custom element change events that have changed in newer versions - (these following values were accidentally changed in version 3.0.1) */ + (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++) @@ -3093,7 +2730,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) int element = EL_CUSTOM_START + i; /* order of checking and copying events to be mapped is important */ - for (j = CE_BY_OTHER_ACTION; j >= CE_BY_PLAYER_OBSOLETE; j--) + for (j = CE_BY_OTHER_ACTION; j >= CE_COUNT_AT_ZERO; j--) { if (HAS_CHANGE_EVENT(element, j - 2)) { @@ -3103,7 +2740,7 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* order of checking and copying events to be mapped is important */ - for (j = CE_OTHER_GETS_COLLECTED; j >= CE_HITTING_SOMETHING; j--) + for (j = CE_PLAYER_COLLECTS_X; j >= CE_HITTING_SOMETHING; j--) { if (HAS_CHANGE_EVENT(element, j - 1)) { @@ -3114,20 +2751,30 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } } +#if 0 + /* !!! TESTS SHOWED THAT THIS CODE SEGMENT IS NOT NEEDED FOR ANY LEVEL !!! */ + /* some custom element change events get mapped since version 3.0.3 */ - for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) +#if 1 + if (level->game_version >= VERSION_IDENT(3,0,3,0) && + level->game_version <= VERSION_IDENT(3,2,0,3)) +#endif { - int element = EL_CUSTOM_START + i; - - if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE) || - HAS_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE)) + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) { - SET_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE, FALSE); - SET_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE, FALSE); + int element = EL_CUSTOM_START + i; - SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE); + if (HAS_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE) || + HAS_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE)) + { + SET_CHANGE_EVENT(element, CE_BY_PLAYER_OBSOLETE, FALSE); + SET_CHANGE_EVENT(element, CE_BY_COLLISION_OBSOLETE, FALSE); + + SET_CHANGE_EVENT(element, CE_BY_DIRECT_ACTION, TRUE); + } } } +#endif /* initialize "can_change" field for old levels with only one change page */ if (level->game_version <= VERSION_IDENT(3,0,2,0)) @@ -3142,20 +2789,23 @@ static void LoadLevel_InitElements(struct LevelInfo *level, char *filename) } /* correct custom element values (for old levels without these options) */ - for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + if (level->game_version < VERSION_IDENT(3,1,1,0)) { - int element = EL_CUSTOM_START + i; - struct ElementInfo *ei = &element_info[element]; + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + struct ElementInfo *ei = &element_info[element]; - if (ei->access_direction == MV_NO_MOVING) - ei->access_direction = MV_ALL_DIRECTIONS; + if (ei->access_direction == MV_NO_MOVING) + ei->access_direction = MV_ALL_DIRECTIONS; - for (j = 0; j < ei->num_change_pages; j++) - { - struct ElementChangeInfo *change = &ei->change_page[j]; + for (j = 0; j < ei->num_change_pages; j++) + { + struct ElementChangeInfo *change = &ei->change_page[j]; - if (change->trigger_side == CH_SIDE_NONE) - change->trigger_side = CH_SIDE_ANY; + if (change->trigger_side == CH_SIDE_NONE) + change->trigger_side = CH_SIDE_ANY; + } } } @@ -3660,7 +3310,7 @@ static void SaveLevel_CUS3(FILE *file, struct LevelInfo *level, static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) { struct ElementInfo *ei = &element_info[element]; - int i, x, y; + int i, j, x, y; putFile16BitBE(file, element); @@ -3722,8 +3372,13 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) for (i = 0; i < ei->num_change_pages; i++) { struct ElementChangeInfo *change = &ei->change_page[i]; + unsigned long event_bits = 0; - putFile32BitBE(file, change->events); + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + if (change->has_event[j]) + event_bits |= (1 << j); + + putFile32BitBE(file, event_bits); putFile16BitBE(file, change->target_element); @@ -3754,8 +3409,19 @@ static void SaveLevel_CUS4(FILE *file, struct LevelInfo *level, int element) putFile8Bit(file, (change->trigger_page == CH_PAGE_ANY ? CH_PAGE_ANY_FILE : log_2(change->trigger_page))); +#if 1 + + putFile8Bit(file, change->use_action); + putFile8Bit(file, change->action_type); + putFile8Bit(file, change->action_mode); + putFile16BitBE(file, change->action_arg); + + /* some free bytes for future change property values and padding */ + WriteUnusedBytesToFile(file, 1); +#else /* some free bytes for future change property values and padding */ WriteUnusedBytesToFile(file, 6); +#endif #else @@ -4072,7 +3738,7 @@ static int LoadTape_BODY(FILE *file, int chunk_size, struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { - if (i >= MAX_TAPELEN) + if (i >= MAX_TAPE_LEN) break; for (j = 0; j < MAX_PLAYERS; j++) @@ -4361,7 +4027,7 @@ void SaveTape(int nr) InitTapeDirectory(leveldir_current->subdir); /* if a tape still exists, ask to overwrite it */ - if (access(filename, F_OK) == 0) + if (fileExists(filename)) { new_tape = FALSE; if (!Request("Replace old tape ?", REQ_ASK)) @@ -4407,7 +4073,7 @@ void SaveTape(int nr) tape.changed = FALSE; if (new_tape) - Request("tape saved !", REQ_CONFIRM); + Request("Tape saved !", REQ_CONFIRM); } void DumpTape(struct TapeInfo *tape) @@ -4440,7 +4106,7 @@ void DumpTape(struct TapeInfo *tape) for (i = 0; i < tape->length; i++) { - if (i >= MAX_TAPELEN) + if (i >= MAX_TAPE_LEN) break; printf("%03d: ", i); @@ -4571,33 +4237,35 @@ void SaveScore(int nr) #define SETUP_TOKEN_QUICK_DOORS 10 #define SETUP_TOKEN_TEAM_MODE 11 #define SETUP_TOKEN_HANDICAP 12 -#define SETUP_TOKEN_TIME_LIMIT 13 -#define SETUP_TOKEN_FULLSCREEN 14 -#define SETUP_TOKEN_ASK_ON_ESCAPE 15 -#define SETUP_TOKEN_GRAPHICS_SET 16 -#define SETUP_TOKEN_SOUNDS_SET 17 -#define SETUP_TOKEN_MUSIC_SET 18 -#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 19 -#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 20 -#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 21 - -#define NUM_GLOBAL_SETUP_TOKENS 22 +#define SETUP_TOKEN_SKIP_LEVELS 13 +#define SETUP_TOKEN_TIME_LIMIT 14 +#define SETUP_TOKEN_FULLSCREEN 15 +#define SETUP_TOKEN_ASK_ON_ESCAPE 16 +#define SETUP_TOKEN_GRAPHICS_SET 17 +#define SETUP_TOKEN_SOUNDS_SET 18 +#define SETUP_TOKEN_MUSIC_SET 19 +#define SETUP_TOKEN_OVERRIDE_LEVEL_GRAPHICS 20 +#define SETUP_TOKEN_OVERRIDE_LEVEL_SOUNDS 21 +#define SETUP_TOKEN_OVERRIDE_LEVEL_MUSIC 22 + +#define NUM_GLOBAL_SETUP_TOKENS 23 /* editor setup */ #define SETUP_TOKEN_EDITOR_EL_BOULDERDASH 0 #define SETUP_TOKEN_EDITOR_EL_EMERALD_MINE 1 -#define SETUP_TOKEN_EDITOR_EL_MORE 2 -#define SETUP_TOKEN_EDITOR_EL_SOKOBAN 3 -#define SETUP_TOKEN_EDITOR_EL_SUPAPLEX 4 -#define SETUP_TOKEN_EDITOR_EL_DIAMOND_CAVES 5 -#define SETUP_TOKEN_EDITOR_EL_DX_BOULDERDASH 6 -#define SETUP_TOKEN_EDITOR_EL_CHARS 7 -#define SETUP_TOKEN_EDITOR_EL_CUSTOM 8 -#define SETUP_TOKEN_EDITOR_EL_CUSTOM_MORE 9 -#define SETUP_TOKEN_EDITOR_EL_HEADLINES 10 -#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 11 - -#define NUM_EDITOR_SETUP_TOKENS 12 +#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_CUSTOM 9 +#define SETUP_TOKEN_EDITOR_EL_CUSTOM_MORE 10 +#define SETUP_TOKEN_EDITOR_EL_HEADLINES 11 +#define SETUP_TOKEN_EDITOR_EL_USER_DEFINED 12 + +#define NUM_EDITOR_SETUP_TOKENS 13 /* shortcut setup */ #define SETUP_TOKEN_SHORTCUT_SAVE_GAME 0 @@ -4660,6 +4328,7 @@ static struct TokenInfo global_setup_tokens[] = { 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_SWITCH, &si.ask_on_escape, "ask_on_escape" }, @@ -4675,6 +4344,7 @@ static struct TokenInfo editor_setup_tokens[] = { { 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" }, @@ -4760,6 +4430,7 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->quick_doors = FALSE; si->team_mode = FALSE; si->handicap = TRUE; + si->skip_levels = TRUE; si->time_limit = TRUE; si->fullscreen = FALSE; si->ask_on_escape = TRUE; @@ -4771,16 +4442,17 @@ static void setSetupInfoToDefaults(struct SetupInfo *si) si->override_level_sounds = FALSE; si->override_level_music = FALSE; - si->editor.el_boulderdash = TRUE; - si->editor.el_emerald_mine = TRUE; - si->editor.el_more = TRUE; - si->editor.el_sokoban = TRUE; - si->editor.el_supaplex = TRUE; - si->editor.el_diamond_caves = TRUE; - si->editor.el_dx_boulderdash = TRUE; - si->editor.el_chars = TRUE; - si->editor.el_custom = TRUE; - si->editor.el_custom_more = FALSE; + si->editor.el_boulderdash = TRUE; + si->editor.el_emerald_mine = TRUE; + si->editor.el_emerald_mine_club = TRUE; + si->editor.el_more = TRUE; + si->editor.el_sokoban = TRUE; + si->editor.el_supaplex = TRUE; + si->editor.el_diamond_caves = TRUE; + si->editor.el_dx_boulderdash = TRUE; + si->editor.el_chars = TRUE; + si->editor.el_custom = TRUE; + si->editor.el_custom_more = FALSE; si->editor.el_headlines = TRUE; si->editor.el_user_defined = FALSE; @@ -5087,7 +4759,19 @@ void LoadUserDefinedEditorElementList(int **elements, int *num_elements) { char *value = getHashEntry(element_hash, list->token); - if (value) + if (value == NULL) /* try to find obsolete token mapping */ + { + char *mapped_token = get_mapped_token(list->token); + + if (mapped_token != NULL) + { + value = getHashEntry(element_hash, mapped_token); + + free(mapped_token); + } + } + + if (value != NULL) { (*elements)[(*num_elements)++] = atoi(value); }