From fbcd2713a89a7736e43b46e0962c924ed8721785 Mon Sep 17 00:00:00 2001 From: Holger Schemel Date: Mon, 7 Nov 2016 20:49:30 +0100 Subject: [PATCH] minor cleanup --- src/game_em/graphics.c | 10 ++++------ src/game_sp/DDScrollBuffer.c | 10 ++++------ 2 files changed, 8 insertions(+), 12 deletions(-) diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index 3c68eb03..727b2b84 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -53,16 +53,14 @@ void BlitScreenToBitmap_EM(Bitmap *target_bitmap) int x = screen_x % (MAX_BUF_XSIZE * TILEX); int y = screen_y % (MAX_BUF_YSIZE * TILEY); - int sx, sy, sxsize, sysize; int xsize = SXSIZE; int ysize = SYSIZE; int full_xsize = lev.width * TILEX; int full_ysize = lev.height * TILEY; - - sxsize = (full_xsize < xsize ? full_xsize : xsize); - sysize = (full_ysize < ysize ? full_ysize : ysize); - sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); - sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sxsize = (full_xsize < xsize ? full_xsize : xsize); + int sysize = (full_ysize < ysize ? full_ysize : ysize); if (x < 2 * TILEX && y < 2 * TILEY) { diff --git a/src/game_sp/DDScrollBuffer.c b/src/game_sp/DDScrollBuffer.c index 026b80dd..0992e0be 100644 --- a/src/game_sp/DDScrollBuffer.c +++ b/src/game_sp/DDScrollBuffer.c @@ -233,16 +233,14 @@ void BlitScreenToBitmap_SP(Bitmap *target_bitmap) int px = getFieldbufferOffsetX_SP(); int py = getFieldbufferOffsetY_SP(); - int sx, sy, sxsize, sysize; int xsize = SXSIZE; int ysize = SYSIZE; int full_xsize = (FieldWidth - (menBorder ? 0 : 1)) * TILEX_VAR; int full_ysize = (FieldHeight - (menBorder ? 0 : 1)) * TILEY_VAR; - - sxsize = (full_xsize < xsize ? full_xsize : xsize); - sysize = (full_ysize < ysize ? full_ysize : ysize); - sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); - sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sx = SX + (full_xsize < xsize ? (xsize - full_xsize) / 2 : 0); + int sy = SY + (full_ysize < ysize ? (ysize - full_ysize) / 2 : 0); + int sxsize = (full_xsize < xsize ? full_xsize : xsize); + int sysize = (full_ysize < ysize ? full_ysize : ysize); BlitBitmap(bitmap_db_field_sp, target_bitmap, px, py, sxsize, sysize, sx, sy); } -- 2.34.1