X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=f3e1db886f2345ace63cdd0f94f8bc3841bdd4a6;hb=ed5a795f1fd2d48a1372d46c06d86d2faab7e3c4;hp=0522aae07e601f8f0ea0f6b64bca815539cf4091;hpb=6b64e704d628cdbf7a49d6025dce715dfd829125;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 0522aae0..f3e1db88 100644 --- a/src/tools.c +++ b/src/tools.c @@ -118,7 +118,7 @@ void SetDrawtoField(int mode) drawto_field = fieldbuffer; } - else /* DRAW_DIRECT, DRAW_BACKBUFFER */ + else /* DRAW_BACKBUFFER */ { FX = SX; FY = SY; @@ -129,7 +129,7 @@ void SetDrawtoField(int mode) redraw_x1 = 0; redraw_y1 = 0; - drawto_field = (mode == DRAW_DIRECT ? window : backbuffer); + drawto_field = backbuffer; } } @@ -154,23 +154,17 @@ void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) height = gfx.sysize + 2 * TILEY; } - if (force_redraw || setup.direct_draw) + if (force_redraw) { int xx, yy; int x1 = (x - SX) / TILEX, y1 = (y - SY) / TILEY; int x2 = (x - SX + width) / TILEX, y2 = (y - SY + height) / TILEY; - if (setup.direct_draw) - SetDrawtoField(DRAW_BACKBUFFER); - for (xx = BX1; xx <= BX2; xx++) for (yy = BY1; yy <= BY2; yy++) if (xx >= x1 && xx <= x2 && yy >= y1 && yy <= y2) DrawScreenField(xx, yy); DrawAllPlayers(); - - if (setup.direct_draw) - SetDrawtoField(DRAW_DIRECT); } if (setup.soft_scrolling) @@ -266,9 +260,6 @@ void BackToFront() int x,y; DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field); - if (setup.direct_draw && game_status == GAME_MODE_PLAYING) - redraw_mask &= ~REDRAW_MAIN; - if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) redraw_mask |= REDRAW_FIELD; @@ -520,7 +511,7 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) } #endif -#if 1 +#if 0 if (fading.fade_mode == FADE_MODE_NONE) { BackToFront(); @@ -535,7 +526,13 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) printf("::: NOW FADING %d ... [%d]\n", fade_mode, fade_type); #endif - if (fade_mask & REDRAW_FIELD) +#if 0 + if (fade_mask == REDRAW_NONE) + fade_mask = REDRAW_FIELD; +#endif + + // if (fade_mask & REDRAW_FIELD) + if (fade_mask == REDRAW_FIELD) { x = REAL_SX; y = REAL_SY; @@ -562,15 +559,28 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) } #if 1 - if (!setup.fade_screens || fade_delay == 0) + if (!setup.fade_screens || + fade_delay == 0 || + fading.fade_mode == FADE_MODE_NONE) #else - if (!setup.fade_screens || fade_delay == 0 || fading.anim_mode == ANIM_NONE) + if (!setup.fade_screens || fade_delay == 0) #endif { if (fade_mode == FADE_MODE_FADE_OUT) + return; + +#if 0 + if (fade_mode == FADE_MODE_FADE_OUT && + fading.fade_mode != FADE_MODE_NONE) ClearRectangle(backbuffer, x, y, width, height); +#endif +#if 1 + BlitBitmap(backbuffer, window, x, y, width, height, x, y); + redraw_mask = REDRAW_NONE; +#else BackToFront(); +#endif return; } @@ -583,69 +593,22 @@ static void FadeExt(int fade_mask, int fade_mode, int fade_type) void FadeIn(int fade_mask) { -#if 0 - global.border_status = game_status; -#endif - -#if 1 - // printf("::: now fading in...\n"); - if (fading.fade_mode & FADE_TYPE_TRANSFORM) FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_IN); else FadeExt(fade_mask, FADE_MODE_FADE_IN, FADE_TYPE_FADE_IN); -#else -#if 1 - if (fading.fade_mode == FADE_MODE_CROSSFADE) - FadeExt(fade_mask, FADE_MODE_CROSSFADE); - else - FadeExt(fade_mask, FADE_MODE_FADE_IN); -#else - FadeExt(fade_mask, FADE_MODE_FADE_IN); -#endif -#endif } void FadeOut(int fade_mask) { -#if 1 - // printf("::: fading.fade_mode == %d\n", fading.fade_mode); - -#if 1 if (fading.fade_mode & FADE_TYPE_TRANSFORM) FadeExt(fade_mask, fading.fade_mode, FADE_TYPE_FADE_OUT); else FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT); -#else - if (fading.fade_mode & FADE_TYPE_TRANSFORM) - FadeCrossSaveBackbuffer(); - else - FadeExt(fade_mask, FADE_MODE_FADE_OUT, FADE_TYPE_FADE_OUT); -#endif - -#else -#if 1 - if (fading.fade_mode == FADE_MODE_CROSSFADE) - FadeCrossSaveBackbuffer(); - else - FadeExt(fade_mask, FADE_MODE_FADE_OUT); -#else - FadeExt(fade_mask, FADE_MODE_FADE_OUT); -#endif -#endif -#if 1 global.border_status = game_status; -#endif } -#if 0 -void FadeCross(int fade_mask) -{ - FadeExt(fade_mask, FADE_MODE_CROSSFADE); -} -#endif - static void FadeSetLeaveNext(struct TitleFadingInfo fading_leave, boolean set) { static struct TitleFadingInfo fading_leave_stored; @@ -820,7 +783,7 @@ void DrawBackgroundForGraphic(int x, int y, int width, int height, int graphic) DrawBackground(x, y, width, height); } -void ClearWindow() +void ClearField() { /* !!! "drawto" might still point to playfield buffer here (see above) !!! */ /* (when entering hall of fame after playing) */ @@ -834,12 +797,6 @@ void ClearWindow() } else SetDrawtoField(DRAW_BACKBUFFER); - - if (setup.direct_draw && game_status == GAME_MODE_PLAYING) - { - ClearRectangle(window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); - SetDrawtoField(DRAW_DIRECT); - } } void MarkTileDirty(int x, int y) @@ -1935,7 +1892,7 @@ void DrawLevel() int x,y; SetDrawBackgroundMask(REDRAW_NONE); - ClearWindow(); + ClearField(); for (x = BX1; x <= BX2; x++) for (y = BY1; y <= BY2; y++) @@ -2502,9 +2459,6 @@ void DrawPlayer(struct PlayerInfo *player) if (!IN_SCR_FIELD(sx, sy)) return; - if (setup.direct_draw) - SetDrawtoField(DRAW_BUFFERED); - /* ----------------------------------------------------------------------- */ /* draw things behind the player, if needed */ /* ----------------------------------------------------------------------- */ @@ -2683,18 +2637,6 @@ void DrawPlayer(struct PlayerInfo *player) DrawLevelFieldThruMask(jx, jy); } - if (setup.direct_draw) - { - int dst_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX; - int dst_y = SY + SCREENY(MIN(jy, last_jy)) * TILEY; - int x_size = TILEX * (1 + ABS(jx - last_jx)); - int y_size = TILEY * (1 + ABS(jy - last_jy)); - - BlitBitmap(drawto_field, window, - dst_x, dst_y, x_size, y_size, dst_x, dst_y); - SetDrawtoField(DRAW_DIRECT); - } - MarkTileDirty(sx, sy); } @@ -6042,6 +5984,8 @@ void SetGfxAnimation_EM(int tile, int frame_em, int x, int y) void getGraphicSourceObjectExt_EM(int tile, int frame_em, Bitmap **src_bitmap, int *src_x, int *src_y, + Bitmap **crumbled_src_bitmap, + int *crumbled_src_x, int *crumbled_src_y, int x, int y) { int element = object_mapping[tile].element_rnd; @@ -6058,7 +6002,14 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em, int graphic = (direction == MV_NONE ? el_act2img(effective_element, action) : el_act_dir2img(effective_element, action, direction)); + int crumbled = (direction == MV_NONE ? + el_act2crm(effective_element, action) : + el_act_dir2crm(effective_element, action, direction)); + int base_graphic = el_act2img(effective_element, ACTION_DEFAULT); + int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT); + boolean has_crumbled_graphics = (base_crumbled != base_graphic); struct GraphicInfo *g = &graphic_info[graphic]; + struct GraphicInfo *g_crumbled = &graphic_info[crumbled]; int sync_frame; #if 0 @@ -6093,6 +6044,37 @@ void getGraphicSourceObjectExt_EM(int tile, int frame_em, sync_frame); getGraphicSourceExt(graphic, frame, src_bitmap, src_x, src_y, FALSE); + +#if 0 + if (x == 1 && y == 1 && frame == 0) + printf("--> %d, %d, %d\n", *crumbled_src_x, *crumbled_src_y, tile); +#endif + +#if 0 + getGraphicSource(crumbled, frame, crumbled_src_bitmap, + crumbled_src_x, crumbled_src_y); +#endif + +#if 1 + /* (updating the "crumbled" graphic definitions is probably not really needed, + as animations for crumbled graphics can't be longer than one EMC cycle) */ + + *crumbled_src_bitmap = NULL; + *crumbled_src_x = 0; + *crumbled_src_y = 0; + + if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE) + { + int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames, + g_crumbled->anim_delay, + g_crumbled->anim_mode, + g_crumbled->anim_start_frame, + sync_frame); + + getGraphicSource(crumbled, frame_crumbled, crumbled_src_bitmap, + crumbled_src_x, crumbled_src_y); + } +#endif } void getGraphicSourcePlayerExt_EM(int player_nr, int anim, int frame_em, @@ -6292,6 +6274,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 *g_crumbled = &graphic_info[crumbled]; struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; Bitmap *src_bitmap; int src_x, src_y; @@ -6444,17 +6427,43 @@ void InitGraphicInfo_EM(void) #endif /* if element can be crumbled, but certain action graphics are just empty - space (like snapping sand with the original R'n'D graphics), do not + space (like instantly snapping sand to empty space in 1 frame), do not treat these empty space graphics as crumbled graphics in EMC engine */ if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE) { - getGraphicSource(crumbled, frame, &src_bitmap, &src_x, &src_y); + int frame_crumbled = getAnimationFrame(g_crumbled->anim_frames, + g_crumbled->anim_delay, + g_crumbled->anim_mode, + g_crumbled->anim_start_frame, + sync_frame); + + getGraphicSource(crumbled, frame_crumbled, &src_bitmap, &src_x, &src_y); g_em->has_crumbled_graphics = TRUE; g_em->crumbled_bitmap = src_bitmap; g_em->crumbled_src_x = src_x; g_em->crumbled_src_y = src_y; g_em->crumbled_border_size = graphic_info[crumbled].border_size; + + +#if 0 + if (g_em == &graphic_info_em_object[207][0]) + printf("... %d, %d [%d, %d, %d, %d] [%d, %d, %d, %d, %d, %d => %d]\n", + graphic_info_em_object[207][0].crumbled_src_x, + graphic_info_em_object[207][0].crumbled_src_y, + + crumbled, frame, src_x, src_y, + + g->anim_frames, + g->anim_delay, + g->anim_mode, + g->anim_start_frame, + sync_frame, + gfx.anim_random_frame, + frame); +#endif + + } #if 0