void SetMainBackgroundImage(int graphic)
{
- SetMainBackgroundBitmap(graphic == IMG_NONE ? NULL :
+ SetMainBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
new_graphic_info[graphic].bitmap ?
new_graphic_info[graphic].bitmap :
new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
void SetDoorBackgroundImage(int graphic)
{
- SetDoorBackgroundBitmap(graphic == IMG_NONE ? NULL :
+ SetDoorBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
new_graphic_info[graphic].bitmap ?
new_graphic_info[graphic].bitmap :
new_graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
}
}
+void MarkTileDirty(int x, int y)
+{
+ int xx = redraw_x1 + x;
+ int yy = redraw_y1 + y;
+
+ if (!redraw[xx][yy])
+ redraw_tiles++;
+
+ redraw[xx][yy] = TRUE;
+ redraw_mask |= REDRAW_TILES;
+}
+
+void SetBorderElement()
+{
+ int x, y;
+
+ BorderElement = EL_EMPTY;
+
+ for(y=0; y<lev_fieldy && BorderElement == EL_EMPTY; y++)
+ {
+ for(x=0; x<lev_fieldx; x++)
+ {
+ if (!IS_MASSIVE(Feld[x][y]))
+ BorderElement = EL_STEELWALL;
+
+ if (y != 0 && y != lev_fieldy - 1 && x != lev_fieldx - 1)
+ x = lev_fieldx - 2;
+ }
+ }
+}
+
static int getGraphicAnimationPhase(int frames, int delay, int mode)
{
int phase;
sync_frame);
}
-void MarkTileDirty(int x, int y)
+inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+ int graphic, int sync_frame, int mask_mode)
{
- int xx = redraw_x1 + x;
- int yy = redraw_y1 + y;
-
- if (!redraw[xx][yy])
- redraw_tiles++;
+ int frame = getGraphicAnimationFrame(graphic, sync_frame);
- redraw[xx][yy] = TRUE;
- redraw_mask |= REDRAW_TILES;
+ if (mask_mode == USE_MASKING)
+ DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame);
+ else
+ DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
}
-void SetBorderElement()
+inline boolean DrawGraphicAnimation(int x, int y, int graphic)
{
- int x, y;
+ int lx = LEVELX(x), ly = LEVELY(y);
- BorderElement = EL_EMPTY;
+ if (!IN_SCR_FIELD(x, y) ||
+ (GfxFrame[lx][ly] % new_graphic_info[graphic].anim_delay) != 0)
+ return FALSE;
- for(y=0; y<lev_fieldy && BorderElement == EL_EMPTY; y++)
- {
- for(x=0; x<lev_fieldx; x++)
- {
- if (!IS_MASSIVE(Feld[x][y]))
- BorderElement = EL_STEELWALL;
+ DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
+ graphic, GfxFrame[lx][ly], NO_MASKING);
+ MarkTileDirty(x, y);
- if (y != 0 && y != lev_fieldy - 1 && x != lev_fieldx - 1)
- x = lev_fieldx - 2;
- }
- }
+ return TRUE;
+}
+
+boolean DrawLevelGraphicAnimation(int x, int y, int graphic)
+{
+ return DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+}
+
+boolean DrawLevelElementAnimation(int x, int y, int element)
+{
+ return DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
}
void DrawAllPlayers()
MarkTileDirty(sx,sy);
}
-void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
- int graphic, int mask_mode)
-{
- int frame = getGraphicAnimationFrame(graphic, -1);
-
- if (mask_mode == USE_MASKING)
- DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame);
- else
- DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
-}
-
-void DrawGraphicAnimation(int x, int y, int graphic)
-{
- int ux = LEVELX(x), uy = LEVELY(y);
-
- if (!IN_SCR_FIELD(x, y) ||
- (GfxFrame[ux][uy] % new_graphic_info[graphic].anim_delay) != 0)
- return;
-
- DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
- graphic, NO_MASKING);
- MarkTileDirty(x, y);
-}
-
#if 0
void getOldGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
{
#if DEBUG
int graphic_OLD = el2gfx_OLD(element);
- if (element >= MAX_ELEMENTS)
+ if (element >= MAX_NUM_ELEMENTS)
{
- Error(ERR_WARN, "el2gfx: element == %d >= MAX_ELEMENTS", element);
+ Error(ERR_WARN, "el2gfx: element == %d >= MAX_NUM_ELEMENTS", element);
}
if (graphic_NEW != graphic_OLD)