X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_tools.c;h=7a221b6759329d0aff4950452c79835f0931c880;hp=aa09879e0c4690c34148371202e1ba5be35262d7;hb=12a8fd3a64d6bee5ca5f5b89e4a00b49d78bbd2c;hpb=98272a6958328946fb3ceab794cb21f59f91d22f diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c index aa09879e..7a221b67 100644 --- a/src/game_mm/mm_tools.c +++ b/src/game_mm/mm_tools.c @@ -1,15 +1,13 @@ -/*********************************************************** -* Mirror Magic -- McDuffin's Revenge * -*----------------------------------------------------------* -* (c) 1994-2001 Artsoft Entertainment * -* Holger Schemel * -* Detmolder Strasse 189 * -* 33604 Bielefeld * -* Germany * -* e-mail: info@artsoft.org * -*----------------------------------------------------------* -* tools.c * -***********************************************************/ +// ============================================================================ +// Mirror Magic -- McDuffin's Revenge +// ---------------------------------------------------------------------------- +// (c) 1994-2017 by Artsoft Entertainment +// Holger Schemel +// info@artsoft.org +// http://www.artsoft.org/ +// ---------------------------------------------------------------------------- +// mm_tools.c +// ============================================================================ #include "main_mm.h" @@ -17,11 +15,36 @@ #include "mm_tools.h" -void ClearWindow() +void SetDrawtoField_MM(int mode) +{ + int full_xsize = lev_fieldx * TILESIZE_VAR; + int full_ysize = lev_fieldy * TILESIZE_VAR; + + // distance (delta) from screen border (SX/SY) to centered level playfield + dSX = (full_xsize < SXSIZE ? (SXSIZE - full_xsize) / 2 : 0); + dSY = (full_ysize < SYSIZE ? (SYSIZE - full_ysize) / 2 : 0); + + // for convenience, absolute screen position to centered level playfield + cSX = SX + dSX; + cSY = SY + dSY; + cSX2 = SX + dSX + 2; // including playfield border + cSY2 = SY + dSY + 2; // including playfield border + + if (mode == DRAW_TO_BACKBUFFER) + { + cFX = FX + dSX; + cFY = FY + dSY; + } + + SetTileCursorSXSY(cSX, cSY); +} + +void ClearWindow(void) { ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); - SetDrawtoField(DRAW_BACKBUFFER); + SetDrawtoField(DRAW_TO_BACKBUFFER); + SetDrawtoField_MM(DRAW_TO_BACKBUFFER); redraw_mask |= REDRAW_FIELD; } @@ -34,7 +57,7 @@ void DrawGraphicAnimation_MM(int x, int y, int graphic, int frame) getGraphicSource(graphic, frame, &bitmap, &src_x, &src_y); BlitBitmap(bitmap, drawto_field, src_x, src_y, TILEX, TILEY, - FX + x * TILEX, FY + y * TILEY); + cFX + x * TILEX, cFY + y * TILEY); } void DrawGraphic_MM(int x, int y, int graphic) @@ -48,7 +71,7 @@ void DrawGraphic_MM(int x, int y, int graphic) } #endif - DrawGraphicExt_MM(drawto_field, FX + x*TILEX, FY + y*TILEY, graphic); + DrawGraphicExt_MM(drawto_field, cFX + x * TILEX, cFY + y * TILEY, graphic); MarkTileDirty(x, y); } @@ -74,7 +97,7 @@ void DrawGraphicThruMask_MM(int x, int y, int graphic) } #endif - DrawGraphicThruMaskExt_MM(drawto_field, FX + x * TILEX, FY + y * TILEY, + DrawGraphicThruMaskExt_MM(drawto_field, cFX + x * TILEX, cFY + y * TILEY, graphic); MarkTileDirty(x,y); @@ -96,16 +119,18 @@ void DrawGraphicThruMaskExt_MM(DrawBuffer *d, int dest_x, int dest_y, void DrawMiniGraphic_MM(int x, int y, int graphic) { - DrawMiniGraphicExt_MM(drawto, SX + x * MINI_TILEX, SY + y * MINI_TILEY, + DrawMiniGraphicExt_MM(drawto, cSX + x * MINI_TILEX, cSY + y * MINI_TILEY, graphic); MarkTileDirty(x / 2, y / 2); } -void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +#if 0 +static void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { getSizedGraphicSource(graphic, 0, TILESIZE / 4, bitmap, x, y); } +#endif void DrawMiniGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic) { @@ -132,35 +157,35 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, return; } - if (dx || dy) /* Verschiebung der Grafik? */ + if (dx || dy) // Verschiebung der Grafik? { - if (x < BX1) /* Element kommt von links ins Bild */ + if (x < BX1) // Element kommt von links ins Bild { x = BX1; width = dx; cx = TILEX - dx; dx = 0; } - else if (x > BX2) /* Element kommt von rechts ins Bild */ + else if (x > BX2) // Element kommt von rechts ins Bild { x = BX2; width = -dx; dx = TILEX + dx; } - else if (x==BX1 && dx < 0) /* Element verläßt links das Bild */ + else if (x==BX1 && dx < 0) // Element verläßt links das Bild { width += dx; cx = -dx; dx = 0; } - else if (x==BX2 && dx > 0) /* Element verläßt rechts das Bild */ + else if (x==BX2 && dx > 0) // Element verläßt rechts das Bild width -= dx; - else if (dx) /* allg. Bewegung in x-Richtung */ + else if (dx) // allg. Bewegung in x-Richtung MarkTileDirty(x + SIGN(dx), y); - if (y < BY1) /* Element kommt von oben ins Bild */ + if (y < BY1) // Element kommt von oben ins Bild { - if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */ + if (cut_mode==CUT_BELOW) // Element oberhalb des Bildes return; y = BY1; @@ -168,13 +193,13 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, cy = TILEY - dy; dy = 0; } - else if (y > BY2) /* Element kommt von unten ins Bild */ + else if (y > BY2) // Element kommt von unten ins Bild { y = BY2; height = -dy; dy = TILEY + dy; } - else if (y==BY1 && dy < 0) /* Element verläßt oben das Bild */ + else if (y==BY1 && dy < 0) // Element verläßt oben das Bild { height += dy; cy = -dy; @@ -182,19 +207,19 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, } else if (dy > 0 && cut_mode == CUT_ABOVE) { - if (y == BY2) /* Element unterhalb des Bildes */ + if (y == BY2) // Element unterhalb des Bildes return; height = dy; cy = TILEY - dy; dy = TILEY; MarkTileDirty(x, y + 1); - } /* Element verläßt unten das Bild */ + } // Element verläßt unten das Bild else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW)) { height -= dy; } - else if (dy) /* allg. Bewegung in y-Richtung */ + else if (dy) // allg. Bewegung in y-Richtung { MarkTileDirty(x, y + SIGN(dy)); } @@ -205,8 +230,8 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, src_x += cx; src_y += cy; - dest_x = FX + x * TILEX + dx; - dest_y = FY + y * TILEY + dy; + dest_x = cFX + x * TILEX + dx; + dest_y = cFY + y * TILEY + dy; #if DEBUG if (!IN_SCR_FIELD(x,y)) @@ -398,7 +423,7 @@ void DrawField_MM(int x, int y) DrawElement_MM(x, y, element); } -void DrawLevel_MM() +void DrawLevel_MM(void) { int x,y; @@ -420,8 +445,7 @@ void DrawWallsExt_MM(int x, int y, int element, int draw_mask) getMiniGraphicSource(graphic, &bitmap, &gx, &gy); - if (game_status != LEVELED || !editor.draw_walls_masked) - DrawGraphic_MM(x, y, IMG_EMPTY); + DrawGraphic_MM(x, y, IMG_EMPTY); /* if (IS_WALL_WOOD(element) || IS_WALL_AMOEBA(element) || @@ -433,8 +457,8 @@ void DrawWallsExt_MM(int x, int y, int element, int draw_mask) for (i = 0; i < 4; i++) { - int dest_x = SX + x * TILEX + MINI_TILEX * (i % 2); - int dest_y = SY + y * TILEY + MINI_TILEY * (i / 2); + int dest_x = cSX + x * TILEX + MINI_TILEX * (i % 2); + int dest_y = cSY + y * TILEY + MINI_TILEY * (i / 2); if (!((1 << i) & draw_mask)) continue; @@ -442,7 +466,7 @@ void DrawWallsExt_MM(int x, int y, int element, int draw_mask) if (element & (1 << i)) BlitBitmap(bitmap, drawto, gx, gy, MINI_TILEX, MINI_TILEY, dest_x, dest_y); - else if (!editor.draw_walls_masked) + else ClearRectangle(drawto, dest_x, dest_y, MINI_TILEX, MINI_TILEY); } @@ -473,8 +497,8 @@ void DrawWallsAnimation_MM(int x, int y, int element, int phase, int bit_mask) int frame; Bitmap *bitmap; int src_x, src_y; - int dst_x = SX + x * TILEX + (i % 2) * MINI_TILEX; - int dst_y = SY + y * TILEY + (i / 2) * MINI_TILEY; + int dst_x = cSX + x * TILEX + (i % 2) * MINI_TILEX; + int dst_y = cSY + y * TILEY + (i / 2) * MINI_TILEY; if (bit_mask & (1 << i)) { @@ -518,11 +542,17 @@ void DrawElement_MM(int x, int y, int element) #endif else if (element == EL_PACMAN) DrawLevelField_MM(x, y); + else if (element == EL_FUSE_ON && + laser.fuse_off && + laser.fuse_x == x && + laser.fuse_y == y) + DrawGraphic_MM(x, y, IMG_MM_FUSE); else DrawGraphic_MM(x, y, el2gfx(element)); } -void DrawMicroWalls_MM(int x, int y, int element) +#if 0 +static void DrawMicroWalls_MM(int x, int y, int element) { Bitmap *bitmap; int graphic = el2gfx(WALL_BASE(element)); @@ -543,7 +573,7 @@ void DrawMicroWalls_MM(int x, int y, int element) } } -void DrawMicroElement_MM(int x, int y, int element) +static void DrawMicroElement_MM(int x, int y, int element) { Bitmap *bitmap; int graphic = el2gfx(element); @@ -565,7 +595,7 @@ void DrawMicroElement_MM(int x, int y, int element) MICROLEV_XPOS + x * MICRO_TILEX, MICROLEV_YPOS + y * MICRO_TILEY); } -void DrawMicroLevelExt_MM(int xpos, int ypos) +static void DrawMicroLevelExt_MM(int xpos, int ypos) { int x, y; @@ -577,6 +607,7 @@ void DrawMicroLevelExt_MM(int xpos, int ypos) redraw_mask |= REDRAW_FIELD; } +#endif void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y) { @@ -589,7 +620,8 @@ void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y) redraw_mask |= REDRAW_FIELD; } -int REQ_in_range(int x, int y) +#if 0 +static int REQ_in_range(int x, int y) { if (y > DY + 249 && y < DY + 278) { @@ -601,6 +633,7 @@ int REQ_in_range(int x, int y) return 0; } +#endif Pixel ReadPixel(DrawBuffer *bitmap, int x, int y) { @@ -737,9 +770,10 @@ int el2gfx(int element) } } -void RedrawPlayfield_MM() +void RedrawPlayfield_MM(void) { DrawLevel_MM(); + DrawLaser_MM(); } void BlitScreenToBitmap_MM(Bitmap *target_bitmap)