X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_mm%2Fmm_tools.c;h=7a221b6759329d0aff4950452c79835f0931c880;hp=5c67bbe42b4b7b7e503111c2d43e329830832c40;hb=12a8fd3a64d6bee5ca5f5b89e4a00b49d78bbd2c;hpb=0dd257541d5c299a35228d9eb6cfd85c14ca4a26 diff --git a/src/game_mm/mm_tools.c b/src/game_mm/mm_tools.c index 5c67bbe4..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,61 +15,49 @@ #include "mm_tools.h" -/* forward declaration for internal use */ -static int getGraphicAnimationPhase_MM(int, int, int); - -void ClearWindow() +void SetDrawtoField_MM(int mode) { - ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); + int full_xsize = lev_fieldx * TILESIZE_VAR; + int full_ysize = lev_fieldy * TILESIZE_VAR; - SetDrawtoField(DRAW_BACKBUFFER); - - redraw_mask |= REDRAW_FIELD; -} + // 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); -static int getGraphicAnimationPhase_MM(int frames, int delay, int mode) -{ - int phase; + // 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 == ANIM_PINGPONG) + if (mode == DRAW_TO_BACKBUFFER) { - int max_anim_frames = 2 * frames - 2; - phase = (FrameCounter % (delay * max_anim_frames)) / delay; - phase = (phase < frames ? phase : max_anim_frames - phase); + cFX = FX + dSX; + cFY = FY + dSY; } - else - phase = (FrameCounter % (delay * frames)) / delay; - - if (mode == ANIM_REVERSE) - phase = -phase; - return(phase); + SetTileCursorSXSY(cSX, cSY); } -void DrawGraphicAnimationExt_MM(int x, int y, int graphic, - int frames, int delay, int mode, int mask_mode) +void ClearWindow(void) { - int phase = getGraphicAnimationPhase_MM(frames, delay, mode); + ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE); - if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - { - if (mask_mode == USE_MASKING) - DrawGraphicThruMask_MM(SCREENX(x), SCREENY(y), graphic + phase); - else - DrawGraphic_MM(SCREENX(x), SCREENY(y), graphic + phase); - } -} + SetDrawtoField(DRAW_TO_BACKBUFFER); + SetDrawtoField_MM(DRAW_TO_BACKBUFFER); -void DrawGraphicAnimation_MM(int x, int y, int graphic, - int frames, int delay, int mode) -{ - DrawGraphicAnimationExt_MM(x, y, graphic, frames, delay, mode, NO_MASKING); + redraw_mask |= REDRAW_FIELD; } -void DrawGraphicAnimationThruMask_MM(int x, int y, int graphic, - int frames, int delay, int mode) +void DrawGraphicAnimation_MM(int x, int y, int graphic, int frame) { - DrawGraphicAnimationExt_MM(x, y, graphic, frames, delay, mode, USE_MASKING); + Bitmap *bitmap; + int src_x, src_y; + + getGraphicSource(graphic, frame, &bitmap, &src_x, &src_y); + + BlitBitmap(bitmap, drawto_field, src_x, src_y, TILEX, TILEY, + cFX + x * TILEX, cFY + y * TILEY); } void DrawGraphic_MM(int x, int y, int graphic) @@ -85,7 +71,8 @@ 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); } @@ -95,6 +82,7 @@ void DrawGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic) int src_x, src_y; getGraphicSource(graphic, 0, &bitmap, &src_x, &src_y); + BlitBitmap(bitmap, d, src_x, src_y, TILEX, TILEY, x, y); } @@ -109,7 +97,9 @@ void DrawGraphicThruMask_MM(int x, int y, int graphic) } #endif - DrawGraphicThruMaskExt_MM(drawto_field, FX + x*TILEX, FY + y*TILEY, graphic); + DrawGraphicThruMaskExt_MM(drawto_field, cFX + x * TILEX, cFY + y * TILEY, + graphic); + MarkTileDirty(x,y); } @@ -129,14 +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, graphic); - MarkTileDirty(x/2, y/2); + 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) { @@ -144,6 +138,7 @@ void DrawMiniGraphicExt_MM(DrawBuffer *d, int x, int y, int graphic) int src_x, src_y; getMiniGraphicSource(graphic, &bitmap, &src_x, &src_y); + BlitBitmap(bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y); } @@ -158,38 +153,39 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, if (graphic < 0) { DrawGraphic_MM(x, y, 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; @@ -197,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; @@ -211,18 +207,22 @@ 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)); + } } getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); @@ -230,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)) @@ -243,10 +243,8 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, #endif if (mask_mode == USE_MASKING) - { BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, TILEX, TILEY, dest_x, dest_y); - } else BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, dest_x, dest_y); @@ -257,7 +255,7 @@ void DrawGraphicShifted_MM(int x,int y, int dx,int dy, int graphic, void DrawGraphicShiftedThruMask_MM(int x,int y, int dx,int dy, int graphic, int cut_mode) { - DrawGraphicShifted_MM(x,y, dx,dy, graphic, cut_mode, USE_MASKING); + DrawGraphicShifted_MM(x, y, dx, dy, graphic, cut_mode, USE_MASKING); } void DrawScreenElementExt_MM(int x, int y, int dx, int dy, int element, @@ -271,7 +269,7 @@ void DrawScreenElementExt_MM(int x, int y, int dx, int dy, int element, if (element == EL_PACMAN) { - graphic += 4 * !phase2; + graphic = (phase2 ? IMG_MM_PACMAN_RIGHT : IMG_MM_PACMAN_EATING_RIGHT); if (dir == MV_UP) graphic += 1; @@ -360,23 +358,31 @@ void DrawScreenField_MM(int x, int y) int horiz_move; Blocked2Moving(x, y, &oldx, &oldy); + sx = SCREENX(oldx); sy = SCREENY(oldy); horiz_move = (MovDir[oldx][oldy] == MV_LEFT || MovDir[oldx][oldy] == MV_RIGHT); DrawScreenElement_MM(x, y, EL_EMPTY); + element = Feld[oldx][oldy]; if (horiz_move) - DrawScreenElementShifted_MM(sx,sy, MovPos[oldx][oldy],0,element,NO_CUTTING); + DrawScreenElementShifted_MM(sx, sy, MovPos[oldx][oldy], 0, element, + NO_CUTTING); else - DrawScreenElementShifted_MM(sx,sy, 0,MovPos[oldx][oldy],element,NO_CUTTING); + DrawScreenElementShifted_MM(sx, sy, 0, MovPos[oldx][oldy], element, + NO_CUTTING); } else if (IS_DRAWABLE(element)) + { DrawScreenElement_MM(x, y, element); + } else + { DrawScreenElement_MM(x, y, EL_EMPTY); + } } void DrawLevelField_MM(int x, int y) @@ -391,10 +397,12 @@ void DrawMiniElement_MM(int x, int y, int element) if (!element) { DrawMiniGraphic_MM(x, y, IMG_EMPTY); + return; } graphic = el2gfx(element); + DrawMiniGraphic_MM(x, y, graphic); } @@ -415,14 +423,14 @@ void DrawField_MM(int x, int y) DrawElement_MM(x, y, element); } -void DrawLevel_MM() +void DrawLevel_MM(void) { int x,y; ClearWindow(); - for (x=0; x DY+249 && y < DY+278) + if (y > DY + 249 && y < DY + 278) { - if (x > DX+1 && x < DX+48) + if (x > DX + 1 && x < DX + 48) return 1; - else if (x > DX+51 && x < DX+98) + else if (x > DX + 51 && x < DX + 98) return 2; } + return 0; } +#endif Pixel ReadPixel(DrawBuffer *bitmap, int x, int y) { @@ -722,8 +741,25 @@ int get_rotated_element(int element, int step) return base_element + (element_phase + step + num_elements) % num_elements; } +static int map_element(int element) +{ + switch (element) + { + case EL_WALL_STEEL: return EL_STEEL_WALL; + case EL_WALL_WOOD: return EL_WOODEN_WALL; + case EL_WALL_ICE: return EL_ICE_WALL; + case EL_WALL_AMOEBA: return EL_AMOEBA_WALL; + case EL_DF_WALL_STEEL: return EL_DF_STEEL_WALL; + case EL_DF_WALL_WOOD: return EL_DF_WOODEN_WALL; + + default: return element; + } +} + int el2gfx(int element) { + element = map_element(element); + switch (element) { case EL_LIGHTBALL: @@ -734,9 +770,10 @@ int el2gfx(int element) } } -void RedrawPlayfield_MM() +void RedrawPlayfield_MM(void) { DrawLevel_MM(); + DrawLaser_MM(); } void BlitScreenToBitmap_MM(Bitmap *target_bitmap)