X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=10bbe6912a7628454f770afb93d4055f0ac01bf6;hb=e73321327b4e72d10bbd6ab307e75ae8afd1083f;hp=39a0d68140e3f6e47f374e489a15767d7eb27e10;hpb=8ad235d4df77b4c54322b6f2173d3bc30f77c92e;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 39a0d681..10bbe691 100644 --- a/src/tools.c +++ b/src/tools.c @@ -419,18 +419,30 @@ void BlitScreenToBitmap(Bitmap *target_bitmap) redraw_mask |= REDRAW_FIELD; } +void DrawFramesPerSecond() +{ + char text[100]; + int font_nr = FONT_TEXT_2; + int font_width = getFontWidth(font_nr); + + sprintf(text, "%04.1f fps", global.frames_per_second); + + DrawTextExt(backbuffer, WIN_XSIZE - font_width * strlen(text), 0, text, + font_nr, BLIT_OPAQUE); +} + void BackToFront() { if (redraw_mask == REDRAW_NONE) return; - // redraw playfield if anything inside main playfield area needs redraw - if (redraw_mask & REDRAW_MAIN) - redraw_mask |= REDRAW_FIELD; - // draw masked border to all viewports, if defined DrawMaskedBorder(redraw_mask); + // draw frames per second (only if debug mode is enabled) + if (redraw_mask & REDRAW_FPS) + DrawFramesPerSecond(); + // redraw complete window if both playfield and (some) doors need redraw if (redraw_mask & REDRAW_FIELD && redraw_mask & REDRAW_DOORS) redraw_mask = REDRAW_ALL; @@ -1959,7 +1971,7 @@ void AnimateEnvelope(int envelope_nr, int anim_mode, int action) level.envelope[envelope_nr].autowrap, level.envelope[envelope_nr].centered, FALSE); - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; + redraw_mask |= REDRAW_FIELD; BackToFront(); SkipUntilDelayReached(&anim_delay, anim_delay_value, &i, last_frame); @@ -2010,25 +2022,57 @@ void ShowEnvelope(int envelope_nr) BackToFront(); } -static void setRequestCenterPosition(int *x, int *y) +static void setRequestBasePosition(int *x, int *y) { - int sx_center = (request.x != -1 ? request.x : SX + SXSIZE / 2); - int sy_center = (request.y != -1 ? request.y : SY + SYSIZE / 2); + int sx_base, sy_base; - *x = sx_center; - *y = sy_center; + if (request.x != -1) + sx_base = request.x; + else if (request.align == ALIGN_LEFT) + sx_base = SX; + else if (request.align == ALIGN_RIGHT) + sx_base = SX + SXSIZE; + else + sx_base = SX + SXSIZE / 2; + + if (request.y != -1) + sy_base = request.y; + else if (request.valign == VALIGN_TOP) + sy_base = SY; + else if (request.valign == VALIGN_BOTTOM) + sy_base = SY + SYSIZE; + else + sy_base = SY + SYSIZE / 2; + + *x = sx_base; + *y = sy_base; } -static void setRequestPosition(int *x, int *y, boolean add_border_size) +static void setRequestPositionExt(int *x, int *y, int width, int height, + boolean add_border_size) { int border_size = request.border_size; - int sx_center, sy_center; + int sx_base, sy_base; int sx, sy; - setRequestCenterPosition(&sx_center, &sy_center); + setRequestBasePosition(&sx_base, &sy_base); - sx = sx_center - request.width / 2; - sy = sy_center - request.height / 2; + if (request.align == ALIGN_LEFT) + sx = sx_base; + else if (request.align == ALIGN_RIGHT) + sx = sx_base - width; + else + sx = sx_base - width / 2; + + if (request.valign == VALIGN_TOP) + sy = sy_base; + else if (request.valign == VALIGN_BOTTOM) + sy = sy_base - height; + else + sy = sy_base - height / 2; + + sx = MAX(0, MIN(sx, WIN_XSIZE - width)); + sy = MAX(0, MIN(sy, WIN_YSIZE - height)); if (add_border_size) { @@ -2040,6 +2084,11 @@ static void setRequestPosition(int *x, int *y, boolean add_border_size) *y = sy; } +static void setRequestPosition(int *x, int *y, boolean add_border_size) +{ + setRequestPositionExt(x, y, request.width, request.height, add_border_size); +} + void DrawEnvelopeRequest(char *text) { char *text_final = text; @@ -2128,11 +2177,9 @@ void AnimateEnvelopeRequest(int anim_mode, int action) int anim_delay_value = (no_delay ? 0 : delay_value + 500 * 0) / 2; unsigned int anim_delay = 0; - int width = request.width; - int height = request.height; int tile_size = request.step_offset; - int max_xsize = width / tile_size; - int max_ysize = height / tile_size; + int max_xsize = request.width / tile_size; + int max_ysize = request.height / tile_size; int max_xsize_inner = max_xsize - 2; int max_ysize_inner = max_ysize - 2; @@ -2171,17 +2218,14 @@ void AnimateEnvelopeRequest(int anim_mode, int action) int ysize_size_top = (ysize - 1) * tile_size; int max_xsize_pos = (max_xsize - 1) * tile_size; int max_ysize_pos = (max_ysize - 1) * tile_size; - int sx_center, sy_center; + int width = xsize * tile_size; + int height = ysize * tile_size; int src_x, src_y; int dst_x, dst_y; int xx, yy; - setRequestCenterPosition(&sx_center, &sy_center); - - src_x = sx_center - width / 2; - src_y = sy_center - height / 2; - dst_x = sx_center - xsize * tile_size / 2; - dst_y = sy_center - ysize * tile_size / 2; + setRequestPosition(&src_x, &src_y, FALSE); + setRequestPositionExt(&dst_x, &dst_y, width, height, FALSE); BlitBitmap(bitmap_db_store, backbuffer, 0, 0, WIN_XSIZE, WIN_YSIZE, 0, 0); @@ -2205,7 +2249,7 @@ void AnimateEnvelopeRequest(int anim_mode, int action) } } - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; + redraw_mask |= REDRAW_FIELD; DoAnimation(); BackToFront(); @@ -2220,7 +2264,9 @@ void ShowEnvelopeRequest(char *text, unsigned int req_state, int action) int graphic = IMG_BACKGROUND_REQUEST; int sound_opening = SND_REQUEST_OPENING; int sound_closing = SND_REQUEST_CLOSING; - int anim_mode = graphic_info[graphic].anim_mode; + int anim_mode_1 = request.anim_mode; /* (higher priority) */ + int anim_mode_2 = graphic_info[graphic].anim_mode; /* (lower priority) */ + int anim_mode = (anim_mode_1 != ANIM_DEFAULT ? anim_mode_1 : anim_mode_2); int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL: anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode); @@ -2397,7 +2443,7 @@ static void DrawPreviewLevelPlayfieldExt(int from_x, int from_y) } } - redraw_mask |= REDRAW_MICROLEVEL; + redraw_mask |= REDRAW_FIELD; } #define MICROLABEL_EMPTY 0 @@ -2466,7 +2512,7 @@ static void DrawPreviewLevelLabelExt(int mode) if (strlen(label_text) > 0) DrawTextSAligned(pos->x, pos->y, label_text, font_nr, pos->align); - redraw_mask |= REDRAW_MICROLEVEL; + redraw_mask |= REDRAW_FIELD; } static void DrawPreviewLevelExt(boolean restart)