X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=05a1293bd789a04e2e5858cbd15175f181b3a362;hb=524cb50afe3b330d72c8d0487f3db251f8ffd7e8;hp=ffc1f1ec1e3428de66ddad24a774d28103626087;hpb=13ff4ef54e998e44d25ac56e8677a054b0155b3e;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index ffc1f1ec..05a1293b 100644 --- a/src/tools.c +++ b/src/tools.c @@ -123,7 +123,12 @@ void SetDrawtoField(int mode) void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) { - if (game_status == GAME_MODE_PLAYING && !game.envelope_active) + if (game_status == GAME_MODE_PLAYING && + level.game_engine_type == GAME_ENGINE_TYPE_EM) + { + BlitScreenToBitmap_EM(backbuffer); + } + else if (game_status == GAME_MODE_PLAYING && !game.envelope_active) { if (force_redraw) { @@ -2219,6 +2224,12 @@ boolean Request(char *text, unsigned int req_state) } } +#if 1 + if (game_status == GAME_MODE_PLAYING && + level.game_engine_type == GAME_ENGINE_TYPE_EM) + BlitScreenToBitmap_EM(backbuffer); +#endif + #if 1 /* disable deactivated drawing when quick-loading level tape recording */ if (tape.playing && tape.deactivate_display) @@ -4035,7 +4046,7 @@ em_object_mapping_list[] = EL_AMOEBA_DRY, ACTION_OTHER, -1 }, { - Xamoeba_5, FALSE, FALSE, + Xamoeba_5, TRUE, FALSE, EL_AMOEBA_WET, ACTION_OTHER, -1 }, { @@ -4338,6 +4349,38 @@ em_object_mapping_list[] = Xfake_door_8, TRUE, FALSE, EL_EM_GATE_8_GRAY, -1, -1 }, + { + Xfake_acid_1, TRUE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_2, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_3, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_4, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_5, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_6, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_7, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_8, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, { Xsteel_1, TRUE, FALSE, EL_STEELWALL, -1, -1 @@ -5590,8 +5633,17 @@ int el2preimg(int element) int getGameFrameDelay_EM(int native_em_game_frame_delay) { - return (GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay : - GameFrameDelay); + 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(long seed) @@ -5689,7 +5741,6 @@ void InitGraphicInfo_EM(void) int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY : j > 5 && i == Yacid_splash_wB ? EL_EMPTY : j < 7 ? element : - i == Ynut_sB ? element : i == Xdrip_stretch ? element : i == Xdrip_stretchB ? element : i == Ydrip_s1 ? element : @@ -5714,11 +5765,12 @@ void InitGraphicInfo_EM(void) i == Yspring_kill_w ? EL_SPRING : i == Yemerald_stone ? EL_EMERALD : i == Ydiamond_stone ? EL_ROCK : + i == Xsand_stonein_4 ? EL_EMPTY : + i == Xsand_stoneout_2 ? EL_ROCK : is_backside ? EL_EMPTY : action_removing ? EL_EMPTY : element); int effective_action = (j < 7 ? action : - i == Ynut_sB ? action : i == Xdrip_stretch ? action : i == Xdrip_stretchB ? action : i == Ydrip_s1 ? action : @@ -5778,6 +5830,14 @@ void InitGraphicInfo_EM(void) i == Xacid_6 ? 50 : i == Xacid_7 ? 60 : i == Xacid_8 ? 70 : + i == Xfake_acid_1 ? 0 : + i == Xfake_acid_2 ? 10 : + i == Xfake_acid_3 ? 20 : + i == Xfake_acid_4 ? 30 : + i == Xfake_acid_5 ? 40 : + i == Xfake_acid_6 ? 50 : + i == Xfake_acid_7 ? 60 : + i == Xfake_acid_8 ? 70 : i == Xball_2 ? 7 : i == Xball_2B ? j + 8 : i == Yball_eat ? j + 1 : @@ -5811,22 +5871,22 @@ void InitGraphicInfo_EM(void) i == Xsand_stonein_2 ? j + 9 : i == Xsand_stonein_3 ? j + 17 : i == Xsand_stonein_4 ? j + 25 : - i == Xsand_stoneout_1 && j == 0 ? 1 : - i == Xsand_stoneout_1 && j == 1 ? 1 : - i == Xsand_stoneout_1 && j == 2 ? 2 : - i == Xsand_stoneout_1 && j == 3 ? 4 : - i == Xsand_stoneout_1 && j == 4 ? 4 : - i == Xsand_stoneout_1 && j == 5 ? 6 : - i == Xsand_stoneout_1 && j == 6 ? 8 : - i == Xsand_stoneout_1 && j == 7 ? 8 : - i == Xsand_stoneout_2 && j == 0 ? 10 : - i == Xsand_stoneout_2 && j == 1 ? 12 : - i == Xsand_stoneout_2 && j == 2 ? 14 : - i == Xsand_stoneout_2 && j == 3 ? 16 : - i == Xsand_stoneout_2 && j == 4 ? 18 : - i == Xsand_stoneout_2 && j == 5 ? 22 : - i == Xsand_stoneout_2 && j == 6 ? 26 : - i == Xsand_stoneout_2 && j == 7 ? 30 : + i == Xsand_stoneout_1 && j == 0 ? 0 : + i == Xsand_stoneout_1 && j == 1 ? 0 : + i == Xsand_stoneout_1 && j == 2 ? 1 : + i == Xsand_stoneout_1 && j == 3 ? 2 : + i == Xsand_stoneout_1 && j == 4 ? 2 : + i == Xsand_stoneout_1 && j == 5 ? 3 : + i == Xsand_stoneout_1 && j == 6 ? 4 : + i == Xsand_stoneout_1 && j == 7 ? 4 : + i == Xsand_stoneout_2 && j == 0 ? 5 : + i == Xsand_stoneout_2 && j == 1 ? 6 : + i == Xsand_stoneout_2 && j == 2 ? 7 : + i == Xsand_stoneout_2 && j == 3 ? 8 : + i == Xsand_stoneout_2 && j == 4 ? 9 : + i == Xsand_stoneout_2 && j == 5 ? 11 : + i == Xsand_stoneout_2 && j == 6 ? 13 : + i == Xsand_stoneout_2 && j == 7 ? 15 : i == Xboom_bug && j == 1 ? 2 : i == Xboom_bug && j == 2 ? 2 : i == Xboom_bug && j == 3 ? 4 : @@ -5887,11 +5947,13 @@ void InitGraphicInfo_EM(void) g_em->width = TILEX; g_em->height = TILEY; - g_em->has_crumbled_graphics = FALSE; g_em->crumbled_bitmap = NULL; g_em->crumbled_src_x = 0; g_em->crumbled_src_y = 0; g_em->crumbled_border_size = 0; + + g_em->has_crumbled_graphics = FALSE; + g_em->preserve_background = FALSE; #endif #if 0 @@ -5930,42 +5992,116 @@ void InitGraphicInfo_EM(void) (effective_action == ACTION_FALLING ? MV_DOWN : direction); int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0); int dy = (move_dir == MV_UP ? -1 : move_dir == MV_DOWN ? 1 : 0); - int cx = ABS(dx) * TILEX / 8; - int cy = ABS(dy) * TILEY / 8; - - if (is_backside) /* tile where movement starts */ + int num_steps = (i == Ydrip_s1 || + i == Ydrip_s1B || + i == Ydrip_s2 || + i == Ydrip_s2B ? 16 : 8); + int cx = ABS(dx) * (TILEX / num_steps); + int cy = ABS(dy) * (TILEY / num_steps); + int step_frame = (i == Ydrip_s2 || + i == Ydrip_s2B ? j + 8 : j) + 1; + int step = (is_backside ? step_frame : num_steps - step_frame); + + if (is_backside) /* tile where movement starts */ { if (dx < 0 || dy < 0) { - g_em->src_offset_x = cx * (j + 1); - g_em->src_offset_y = cy * (j + 1); + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; } else { - g_em->dst_offset_x = cx * (j + 1); - g_em->dst_offset_y = cy * (j + 1); + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; } - - g_em->width = TILEX - cx * (j + 1); - g_em->height = TILEY - cy * (j + 1); } else /* tile where movement ends */ { if (dx < 0 || dy < 0) { - g_em->dst_offset_x = cx * (7 - j); - g_em->dst_offset_y = cy * (7 - j); + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; } else { - g_em->src_offset_x = cx * (7 - j); - g_em->src_offset_y = cy * (7 - j); + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; } + } + + g_em->width = TILEX - cx * step; + g_em->height = TILEY - cy * step; + } + +#if 0 + if (effective_action == ACTION_SMASHED_BY_ROCK && + element_info[effective_element].graphic[effective_action] == + element_info[effective_element].graphic[ACTION_DEFAULT]) + { + int move_dir = MV_DOWN; + int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? 1 : 0); + int dy = (move_dir == MV_UP ? -1 : move_dir == MV_DOWN ? 1 : 0); + int num_steps = 8; + int cx = ABS(dx) * (TILEX / num_steps); + int cy = ABS(dy) * (TILEY / num_steps); + int step_frame = j + 1; + int step = (is_backside ? step_frame : num_steps - step_frame); + + graphic = (el_act_dir2img(EL_ROCK, ACTION_FALLING, MV_DOWN)); + g = &graphic_info[graphic]; + sync_frame = j; + frame = getAnimationFrame(g->anim_frames, + g->anim_delay, + g->anim_mode, + g->anim_start_frame, + sync_frame); + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, + g->double_movement && is_backside); + + g_em->bitmap = src_bitmap; + g_em->src_x = src_x; + g_em->src_y = 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 - cx * (7 - j); - g_em->height = TILEY - cy * (7 - j); + if (is_backside) /* tile where movement starts */ + { + if (dx < 0 || dy < 0) + { + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; + } + else + { + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; + } + } + else /* tile where movement ends */ + { + if (dx < 0 || dy < 0) + { + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; + } + else + { + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; + } } + + g_em->width = TILEX - cx * step; + g_em->height = TILEY - cy * step; + +#if 0 + printf("::: -> '%s'\n", element_info[effective_element].token_name); +#endif } +#endif + #endif /* create unique graphic identifier to decide if tile must be redrawn */ @@ -5995,9 +6131,9 @@ void InitGraphicInfo_EM(void) last_i = i; } - printf("::: EMC GFX ERROR for element %d -> %d ('%s') [%d, %d]", + printf("::: EMC GFX ERROR for element %d -> %d ('%s', '%s', %d)", i, element, element_info[element].token_name, - effective_action, direction); + element_action_info[effective_action].suffix, direction); if (element != effective_element) printf(" [%d ('%s')]", @@ -6039,6 +6175,38 @@ void InitGraphicInfo_EM(void) } } +#if 1 + for (i = 0; i < TILE_MAX; i++) + { + for (j = 0; j < 8; j++) + { + int element = object_mapping[i].element_rnd; + int action = object_mapping[i].action; + + if (action == ACTION_SMASHED_BY_ROCK && + element_info[element].graphic[action] == + element_info[element].graphic[ACTION_DEFAULT]) + { + /* 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[Ystone_s][7 - j]; + + g_em->bitmap = g_xx->bitmap; + g_em->src_x = g_xx->src_x; + g_em->src_y = g_xx->src_y; + g_em->src_offset_x = g_xx->src_offset_x; + g_em->src_offset_y = g_xx->src_offset_y; + g_em->dst_offset_x = g_xx->dst_offset_x; + g_em->dst_offset_y = g_xx->dst_offset_y; + g_em->width = g_xx->width; + g_em->height = g_xx->height; + + g_em->preserve_background = TRUE; + } + } + } +#endif + for (p = 0; p < 2; p++) { for (i = 0; i < SPR_MAX; i++)