}
#endif
- DrawGraphicExt_MM(drawto_field, cFX + x * TILEX, cFY + y * TILEY, graphic);
+ int frame = getGraphicAnimationFrameXY(graphic, x, y);
+
+ DrawGraphicAnimation_MM(x, y, graphic, frame);
MarkTileDirty(x, y);
}
BlitBitmap(bitmap, d, src_x, src_y, TILEX, TILEY, x, y);
}
-void DrawGraphicThruMask_MM(int x, int y, int graphic)
+void DrawGraphicThruMask_MM(int x, int y, int graphic, int frame)
{
#if DEBUG
if (!IN_SCR_FIELD(x,y))
#endif
DrawGraphicThruMaskExt_MM(drawto_field, cFX + x * TILEX, cFY + y * TILEY,
- graphic);
+ graphic, frame);
MarkTileDirty(x,y);
}
void DrawGraphicThruMaskExt_MM(DrawBuffer *d, int dest_x, int dest_y,
- int graphic)
+ int graphic, int frame)
{
int src_x, src_y;
Bitmap *src_bitmap;
if (graphic == IMG_EMPTY)
return;
- getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+ getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dest_x, dest_y);
}
MarkTileDirty(x / 2, y / 2);
}
-#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)
{
Bitmap *bitmap;
MarkTileDirty(x,y);
}
-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);
-}
-
void DrawScreenElementExt_MM(int x, int y, int dx, int dy, int element,
int cut_mode, int mask_mode)
{
if (dx || dy)
DrawGraphicShifted_MM(x, y, dx, dy, graphic, cut_mode, mask_mode);
else if (mask_mode == USE_MASKING)
- DrawGraphicThruMask_MM(x, y, graphic);
+ DrawGraphicThruMask_MM(x, y, graphic, 0);
else
DrawGraphic_MM(x, y, graphic);
}
DrawScreenElementExt_MM(x, y, dx, dy, element, cut_mode, NO_MASKING);
}
-void DrawLevelElementShifted_MM(int x, int y, int dx, int dy, int element,
- int cut_mode)
-{
- DrawLevelElementExt_MM(x, y, dx, dy, element, cut_mode, NO_MASKING);
-}
-
-void DrawScreenElementThruMask_MM(int x, int y, int element)
-{
- DrawScreenElementExt_MM(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
-
-void DrawLevelElementThruMask_MM(int x, int y, int element)
-{
- DrawLevelElementExt_MM(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
-
-void DrawLevelFieldThruMask_MM(int x, int y)
-{
- DrawLevelElementExt_MM(x, y, 0, 0, Tile[x][y], NO_CUTTING, USE_MASKING);
-}
-
void DrawScreenElement_MM(int x, int y, int element)
{
DrawScreenElementExt_MM(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
}
-void DrawLevelElement_MM(int x, int y, int element)
-{
- if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawScreenElement_MM(SCREENX(x), SCREENY(y), element);
-}
-
void DrawScreenField_MM(int x, int y)
{
int element = Tile[x][y];
laser.fuse_x == x &&
laser.fuse_y == y)
DrawGraphic_MM(x, y, IMG_MM_FUSE);
+ else if (element == EL_GRAY_BALL_ACTIVE)
+ DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_ACTIVE));
+ else if (element == EL_GRAY_BALL_OPENING)
+ DrawGraphic_MM(x, y, el_act2gfx(EL_GRAY_BALL, MM_ACTION_OPENING));
+ else if (element == EL_BOMB_ACTIVE)
+ DrawGraphic_MM(x, y, el_act2gfx(EL_BOMB, MM_ACTION_ACTIVE));
+ else if (element == EL_MINE_ACTIVE)
+ DrawGraphic_MM(x, y, el_act2gfx(EL_MINE, MM_ACTION_ACTIVE));
else
DrawGraphic_MM(x, y, el2gfx(element));
}
-#if 0
-static void DrawMicroWalls_MM(int x, int y, int element)
-{
- Bitmap *bitmap;
- int graphic = el2gfx(WALL_BASE(element));
- int gx, gy;
- int i;
-
- getMicroGraphicSource(graphic, &bitmap, &gx, &gy);
-
- for (i = 0; i < 4; i++)
- {
- int xpos = MICROLEV_XPOS + x * MICRO_TILEX + MICRO_WALLX * (i % 2);
- int ypos = MICROLEV_YPOS + y * MICRO_TILEY + MICRO_WALLY * (i / 2);
-
- if (element & (1 << i))
- BlitBitmap(bitmap, drawto, gx, gy, MICRO_WALLX, MICRO_WALLY, xpos, ypos);
- else
- ClearRectangle(drawto, xpos, ypos, MICRO_WALLX, MICRO_WALLY);
- }
-}
-
-static void DrawMicroElement_MM(int x, int y, int element)
-{
- Bitmap *bitmap;
- int graphic = el2gfx(element);
- int gx, gy;
-
- if (element == EL_EMPTY)
- return;
-
- if (IS_WALL(element))
- {
- DrawMicroWalls_MM(x, y, element);
-
- return;
- }
-
- getMicroGraphicSource(graphic, &bitmap, &gx, &gy);
-
- BlitBitmap(bitmap, drawto, gx, gy, MICRO_TILEX, MICRO_TILEY,
- MICROLEV_XPOS + x * MICRO_TILEX, MICROLEV_YPOS + y * MICRO_TILEY);
-}
-
-static void DrawMicroLevelExt_MM(int xpos, int ypos)
-{
- int x, y;
-
- ClearRectangle(drawto, xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
-
- for (x = 0; x < STD_LEV_FIELDX; x++)
- for (y = 0; y < STD_LEV_FIELDY; y++)
- DrawMicroElement_MM(x, y, Ur[x][y]);
-
- redraw_mask |= REDRAW_FIELD;
-}
-#endif
-
-void DrawMiniLevel_MM(int size_x, int size_y, int scroll_x, int scroll_y)
-{
- int x, y;
-
- for (x = 0; x < size_x; x++)
- for (y = 0; y < size_y; y++)
- DrawMiniElementOrWall_MM(x, y, scroll_x, scroll_y);
-
- redraw_mask |= REDRAW_FIELD;
-}
-
// ----------------------------------------------------------------------------
// XSN
#define XSN_CHANGE_DELAY 30
#define XSN_CHANGE_FACTOR 3
#define XSN_ALPHA_DEFAULT XSN_ALPHA_VALUE(95)
+#define XSN_ALPHA_VISIBLE XSN_ALPHA_VALUE(50)
#define XSN_DEBUG_STEPS 5
static byte xsn_bits_0[] = { 0x05, 0x02, 0x05 };
struct XsnItem items[XSN_MAX_ITEMS];
Bitmap *bitmap;
+
+ int alpha;
};
static struct Xsn xsn = { 0 };
BlitBitmapMasked(xsn.bitmap, xsn.bitmap, xpos1, xsn.max_height,
xsize, xsn.max_height, xpos1, 0);
- SDLSetAlpha(surface_masked, TRUE, XSN_ALPHA_DEFAULT);
+ SDLSetAlpha(surface_masked, TRUE, xsn.alpha);
for (i = xpos1; i < xpos2; i++)
xsn.height[i] = MIN(xsn.height[i] + shrink, xsn.area_ysize - 1);
static boolean started = FALSE;
static boolean active = FALSE;
static boolean debug = FALSE;
- static unsigned int check_delay = 0;
- static unsigned int start_delay = 0;
- static unsigned int growth_delay = 0;
- static unsigned int update_delay = 0;
- static unsigned int change_delay = 0;
- static unsigned int check_delay_value = XSN_CHECK_DELAY * 1000;
- static unsigned int start_delay_value = 0;
- static unsigned int growth_delay_value = 0;
- static unsigned int update_delay_value = 0;
- static unsigned int change_delay_value = 0;
+ static DelayCounter check_delay = { XSN_CHECK_DELAY * 1000 };
+ static DelayCounter start_delay = { 0 };
+ static DelayCounter growth_delay = { 0 };
+ static DelayCounter update_delay = { 0 };
+ static DelayCounter change_delay = { 0 };
static int percent = 0;
static int debug_value = 0;
boolean reinitialize = FALSE;
if (draw_target != DRAW_TO_SCREEN)
return;
- if (DelayReached(&check_delay, check_delay_value))
+ if (DelayReached(&check_delay))
{
percent = (debug ? debug_value * 100 / XSN_DEBUG_STEPS : xsn_percent());
debug = TRUE;
active = FALSE;
- DelayReached(&check_delay, 0);
+ ResetDelayCounter(&check_delay);
setup.debug.xsn_mode = (debug_value > 0);
tile_cursor.xsn_debug = FALSE;
if (!active)
return;
- if (!active_last)
- {
- boolean no_delay = (debug || setup.debug.xsn_mode == TRUE);
-
- start_delay_value = (no_delay ? 0 : XSN_RND(XSN_START_DELAY * 2) * 1000);
- started = FALSE;
-
- DelayReached(&start_delay, 0);
-
- reinitialize = TRUE;
- }
-
if (!initialized)
{
xsn.area_xsize = gfx.win_xsize;
initialized = TRUE;
}
+ if (!active_last)
+ {
+ start_delay.value = (debug || setup.debug.xsn_mode == TRUE ? 0 :
+ (XSN_START_DELAY + XSN_RND(XSN_START_DELAY)) * 1000);
+ started = FALSE;
+
+ ResetDelayCounter(&start_delay);
+
+ reinitialize = TRUE;
+ }
+
if (reinitialize)
{
xsn.num_items = 0;
xsn.change_type = 0;
xsn.change_dir = 0;
+ xsn.alpha = XSN_ALPHA_DEFAULT;
+
for (i = 0; i < xsn.max_items; i++)
xsn_init_item(i);
}
SDL_SetColorKey(surface_masked, SET_TRANSPARENT_PIXEL,
SDL_MapRGB(surface_masked->format, 0x00, 0x00, 0x00));
- SDLSetAlpha(surface, TRUE, XSN_ALPHA_DEFAULT);
- SDLSetAlpha(surface_masked, TRUE, XSN_ALPHA_DEFAULT);
+ SDLSetAlpha(surface, TRUE, xsn.alpha);
+ SDLSetAlpha(surface_masked, TRUE, xsn.alpha);
SDLCreateBitmapTextures(xsn.bitmap);
if (!started)
{
- if (!DelayReached(&start_delay, start_delay_value))
+ if (!DelayReached(&start_delay))
return;
- update_delay_value = XSN_UPDATE_DELAY;
- growth_delay_value = XSN_GROWTH_DELAY * 1000;
- change_delay_value = XSN_CHANGE_DELAY * 1000;
+ update_delay.value = XSN_UPDATE_DELAY;
+ growth_delay.value = XSN_GROWTH_DELAY * 1000;
+ change_delay.value = XSN_CHANGE_DELAY * 1000;
- DelayReached(&growth_delay, 0);
- DelayReached(&update_delay, 0);
- DelayReached(&change_delay, 0);
+ ResetDelayCounter(&growth_delay);
+ ResetDelayCounter(&update_delay);
+ ResetDelayCounter(&change_delay);
started = TRUE;
}
if (xsn.num_items < xsn.max_items)
{
- if (DelayReached(&growth_delay, growth_delay_value))
+ if (DelayReached(&growth_delay))
{
xsn.num_items += XSN_RND(XSN_GROWTH_RATE * 2);
xsn.num_items = MIN(xsn.num_items, xsn.max_items);
}
}
- if (DelayReached(&update_delay, update_delay_value))
+ if (DelayReached(&update_delay))
{
for (i = 0; i < xsn.num_items; i++)
xsn_update_item(i);
}
- if (DelayReached(&change_delay, change_delay_value))
+ if (DelayReached(&change_delay))
{
xsn_update_change();
- change_delay_value = xsn.change_delay * 1000;
+ change_delay.value = xsn.change_delay * 1000;
+ }
+
+ int xsn_alpha_dx = (gfx.mouse_y > xsn.area_ysize - xsn.max_height ?
+ (xsn.alpha > XSN_ALPHA_VISIBLE ? -1 : 0) :
+ (xsn.alpha < XSN_ALPHA_DEFAULT ? +1 : 0));
+
+ if (xsn_alpha_dx != 0)
+ {
+ xsn.alpha += xsn_alpha_dx;
+
+ SDLSetAlpha(xsn.bitmap->surface_masked, TRUE, xsn.alpha);
+
+ SDLFreeBitmapTextures(xsn.bitmap);
+ SDLCreateBitmapTextures(xsn.bitmap);
}
BlitToScreenMasked(xsn.bitmap, 0, 0, xsn.area_xsize, xsn.max_height,
dst_x, dst_y);
}
-#if 0
-static int REQ_in_range(int x, int y)
-{
- if (y > DY + 249 && y < DY + 278)
- {
- if (x > DX + 1 && x < DX + 48)
- return 1;
- else if (x > DX + 51 && x < DX + 98)
- return 2;
- }
-
- return 0;
-}
-#endif
-
Pixel ReadPixel(DrawBuffer *bitmap, int x, int y)
{
return GetPixel(bitmap, x, y);
}
-void SetRGB(unsigned int pixel,
- unsigned short red, unsigned short green, unsigned short blue)
-{
-}
-
int get_base_element(int element)
{
if (IS_MIRROR(element))
}
}
-int el2gfx(int element)
+int unmap_element(int element)
{
- element = map_element(element);
-
switch (element)
{
- case EL_LIGHTBALL:
- return IMG_MM_LIGHTBALL_RED + RND(3);
+ case EL_STEEL_WALL: return EL_WALL_STEEL;
+ case EL_WOODEN_WALL: return EL_WALL_WOOD;
+ case EL_ICE_WALL: return EL_WALL_ICE;
+ case EL_AMOEBA_WALL: return EL_WALL_AMOEBA;
+ case EL_DF_STEEL_WALL: return EL_DF_WALL_STEEL;
+ case EL_DF_WOODEN_WALL: return EL_DF_WALL_WOOD;
- default:
- return el2img_mm(element);
+ default: return element;
}
}
+int el2gfx(int element)
+{
+ return el2img_mm(map_element(element));
+}
+
+int el_act2gfx(int element, int action)
+{
+ return el_act2img_mm(map_element(element), action);
+}
+
void RedrawPlayfield_MM(void)
{
DrawLevel_MM();