X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=a5638485e4b365b529d8f697d37fe8e56f6c73ae;hb=58ea80c54f5a1e6605e2c33b554dff1fcc0c26b5;hp=0e8366d1cfc6bbaf4c887a24821cc527fce3db88;hpb=a4cde04ae92e7f4fb05307b04bd541caa1eeec7e;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 0e8366d1..a5638485 100644 --- a/src/tools.c +++ b/src/tools.c @@ -23,8 +23,6 @@ #include "screens.h" -// select level set with EMC X11 graphics before activating EM GFX debugging -#define DEBUG_EM_GFX FALSE #define DEBUG_FRAME_TIME FALSE // tool button identifiers @@ -299,7 +297,7 @@ static int getLevelFromScreenY_RND(int sy) static int getLevelFromScreenX_EM(int sx) { - int level_xsize = level.native_em_level->lev->width; + int level_xsize = level.native_em_level->cav->width; int full_xsize = level_xsize * TILESIZE_VAR; sx -= (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0); @@ -316,7 +314,7 @@ static int getLevelFromScreenX_EM(int sx) static int getLevelFromScreenY_EM(int sy) { - int level_ysize = level.native_em_level->lev->height; + int level_ysize = level.native_em_level->cav->height; int full_ysize = level_ysize * TILESIZE_VAR; sy -= (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0); @@ -5738,19 +5736,74 @@ static struct Mapping_EM_to_RND_object int action; int direction; } -em_object_mapping_list[] = +em_object_mapping_list[TILE_MAX + 1] = { + { + Zborder, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + { + Zplayer, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + + { + Zbug, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + { + Ztank, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + { + Zeater, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + { + Zdynamite, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + { + Zboom, FALSE, FALSE, + EL_EMPTY, -1, -1 + }, + + { + Xchain, FALSE, FALSE, + EL_DEFAULT, ACTION_EXPLODING, -1 + }, + { + Xboom_bug, FALSE, FALSE, + EL_BUG, ACTION_EXPLODING, -1 + }, + { + Xboom_tank, FALSE, FALSE, + EL_SPACESHIP, ACTION_EXPLODING, -1 + }, + { + Xboom_android, FALSE, FALSE, + EL_EMC_ANDROID, ACTION_OTHER, -1 + }, + { + Xboom_1, FALSE, FALSE, + EL_DEFAULT, ACTION_EXPLODING, -1 + }, + { + Xboom_2, FALSE, FALSE, + EL_DEFAULT, ACTION_EXPLODING, -1 + }, + { Xblank, TRUE, FALSE, EL_EMPTY, -1, -1 }, { - Xacid_splash_e, FALSE, FALSE, + Xsplash_e, FALSE, FALSE, EL_ACID_SPLASH_RIGHT, -1, -1 }, { - Xacid_splash_w, FALSE, FALSE, + Xsplash_w, FALSE, FALSE, EL_ACID_SPLASH_LEFT, -1, -1 }, @@ -6864,7 +6917,7 @@ em_object_mapping_list[] = EL_MAGIC_WALL, -1, -1 }, { - XwonderwallB, FALSE, FALSE, + Ywonderwall, FALSE, FALSE, EL_MAGIC_WALL, ACTION_ACTIVE, -1 }, @@ -6873,7 +6926,7 @@ em_object_mapping_list[] = EL_ROBOT_WHEEL, -1, -1 }, { - XwheelB, FALSE, FALSE, + Ywheel, FALSE, FALSE, EL_ROBOT_WHEEL, ACTION_ACTIVE, -1 }, @@ -6882,7 +6935,7 @@ em_object_mapping_list[] = EL_EMC_MAGIC_BALL_SWITCH, -1, -1 }, { - XswitchB, FALSE, FALSE, + Yswitch, FALSE, FALSE, EL_EMC_MAGIC_BALL_SWITCH, ACTION_ACTIVE, -1 }, @@ -6891,7 +6944,7 @@ em_object_mapping_list[] = EL_EMC_SPRING_BUMPER, -1, -1 }, { - XbumperB, FALSE, FALSE, + Ybumper, FALSE, FALSE, EL_EMC_SPRING_BUMPER, ACTION_ACTIVE, -1 }, @@ -6921,7 +6974,7 @@ em_object_mapping_list[] = EL_INVISIBLE_WALL, -1, -1 }, { - Xfake_blankB, FALSE, FALSE, + Yfake_blank, FALSE, FALSE, EL_INVISIBLE_WALL, ACTION_ACTIVE, -1 }, @@ -6930,7 +6983,7 @@ em_object_mapping_list[] = EL_EMC_FAKE_GRASS, -1, -1 }, { - Xfake_grassB, FALSE, FALSE, + Yfake_grass, FALSE, FALSE, EL_EMC_FAKE_GRASS, ACTION_ACTIVE, -1 }, @@ -6939,7 +6992,7 @@ em_object_mapping_list[] = EL_EMC_DRIPPER, -1, -1 }, { - Xfake_amoebaB, FALSE, FALSE, + Yfake_amoeba, FALSE, FALSE, EL_EMC_DRIPPER, ACTION_ACTIVE, -1 }, @@ -7027,19 +7080,19 @@ em_object_mapping_list[] = }, { - Xslidewall_ns, TRUE, FALSE, + Xslide_ns, TRUE, FALSE, EL_EXPANDABLE_WALL_VERTICAL, -1, -1 }, { - Yslidewall_ns_blank, FALSE, FALSE, + Yslide_ns_blank, FALSE, FALSE, EL_EXPANDABLE_WALL_VERTICAL, ACTION_GROWING, -1 }, { - Xslidewall_ew, TRUE, FALSE, + Xslide_ew, TRUE, FALSE, EL_EXPANDABLE_WALL_HORIZONTAL, -1, -1 }, { - Yslidewall_ew_blank, FALSE, FALSE, + Yslide_ew_blank, FALSE, FALSE, EL_EXPANDABLE_WALL_HORIZONTAL, ACTION_GROWING, -1 }, @@ -7235,8 +7288,8 @@ em_object_mapping_list[] = EL_CHAR('!'), -1, -1 }, { - Xalpha_quote, TRUE, FALSE, - EL_CHAR('"'), -1, -1 + Xalpha_apost, TRUE, FALSE, + EL_CHAR('\''), -1, -1 }, { Xalpha_comma, TRUE, FALSE, @@ -7424,43 +7477,6 @@ em_object_mapping_list[] = EL_SAND, ACTION_SNAPPING, -1 }, - { - Xboom_bug, FALSE, FALSE, - EL_BUG, ACTION_EXPLODING, -1 - }, - { - Xboom_bomb, FALSE, FALSE, - EL_BOMB, ACTION_EXPLODING, -1 - }, - { - Xboom_android, FALSE, FALSE, - EL_EMC_ANDROID, ACTION_OTHER, -1 - }, - { - Xboom_1, FALSE, FALSE, - EL_DEFAULT, ACTION_EXPLODING, -1 - }, - { - Xboom_2, FALSE, FALSE, - EL_DEFAULT, ACTION_EXPLODING, -1 - }, - { - Znormal, FALSE, FALSE, - EL_EMPTY, -1, -1 - }, - { - Zdynamite, FALSE, FALSE, - EL_EMPTY, -1, -1 - }, - { - Zplayer, FALSE, FALSE, - EL_EMPTY, -1, -1 - }, - { - Zborder, FALSE, FALSE, - EL_EMPTY, -1, -1 - }, - { -1, FALSE, FALSE, -1, -1, -1 @@ -7476,7 +7492,7 @@ static struct Mapping_EM_to_RND_player int action; int direction; } -em_player_mapping_list[] = +em_player_mapping_list[MAX_PLAYERS * PLY_MAX + 1] = { { PLY_walk_n, 0, @@ -7693,7 +7709,7 @@ em_player_mapping_list[] = } }; -int map_element_RND_to_EM(int element_rnd) +int map_element_RND_to_EM_cave(int element_rnd) { static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS]; static boolean mapping_initialized = FALSE; @@ -7715,14 +7731,42 @@ int map_element_RND_to_EM(int element_rnd) } if (element_rnd >= 0 && element_rnd < NUM_FILE_ELEMENTS) - return mapping_RND_to_EM[element_rnd]; + return map_em_element_X_to_C(mapping_RND_to_EM[element_rnd]); Error(ERR_WARN, "invalid RND level element %d", element_rnd); return EL_UNKNOWN; } -int map_element_EM_to_RND(int element_em) +int map_element_EM_to_RND_cave(int element_em_cave) +{ + static unsigned short mapping_EM_to_RND[TILE_MAX]; + static boolean mapping_initialized = FALSE; + + 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; em_object_mapping_list[i].element_em != -1; i++) + mapping_EM_to_RND[em_object_mapping_list[i].element_em] = + em_object_mapping_list[i].element_rnd; + + mapping_initialized = TRUE; + } + + if (element_em_cave >= 0 && element_em_cave < CAVE_TILE_MAX) + return mapping_EM_to_RND[map_em_element_C_to_X(element_em_cave)]; + + Error(ERR_WARN, "invalid EM cave element %d", element_em_cave); + + return EL_UNKNOWN; +} + +int map_element_EM_to_RND_game(int element_em_game) { static unsigned short mapping_EM_to_RND[TILE_MAX]; static boolean mapping_initialized = FALSE; @@ -7742,10 +7786,10 @@ int map_element_EM_to_RND(int element_em) mapping_initialized = TRUE; } - if (element_em >= 0 && element_em < TILE_MAX) - return mapping_EM_to_RND[element_em]; + if (element_em_game >= 0 && element_em_game < TILE_MAX) + return mapping_EM_to_RND[element_em_game]; - Error(ERR_WARN, "invalid EM level element %d", element_em); + Error(ERR_WARN, "invalid EM game element %d", element_em_game); return EL_UNKNOWN; } @@ -7753,41 +7797,42 @@ int map_element_EM_to_RND(int element_em) void map_android_clone_elements_RND_to_EM(struct LevelInfo *level) { struct LevelInfo_EM *level_em = level->native_em_level; - struct LEVEL *lev = level_em->lev; + struct CAVE *cav = level_em->cav; int i, j; for (i = 0; i < TILE_MAX; i++) - lev->android_array[i] = Xblank; + cav->android_array[i] = Cblank; for (i = 0; i < level->num_android_clone_elements; i++) { int element_rnd = level->android_clone_element[i]; - int element_em = map_element_RND_to_EM(element_rnd); + int element_em_cave = map_element_RND_to_EM_cave(element_rnd); for (j = 0; em_object_mapping_list[j].element_em != -1; j++) if (em_object_mapping_list[j].element_rnd == element_rnd) - lev->android_array[em_object_mapping_list[j].element_em] = element_em; + cav->android_array[em_object_mapping_list[j].element_em] = + element_em_cave; } } void map_android_clone_elements_EM_to_RND(struct LevelInfo *level) { struct LevelInfo_EM *level_em = level->native_em_level; - struct LEVEL *lev = level_em->lev; + struct CAVE *cav = level_em->cav; int i, j; level->num_android_clone_elements = 0; for (i = 0; i < TILE_MAX; i++) { - int element_em = lev->android_array[i]; + int element_em_cave = cav->android_array[i]; int element_rnd; boolean element_found = FALSE; - if (element_em == Xblank) + if (element_em_cave == Cblank) continue; - element_rnd = map_element_EM_to_RND(element_em); + element_rnd = map_element_EM_to_RND_cave(element_em_cave); for (j = 0; j < level->num_android_clone_elements; j++) if (level->android_clone_element[j] == element_rnd) @@ -8221,21 +8266,6 @@ boolean getTeamMode_EM(void) return game.team_mode || network_playing; } -int getGameFrameDelay_EM(int native_em_game_frame_delay) -{ - int game_frame_delay_value; - - game_frame_delay_value = - (tape.playing && tape.fast_forward ? FfwdFrameDelay : - GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay : - GameFrameDelay); - - if (tape.playing && tape.warp_forward && !tape.pausing) - game_frame_delay_value = 0; - - return game_frame_delay_value; -} - unsigned int InitRND(int seed) { if (level.game_engine_type == GAME_ENGINE_TYPE_EM) @@ -8264,8 +8294,8 @@ static int get_effective_element_EM(int tile, int frame_em) { switch (tile) { - case Xacid_splash_e: - case Xacid_splash_w: + case Xsplash_e: + case Xsplash_w: return (frame_em > 5 ? EL_EMPTY : element); default: @@ -8276,8 +8306,8 @@ static int get_effective_element_EM(int tile, int frame_em) { switch (tile) { - case Xacid_splash_e: - case Xacid_splash_w: + case Xsplash_e: + case Xsplash_w: return EL_EMPTY; case Ynut_stone: @@ -8345,8 +8375,8 @@ static boolean check_linear_animation_EM(int tile) case Ytank_s_e: case Ytank_w_s: case Ytank_n_w: - case Xacid_splash_e: - case Xacid_splash_w: + case Xsplash_e: + case Xsplash_w: case Ynut_stone: return TRUE; } @@ -8593,19 +8623,6 @@ void InitGraphicInfo_EM(void) { int i, j, p; -#if DEBUG_EM_GFX - int num_em_gfx_errors = 0; - - if (graphic_info_em_object[0][0].bitmap == NULL) - { - // EM graphics not yet initialized in em_open_all() - - return; - } - - printf("::: [4 errors can be ignored (1 x 'bomb', 3 x 'em_dynamite']\n"); -#endif - // always start with reliable default values for (i = 0; i < TILE_MAX; i++) { @@ -8713,7 +8730,7 @@ void InitGraphicInfo_EM(void) boolean has_action_graphics = (graphic != base_graphic); boolean has_crumbled_graphics = (base_crumbled != base_graphic); struct GraphicInfo *g = &graphic_info[graphic]; - struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; + struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][j]; Bitmap *src_bitmap; int src_x, src_y; // ensure to get symmetric 3-frame, 2-delay animations as used in EM @@ -8797,13 +8814,13 @@ void InitGraphicInfo_EM(void) i == Xboom_bug && j == 5 ? 2 : i == Xboom_bug && j == 6 ? 2 : i == Xboom_bug && j == 7 ? 0 : - i == Xboom_bomb && j == 1 ? 2 : - i == Xboom_bomb && j == 2 ? 2 : - i == Xboom_bomb && j == 3 ? 4 : - i == Xboom_bomb && j == 4 ? 4 : - i == Xboom_bomb && j == 5 ? 2 : - i == Xboom_bomb && j == 6 ? 2 : - i == Xboom_bomb && j == 7 ? 0 : + i == Xboom_tank && j == 1 ? 2 : + i == Xboom_tank && j == 2 ? 2 : + i == Xboom_tank && j == 3 ? 4 : + i == Xboom_tank && j == 4 ? 4 : + i == Xboom_tank && j == 5 ? 2 : + i == Xboom_tank && j == 6 ? 2 : + i == Xboom_tank && j == 7 ? 0 : i == Xboom_android && j == 7 ? 6 : i == Xboom_1 && j == 1 ? 2 : i == Xboom_1 && j == 2 ? 2 : @@ -8823,13 +8840,6 @@ void InitGraphicInfo_EM(void) special_animation && j == 4 ? 3 : effective_action != action ? 0 : j); - -#if DEBUG_EM_GFX - Bitmap *debug_bitmap = g_em->bitmap; - int debug_src_x = g_em->src_x; - int debug_src_y = g_em->src_y; -#endif - int frame = getAnimationFrame(g->anim_frames, g->anim_delay, g->anim_mode, @@ -8925,74 +8935,6 @@ void InitGraphicInfo_EM(void) bit 5 - 0 ( 6 bit): graphic height */ g_em->unique_identifier = (graphic << 16) | (frame << 12) | (g_em->width << 6) | g_em->height; - -#if DEBUG_EM_GFX - - // skip check for EMC elements not contained in original EMC artwork - if (element == EL_EMC_FAKE_ACID) - continue; - - if (g_em->bitmap != debug_bitmap || - g_em->src_x != debug_src_x || - g_em->src_y != debug_src_y || - g_em->src_offset_x != 0 || - g_em->src_offset_y != 0 || - g_em->dst_offset_x != 0 || - g_em->dst_offset_y != 0 || - g_em->width != TILEX || - g_em->height != TILEY) - { - static int last_i = -1; - - if (i != last_i) - { - printf("\n"); - last_i = i; - } - - printf("::: EMC GFX ERROR for element %d -> %d ('%s', '%s', %d)", - i, element, element_info[element].token_name, - element_action_info[effective_action].suffix, direction); - - if (element != effective_element) - printf(" [%d ('%s')]", - effective_element, - element_info[effective_element].token_name); - - printf("\n"); - - if (g_em->bitmap != debug_bitmap) - printf(" %d (%d): different bitmap! (0x%08x != 0x%08x)\n", - j, is_backside, (int)(g_em->bitmap), (int)(debug_bitmap)); - - if (g_em->src_x != debug_src_x || - g_em->src_y != debug_src_y) - printf(" frame %d (%c): %d,%d (%d,%d) should be %d,%d (%d,%d)\n", - j, (is_backside ? 'B' : 'F'), - g_em->src_x, g_em->src_y, - g_em->src_x / 32, g_em->src_y / 32, - debug_src_x, debug_src_y, - debug_src_x / 32, debug_src_y / 32); - - if (g_em->src_offset_x != 0 || - g_em->src_offset_y != 0 || - g_em->dst_offset_x != 0 || - g_em->dst_offset_y != 0) - printf(" %d (%d): offsets %d,%d and %d,%d should be all 0\n", - j, is_backside, - g_em->src_offset_x, g_em->src_offset_y, - g_em->dst_offset_x, g_em->dst_offset_y); - - if (g_em->width != TILEX || - g_em->height != TILEY) - printf(" %d (%d): size %d,%d should be %d,%d\n", - j, is_backside, - g_em->width, g_em->height, TILEX, TILEY); - - num_em_gfx_errors++; - } -#endif - } } @@ -9019,8 +8961,8 @@ void InitGraphicInfo_EM(void) Xspring); // no separate animation for "smashed by rock" -- use rock instead - struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; - struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][7 - j]; + struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][j]; + struct GraphicInfo_EM *g_xx = &graphic_info_em_object[e][j]; g_em->bitmap = g_xx->bitmap; g_em->src_x = g_xx->src_x; @@ -9056,17 +8998,10 @@ void InitGraphicInfo_EM(void) el_act_dir2img(effective_element, effective_action, direction)); struct GraphicInfo *g = &graphic_info[graphic]; - struct GraphicInfo_EM *g_em = &graphic_info_em_player[p][i][7 - j]; + struct GraphicInfo_EM *g_em = &graphic_info_em_player[p][i][j]; Bitmap *src_bitmap; int src_x, src_y; int sync_frame = j; - -#if DEBUG_EM_GFX - Bitmap *debug_bitmap = g_em->bitmap; - int debug_src_x = g_em->src_x; - int debug_src_y = g_em->src_y; -#endif - int frame = getAnimationFrame(g->anim_frames, g->anim_delay, g->anim_mode, @@ -9084,64 +9019,9 @@ void InitGraphicInfo_EM(void) g_em->dst_offset_y = 0; g_em->width = TILEX; g_em->height = TILEY; - -#if DEBUG_EM_GFX - - // skip check for EMC elements not contained in original EMC artwork - if (element == EL_PLAYER_3 || - element == EL_PLAYER_4) - continue; - - if (g_em->bitmap != debug_bitmap || - g_em->src_x != debug_src_x || - g_em->src_y != debug_src_y) - { - static int last_i = -1; - - if (i != last_i) - { - printf("\n"); - last_i = i; - } - - printf("::: EMC GFX ERROR for p/a %d/%d -> %d ('%s', '%s', %d)", - p, i, element, element_info[element].token_name, - element_action_info[effective_action].suffix, direction); - - if (element != effective_element) - printf(" [%d ('%s')]", - effective_element, - element_info[effective_element].token_name); - - printf("\n"); - - if (g_em->bitmap != debug_bitmap) - printf(" %d: different bitmap! (0x%08x != 0x%08x)\n", - j, (int)(g_em->bitmap), (int)(debug_bitmap)); - - if (g_em->src_x != debug_src_x || - g_em->src_y != debug_src_y) - printf(" frame %d: %d,%d (%d,%d) should be %d,%d (%d,%d)\n", - j, - g_em->src_x, g_em->src_y, - g_em->src_x / 32, g_em->src_y / 32, - debug_src_x, debug_src_y, - debug_src_x / 32, debug_src_y / 32); - - num_em_gfx_errors++; - } -#endif - } } } - -#if DEBUG_EM_GFX - printf("\n"); - printf("::: [%d errors found]\n", num_em_gfx_errors); - - exit(0); -#endif } static void CheckSaveEngineSnapshot_EM(byte action[MAX_PLAYERS], int frame,