#define NUM_TOOL_BUTTONS 7
/* forward declaration for internal use */
-static int getGraphicAnimationPhase(int, int, int);
-static void DrawGraphicAnimationShiftedThruMask(int, int, int, int, int,
- int, int, int);
static void UnmapToolButtons();
static void HandleToolButtons(struct GadgetInfo *);
info1[0] = '\0';
sprintf(text, "%.1f fps%s", global.frames_per_second, info1);
- DrawTextExt(window, SX, SY, text, FS_SMALL, FC_YELLOW);
+ DrawTextExt(window, SX, SY, text, FS_SMALL, FC_YELLOW, FONT_OPAQUE);
}
FlushDisplay();
BackToFront();
}
+void SetMainBackgroundImage(int graphic)
+{
+ SetMainBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
+ graphic_info[graphic].bitmap ?
+ graphic_info[graphic].bitmap :
+ graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+}
+
+void SetDoorBackgroundImage(int graphic)
+{
+ SetDoorBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL :
+ graphic_info[graphic].bitmap ?
+ graphic_info[graphic].bitmap :
+ graphic_info[IMG_BACKGROUND_DEFAULT].bitmap);
+}
+
+void DrawBackground(int dest_x, int dest_y, int width, int height)
+{
+ ClearRectangleOnBackground(backbuffer, dest_x, dest_y, width, height);
+
+ redraw_mask |= REDRAW_FIELD;
+}
+
void ClearWindow()
{
- ClearRectangle(backbuffer, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
+ DrawBackground(REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
if (setup.soft_scrolling && game_status == PLAYING)
{
ClearRectangle(window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE);
SetDrawtoField(DRAW_DIRECT);
}
-
- redraw_mask |= REDRAW_FIELD;
}
void MarkTileDirty(int x, int y)
}
}
+void SetRandomAnimationValue(int x, int y)
+{
+ anim.random_frame = GfxRandom[x][y];
+}
+
+inline int getGraphicAnimationFrame(int graphic, int sync_frame)
+{
+ /* animation synchronized with global frame counter, not move position */
+ if (graphic_info[graphic].anim_global_sync || sync_frame < 0)
+ sync_frame = FrameCounter;
+
+ return getAnimationFrame(graphic_info[graphic].anim_frames,
+ graphic_info[graphic].anim_delay,
+ graphic_info[graphic].anim_mode,
+ graphic_info[graphic].anim_start_frame,
+ sync_frame);
+}
+
+inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y,
+ int graphic, int sync_frame, int mask_mode)
+{
+ int frame = getGraphicAnimationFrame(graphic, sync_frame);
+
+ if (mask_mode == USE_MASKING)
+ DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame);
+ else
+ DrawGraphicExt(dst_bitmap, x, y, graphic, frame);
+}
+
+inline void DrawGraphicAnimation(int x, int y, int graphic)
+{
+ int lx = LEVELX(x), ly = LEVELY(y);
+
+ if (!IN_SCR_FIELD(x, y))
+ return;
+
+ DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
+ graphic, GfxFrame[lx][ly], NO_MASKING);
+ MarkTileDirty(x, y);
+}
+
+void DrawLevelGraphicAnimation(int x, int y, int graphic)
+{
+ DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic);
+}
+
+void DrawLevelElementAnimation(int x, int y, int element)
+{
+ DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element));
+}
+
+inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic)
+{
+ int sx = SCREENX(x), sy = SCREENY(y);
+
+ if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
+ return;
+
+ if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+ return;
+
+ DrawGraphicAnimation(sx, sy, graphic);
+}
+
+void DrawLevelElementAnimationIfNeeded(int x, int y, int element)
+{
+ int sx = SCREENX(x), sy = SCREENY(y);
+ int graphic;
+
+ if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy))
+ return;
+
+ graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+
+ if (!IS_NEW_FRAME(GfxFrame[x][y], graphic))
+ return;
+
+ DrawGraphicAnimation(sx, sy, graphic);
+}
+
void DrawAllPlayers()
{
int i;
int sx = SCREENX(jx), sy = SCREENY(jy);
int sxx = 0, syy = 0;
int element = Feld[jx][jy], last_element = Feld[last_jx][last_jy];
- int graphic, phase;
+ int graphic;
+ int frame = 0;
boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE);
if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element))
{
DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]);
+
if (last_element == EL_DYNAMITE_ACTIVE)
DrawDynamite(last_jx, last_jy);
else
((action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) &&
!(action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN))));
- graphic = GFX_SP_MURPHY;
+ graphic = IMG_SP_MURPHY;
if (player->Pushing)
{
if (player->MovDir == MV_LEFT)
- graphic = GFX_MURPHY_PUSH_LEFT;
+ graphic = IMG_SP_MURPHY_PUSHING_LEFT;
else if (player->MovDir == MV_RIGHT)
- graphic = GFX_MURPHY_PUSH_RIGHT;
+ graphic = IMG_SP_MURPHY_PUSHING_RIGHT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
- graphic = GFX_MURPHY_PUSH_LEFT;
+ graphic = IMG_SP_MURPHY_PUSHING_LEFT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
- graphic = GFX_MURPHY_PUSH_RIGHT;
+ graphic = IMG_SP_MURPHY_PUSHING_RIGHT;
}
else if (player->snapped)
{
if (player->MovDir == MV_LEFT)
- graphic = GFX_MURPHY_SNAP_LEFT;
+ graphic = IMG_SP_MURPHY_SNAPPING_LEFT;
else if (player->MovDir == MV_RIGHT)
- graphic = GFX_MURPHY_SNAP_RIGHT;
+ graphic = IMG_SP_MURPHY_SNAPPING_RIGHT;
else if (player->MovDir == MV_UP)
- graphic = GFX_MURPHY_SNAP_UP;
+ graphic = IMG_SP_MURPHY_SNAPPING_UP;
else if (player->MovDir == MV_DOWN)
- graphic = GFX_MURPHY_SNAP_DOWN;
+ graphic = IMG_SP_MURPHY_SNAPPING_DOWN;
}
else if (action_moving)
{
if (player->MovDir == MV_LEFT)
- graphic = GFX_MURPHY_GO_LEFT;
+ graphic = IMG_SP_MURPHY_MOVING_LEFT;
else if (player->MovDir == MV_RIGHT)
- graphic = GFX_MURPHY_GO_RIGHT;
+ graphic = IMG_SP_MURPHY_MOVING_RIGHT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT)
- graphic = GFX_MURPHY_GO_LEFT;
+ graphic = IMG_SP_MURPHY_MOVING_LEFT;
else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT)
- graphic = GFX_MURPHY_GO_RIGHT;
+ graphic = IMG_SP_MURPHY_MOVING_RIGHT;
else
- graphic = GFX_MURPHY_GO_LEFT;
+ graphic = IMG_SP_MURPHY_MOVING_LEFT;
- graphic += getGraphicAnimationPhase(3, 2, ANIM_PINGPONG);
+ frame = getGraphicAnimationFrame(graphic, -1);
}
if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT)
else
{
if (player->MovDir == MV_LEFT)
- graphic =
- (player->Pushing ? GFX_SPIELER1_PUSH_LEFT : GFX_SPIELER1_LEFT);
+ graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_LEFT :
+ player->is_moving ? IMG_PLAYER1_MOVING_LEFT :
+ IMG_PLAYER1_LEFT);
else if (player->MovDir == MV_RIGHT)
- graphic =
- (player->Pushing ? GFX_SPIELER1_PUSH_RIGHT : GFX_SPIELER1_RIGHT);
+ graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_RIGHT :
+ player->is_moving ? IMG_PLAYER1_MOVING_RIGHT :
+ IMG_PLAYER1_RIGHT);
else if (player->MovDir == MV_UP)
- graphic = GFX_SPIELER1_UP;
+ graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_UP :
+ player->is_moving ? IMG_PLAYER1_MOVING_UP :
+ IMG_PLAYER1_UP);
else /* MV_DOWN || MV_NO_MOVING */
- graphic = GFX_SPIELER1_DOWN;
+ graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_DOWN :
+ player->is_moving ? IMG_PLAYER1_MOVING_DOWN :
+ IMG_PLAYER1_DOWN);
+
+ graphic = PLAYER_NR_GFX(graphic, player->index_nr);
- graphic += player->index_nr * 3 * HEROES_PER_LINE;
- graphic += player->Frame;
+#if 0
+ frame = player->Frame;
+#else
+ frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
}
if (player->GfxPos)
if (!setup.soft_scrolling && ScreenMovPos)
sxx = syy = 0;
- DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, NO_CUTTING);
+#if 0
+ if (player->Frame)
+ printf("-> %d\n", player->Frame);
+#endif
+
+ DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
if (SHIELD_ON(player))
{
- int graphic = (player->shield_active_time_left ? GFX2_SHIELD_ACTIVE :
- GFX2_SHIELD_PASSIVE);
+ int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE :
+ IMG_SHIELD_NORMAL_ACTIVE);
+ int frame = getGraphicAnimationFrame(graphic, -1);
- DrawGraphicAnimationShiftedThruMask(sx, sy, sxx, syy, graphic,
- 3, 8, ANIM_PINGPONG);
+ DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING);
}
+#if 0
if (player->Pushing && player->GfxPos)
+#else
+ if (player->Pushing && player_is_moving)
+#endif
{
int px = SCREENX(next_jx), py = SCREENY(next_jy);
- if (element == EL_SOKOBAN_FIELD_EMPTY ||
- Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
- DrawGraphicShiftedThruMask(px, py, sxx, syy, GFX_SOKOBAN_OBJEKT,
+ if ((sxx || syy) &&
+ (element == EL_SOKOBAN_FIELD_EMPTY ||
+ Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL))
+ DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0,
NO_CUTTING);
else
{
int element = Feld[next_jx][next_jy];
- int graphic = el2gfx(element);
+ int graphic = el2img(element);
+#if 1
+ int frame = 0;
+#endif
- if ((element == EL_ROCK ||
- element == EL_SP_ZONK ||
- element == EL_BD_ROCK) && sxx)
+ if ((sxx || syy) && IS_PUSHABLE(element))
{
- int phase = (player->GfxPos / (TILEX / 4));
+ graphic = el_act_dir2img(element, ACTION_MOVING, player->MovDir);
+#if 1
+ frame = getGraphicAnimationFrame(graphic, player->GfxPos);
+
+ frame = getGraphicAnimationFrame(graphic, player->Frame);
+#endif
+#if 0
+ printf("-> %d [%d]\n", player->Frame, player->GfxPos);
+#endif
+
+#if 0
+ /* !!! FIX !!! */
if (player->MovDir == MV_LEFT)
- graphic += phase;
- else
- graphic += (phase + 4) % 4;
+ frame = 3 - frame;
+#endif
+
+#if 0
+ frame = (player->GfxPos / (TILEX / 4));
+
+ if (player->MovDir == MV_RIGHT)
+ frame = (frame + 4) % 4;
+#endif
}
- DrawGraphicShifted(px, py, sxx, syy, graphic, NO_CUTTING, NO_MASKING);
+ DrawGraphicShifted(px, py, sxx, syy, graphic, frame,
+ NO_CUTTING, NO_MASKING);
}
}
if (IS_ACTIVE_BOMB(element))
{
- graphic = el2gfx(element);
+ graphic = el2img(element);
+#if 0
if (element == EL_DYNAMITE_ACTIVE)
{
- if ((phase = (96 - MovDelay[jx][jy]) / 12) > 6)
- phase = 6;
+ if ((frame = (96 - MovDelay[jx][jy]) / 12) > 6)
+ frame = 6;
}
else
{
- if ((phase = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3)
- phase = 7 - phase;
+ if ((frame = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3)
+ frame = 7 - frame;
}
+#else
+
+#if 0
+ frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[jx][jy]);
+#else
+ frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]);
+#endif
+
+#endif
if (game.emulation == EMU_SUPAPLEX)
- DrawGraphic(sx, sy, GFX_SP_DISK_RED);
+ DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame);
else
- DrawGraphicThruMask(sx, sy, graphic + phase);
+ DrawGraphicThruMask(sx, sy, graphic, frame);
}
if (player_is_moving && last_element == EL_EXPLOSION)
{
- int phase = Frame[last_jx][last_jy];
- int delay = 2;
+ int stored = Store[last_jx][last_jy];
+ int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION :
+ stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON :
+ IMG_SP_EXPLOSION);
+ int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2);
+ int phase = ExplodePhase[last_jx][last_jy] - 1;
+ int frame = getGraphicAnimationFrame(graphic, phase - delay);
- if (phase > 2)
- DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy),
- GFX_EXPLOSION + ((phase - 1) / delay - 1));
+ if (phase >= delay)
+ DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame);
}
/* draw elements that stay over the player */
/* handle the field the player is leaving ... */
if (player_is_moving && IS_OVER_PLAYER(last_element))
DrawLevelField(last_jx, last_jy);
+
/* ... and the field the player is entering */
if (IS_OVER_PLAYER(element))
DrawLevelField(jx, jy);
MarkTileDirty(sx,sy);
}
-static int getGraphicAnimationPhase(int frames, int delay, int mode)
-{
- int phase;
-
- if (mode == ANIM_PINGPONG)
- {
- int max_anim_frames = 2 * frames - 2;
-
- phase = (FrameCounter % (delay * max_anim_frames)) / delay;
- phase = (phase < frames ? phase : max_anim_frames - phase);
- }
- else
- phase = (FrameCounter % (delay * frames)) / delay;
-
- if (mode == ANIM_REVERSE)
- phase = -phase;
-
- return phase;
-}
-
-int getNewGraphicAnimationFrame(int graphic, int sync_frame)
-{
- int num_frames = new_graphic_info[graphic].anim_frames;
- int delay = new_graphic_info[graphic].anim_delay;
- int mode = new_graphic_info[graphic].anim_mode;
- int frame = 0;
-
- /* animation synchronized with global frame counter, not move position */
- if (new_graphic_info[graphic].anim_global_sync || sync_frame < 0)
- sync_frame = FrameCounter;
-
- if (mode & ANIM_LOOP) /* normal, looping animation */
- {
- frame = (sync_frame % (delay * num_frames)) / delay;
- }
- else if (mode & ANIM_LINEAR) /* normal, non-looping animation */
- {
- frame = sync_frame / delay;
-
- if (frame > num_frames - 1)
- frame = num_frames - 1;
- }
- else if (mode & ANIM_PINGPONG) /* use border frames once */
- {
- int max_anim_frames = 2 * num_frames - 2;
-
- frame = (sync_frame % (delay * max_anim_frames)) / delay;
- frame = (frame < num_frames ? frame : max_anim_frames - frame);
- }
- else if (mode & ANIM_PINGPONG2) /* use border frames twice */
- {
- int max_anim_frames = 2 * num_frames;
-
- frame = (sync_frame % (delay * max_anim_frames)) / delay;
- frame = (frame < num_frames ? frame : max_anim_frames - frame - 1);
- }
-
- if (mode & ANIM_REVERSE) /* use reverse animation direction */
- frame = num_frames - frame - 1;
-
- return frame;
-}
-
-void DrawGraphicAnimationExt(int x, int y, int graphic,
- int frames, int delay, int mode, int mask_mode)
-{
- int phase = getGraphicAnimationPhase(frames, delay, mode);
-
- if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- {
- if (mask_mode == USE_MASKING)
- DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic + phase);
- else
- DrawGraphic(SCREENX(x), SCREENY(y), graphic + phase);
- }
-}
-
-void DrawNewGraphicAnimationExt(int x, int y, int graphic, int mask_mode)
-{
- int delay = new_graphic_info[graphic].anim_delay;
-
-#if 0
- if (!(FrameCounter % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-#else
- if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
-#endif
- {
- int frame = getNewGraphicAnimationFrame(graphic, -1);
-
- if (mask_mode == USE_MASKING)
- DrawNewGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame);
- else
- DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame);
- }
-}
-
-void DrawGraphicAnimation(int x, int y, int graphic,
- int frames, int delay, int mode)
-{
- DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, NO_MASKING);
-}
-
-void DrawNewGraphicAnimation(int x, int y, int graphic)
-{
- DrawNewGraphicAnimationExt(x, y, graphic, NO_MASKING);
-}
-
-void DrawGraphicAnimationThruMask(int x, int y, int graphic,
- int frames, int delay, int mode)
-{
- DrawGraphicAnimationExt(x, y, graphic, frames, delay, mode, USE_MASKING);
-}
-
-static void DrawGraphicAnimationShiftedThruMask(int sx, int sy,
- int sxx, int syy,
- int graphic,
- int frames, int delay,
- int mode)
+void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y)
{
- int phase = getGraphicAnimationPhase(frames, delay, mode);
+ Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+ int offset_x = graphic_info[graphic].offset_x;
+ int offset_y = graphic_info[graphic].offset_y;
+ int src_x = graphic_info[graphic].src_x + frame * offset_x;
+ int src_y = graphic_info[graphic].src_y + frame * offset_y;
- DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic + phase, NO_CUTTING);
+ *bitmap = src_bitmap;
+ *x = src_x;
+ *y = src_y;
}
-void getGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
-{
- if (graphic >= 0 && graphic_info[graphic].bitmap != NULL)
- {
- *bitmap = graphic_info[graphic].bitmap;
- *x = graphic_info[graphic].src_x;
- *y = graphic_info[graphic].src_y;
- }
- else if (graphic >= GFX_START_ROCKSELEMENTS &&
- graphic <= GFX_END_ROCKSELEMENTS)
- {
- graphic -= GFX_START_ROCKSELEMENTS;
- *bitmap = pix[PIX_ELEMENTS];
- *x = (graphic % GFX_PER_LINE) * TILEX;
- *y = (graphic / GFX_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSHEROES && graphic <= GFX_END_ROCKSHEROES)
- {
- graphic -= GFX_START_ROCKSHEROES;
- *bitmap = pix[PIX_HEROES];
- *x = (graphic % HEROES_PER_LINE) * TILEX;
- *y = (graphic / HEROES_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
- {
- graphic -= GFX_START_ROCKSSP;
- *bitmap = pix[PIX_SP];
- *x = (graphic % SP_PER_LINE) * TILEX;
- *y = (graphic / SP_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
- {
- graphic -= GFX_START_ROCKSDC;
- *bitmap = pix[PIX_DC];
- *x = (graphic % DC_PER_LINE) * TILEX;
- *y = (graphic / DC_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- *bitmap = pix[PIX_MORE];
- *x = (graphic % MORE_PER_LINE) * TILEX;
- *y = (graphic / MORE_PER_LINE) * TILEY;
- }
- else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
- {
- graphic -= GFX_START_ROCKSFONT;
- *bitmap = pix[PIX_FONT_EM];
- *x = (graphic % FONT_CHARS_PER_LINE) * TILEX;
- *y = (graphic / FONT_CHARS_PER_LINE) * TILEY;
- }
- else
- {
- *bitmap = pix[PIX_SP];
- *x = 0;
- *y = 0;
- }
-}
-
-void DrawGraphic(int x, int y, int graphic)
+void DrawGraphic(int x, int y, int graphic, int frame)
{
#if DEBUG
if (!IN_SCR_FIELD(x, y))
}
#endif
- DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic);
- MarkTileDirty(x, y);
-}
-
-void DrawNewGraphic(int x, int y, int graphic, int frame)
-{
-#if DEBUG
- if (!IN_SCR_FIELD(x, y))
- {
- printf("DrawNewGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic);
- printf("DrawNewGraphic(): This should never happen!\n");
- return;
- }
-#endif
-
- DrawNewGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY,
- graphic, frame);
+ DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame);
MarkTileDirty(x, y);
}
-void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic)
+#if 0
+void DrawOldGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic)
{
Bitmap *src_bitmap;
int src_x, src_y;
- getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ getOldGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
}
+#endif
-void DrawNewGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
- int frame)
+void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic,
+ int frame)
{
- Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
- int src_x = new_graphic_info[graphic].src_x;
- int src_y = new_graphic_info[graphic].src_y;
- int offset_x = new_graphic_info[graphic].offset_x;
- int offset_y = new_graphic_info[graphic].offset_y;
+#if 1
+ Bitmap *src_bitmap;
+ int src_x, src_y;
+
+ getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
+#else
+ Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+ int src_x = graphic_info[graphic].src_x;
+ int src_y = graphic_info[graphic].src_y;
+ int offset_x = graphic_info[graphic].offset_x;
+ int offset_y = graphic_info[graphic].offset_y;
src_x += frame * offset_x;
src_y += frame * offset_y;
-
- BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
-}
-
-void DrawGraphicThruMask(int x, int y, int graphic)
-{
-#if DEBUG
- if (!IN_SCR_FIELD(x, y))
- {
- printf("DrawGraphicThruMask(): x = %d,y = %d, graphic = %d\n",x,y,graphic);
- printf("DrawGraphicThruMask(): This should never happen!\n");
- return;
- }
#endif
- DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic);
- MarkTileDirty(x, y);
+ BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y);
}
-void DrawNewGraphicThruMask(int x, int y, int graphic, int frame)
+void DrawGraphicThruMask(int x, int y, int graphic, int frame)
{
#if DEBUG
if (!IN_SCR_FIELD(x, y))
}
#endif
- DrawNewGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY,
- graphic, frame);
+ DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic,
+ frame);
MarkTileDirty(x, y);
}
-void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic)
+void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic,
+ int frame)
{
- int tile = graphic;
- int src_x, src_y;
+#if 1
Bitmap *src_bitmap;
+ int src_x, src_y;
GC drawing_gc;
- if (graphic == GFX_LEERRAUM)
- return;
-
- getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y);
drawing_gc = src_bitmap->stored_clip_gc;
-
- if (tile_clipmask[tile] != None)
- {
- SetClipMask(src_bitmap, tile_clip_gc, tile_clipmask[tile]);
- SetClipOrigin(src_bitmap, tile_clip_gc, dest_x, dest_y);
- BlitBitmapMasked(src_bitmap, d,
- src_x, src_y, TILEX, TILEY, dest_x, dest_y);
- }
- else
- {
-#if DEBUG
-#ifndef TARGET_SDL
- printf("DrawGraphicThruMask(): tile '%d' needs clipping!\n", tile);
-#endif
-#endif
-
- SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
- BlitBitmapMasked(src_bitmap, d,
- src_x, src_y, TILEX, TILEY, dest_x, dest_y);
- }
-}
-
-void DrawNewGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y,
- int graphic, int frame)
-{
- Bitmap *src_bitmap = new_graphic_info[graphic].bitmap;
+#else
GC drawing_gc = src_bitmap->stored_clip_gc;
- int src_x = new_graphic_info[graphic].src_x;
- int src_y = new_graphic_info[graphic].src_y;
- int offset_x = new_graphic_info[graphic].offset_x;
- int offset_y = new_graphic_info[graphic].offset_y;
+ Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+ int src_x = graphic_info[graphic].src_x;
+ int src_y = graphic_info[graphic].src_y;
+ int offset_x = graphic_info[graphic].offset_x;
+ int offset_y = graphic_info[graphic].offset_y;
src_x += frame * offset_x;
src_y += frame * offset_y;
+#endif
+
SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dest_x, dest_y);
}
void DrawMiniGraphic(int x, int y, int graphic)
{
- DrawMiniGraphicExt(drawto, SX + x*MINI_TILEX, SY + y*MINI_TILEY, graphic);
- MarkTileDirty(x/2, y/2);
+ DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic);
+ MarkTileDirty(x / 2, y / 2);
}
void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
{
- if (graphic >= GFX_START_ROCKSELEMENTS && graphic <= GFX_END_ROCKSELEMENTS)
- {
- graphic -= GFX_START_ROCKSELEMENTS;
- *bitmap = pix[PIX_ELEMENTS];
- *x = MINI_GFX_STARTX + (graphic % MINI_GFX_PER_LINE) * MINI_TILEX;
- *y = MINI_GFX_STARTY + (graphic / MINI_GFX_PER_LINE) * MINI_TILEY;
- }
- else if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
- {
- graphic -= GFX_START_ROCKSSP;
- *bitmap = pix[PIX_SP];
- *x = MINI_SP_STARTX + (graphic % MINI_SP_PER_LINE) * MINI_TILEX;
- *y = MINI_SP_STARTY + (graphic / MINI_SP_PER_LINE) * MINI_TILEY;
- }
- else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
- {
- graphic -= GFX_START_ROCKSDC;
- *bitmap = pix[PIX_DC];
- *x = MINI_DC_STARTX + (graphic % MINI_DC_PER_LINE) * MINI_TILEX;
- *y = MINI_DC_STARTY + (graphic / MINI_DC_PER_LINE) * MINI_TILEY;
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- *bitmap = pix[PIX_MORE];
- *x = MINI_MORE_STARTX + (graphic % MINI_MORE_PER_LINE) * MINI_TILEX;
- *y = MINI_MORE_STARTY + (graphic / MINI_MORE_PER_LINE) * MINI_TILEY;
- }
- else if (graphic >= GFX_START_ROCKSFONT && graphic <= GFX_END_ROCKSFONT)
- {
- graphic -= GFX_START_ROCKSFONT;
- *bitmap = pix[PIX_FONT_EM];
- *x = MINI_FONT_STARTX + (graphic % FONT_CHARS_PER_LINE) * FONT4_XSIZE;
- *y = MINI_FONT_STARTY + (graphic / FONT_CHARS_PER_LINE) * FONT4_YSIZE;
- }
- else
- {
- *bitmap = pix[PIX_SP];
- *x = MINI_SP_STARTX;
- *y = MINI_SP_STARTY;
- }
-}
-
-void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
-{
- Bitmap *bitmap;
- 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);
-}
-
-void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic,
- int cut_mode, int mask_mode)
-{
- int width = TILEX, height = TILEY;
- int cx = 0, cy = 0;
- int src_x, src_y, dest_x, dest_y;
- int tile = graphic;
- Bitmap *src_bitmap;
- GC drawing_gc;
-
- if (graphic < 0)
- {
- DrawGraphic(x, y, graphic);
- return;
- }
+ Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+ int mini_startx = 0;
+ int mini_starty = src_bitmap->height * 2 / 3;
+ int src_x = mini_startx + graphic_info[graphic].src_x / 2;
+ int src_y = mini_starty + graphic_info[graphic].src_y / 2;
- if (dx || dy) /* Verschiebung der Grafik? */
+#if 0
+ /* !!! not needed anymore, because of automatically created mini graphics */
+ if (src_x + MINI_TILEX > src_bitmap->width ||
+ src_y + MINI_TILEY > src_bitmap->height)
{
- 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 */
- {
- x = BX2;
- width = -dx;
- dx = TILEX + dx;
- }
- 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 */
- width -= dx;
- else if (dx) /* allg. Bewegung in x-Richtung */
- MarkTileDirty(x + SIGN(dx), y);
-
- if (y < BY1) /* Element kommt von oben ins Bild */
- {
- if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */
- return;
-
- y = BY1;
- height = dy;
- cy = TILEY - dy;
- dy = 0;
- }
- 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 */
- {
- height += dy;
- cy = -dy;
- dy = 0;
- }
- else if (dy > 0 && cut_mode == CUT_ABOVE)
- {
- 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 */
- else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW))
- height -= dy;
- else if (dy) /* allg. Bewegung in y-Richtung */
- MarkTileDirty(x, y + SIGN(dy));
- }
+ /* graphic of desired size seems not to be contained in this image;
+ dirty workaround: get it from the middle of the normal sized image */
- getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
- drawing_gc = src_bitmap->stored_clip_gc;
-
- src_x += cx;
- src_y += cy;
-
- dest_x = FX + x * TILEX + dx;
- dest_y = FY + y * TILEY + dy;
+ printf("::: using dirty workaround for %d (%d, %d)\n",
+ graphic, src_bitmap->width, src_bitmap->height);
-#if DEBUG
- if (!IN_SCR_FIELD(x,y))
- {
- printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
- printf("DrawGraphicShifted(): This should never happen!\n");
- return;
+ getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+ src_x += (TILEX / 2 - MINI_TILEX / 2);
+ src_y += (TILEY / 2 - MINI_TILEY / 2);
}
#endif
- if (mask_mode == USE_MASKING)
- {
- if (tile_clipmask[tile] != None)
- {
- SetClipMask(src_bitmap, tile_clip_gc, tile_clipmask[tile]);
- SetClipOrigin(src_bitmap, tile_clip_gc, dest_x, dest_y);
- BlitBitmapMasked(src_bitmap, drawto_field,
- src_x, src_y, TILEX, TILEY, dest_x, dest_y);
- }
- else
- {
-#if DEBUG
-#ifndef TARGET_SDL
- printf("DrawGraphicShifted(): tile '%d' needs clipping!\n", tile);
-#endif
-#endif
+ *bitmap = src_bitmap;
+ *x = src_x;
+ *y = src_y;
+}
- SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
- BlitBitmapMasked(src_bitmap, drawto_field,
- src_x, src_y, width, height, dest_x, dest_y);
- }
- }
- else
- BlitBitmap(src_bitmap, drawto_field,
- src_x, src_y, width, height, dest_x, dest_y);
+void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic)
+{
+ Bitmap *src_bitmap;
+ int src_x, src_y;
- MarkTileDirty(x,y);
+ getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y);
}
-void DrawNewGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
+void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame,
int cut_mode, int mask_mode)
{
Bitmap *src_bitmap;
if (graphic < 0)
{
- DrawNewGraphic(x, y, graphic, frame);
+ DrawGraphic(x, y, graphic, frame);
return;
}
- if (dx || dy) /* Verschiebung der Grafik? */
+ if (dx || dy) /* shifted graphic */
{
- if (x < BX1) /* Element kommt von links ins Bild */
+ if (x < BX1) /* object enters playfield from the left */
{
x = BX1;
width = dx;
cx = TILEX - dx;
dx = 0;
}
- else if (x > BX2) /* Element kommt von rechts ins Bild */
+ else if (x > BX2) /* object enters playfield from the right */
{
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) /* object leaves playfield to the left */
{
width += dx;
cx = -dx;
dx = 0;
}
- else if (x==BX2 && dx > 0) /* Element verläßt rechts das Bild */
+ else if (x==BX2 && dx > 0) /* object leaves playfield to the right */
width -= dx;
- else if (dx) /* allg. Bewegung in x-Richtung */
+ else if (dx) /* general horizontal movement */
MarkTileDirty(x + SIGN(dx), y);
- if (y < BY1) /* Element kommt von oben ins Bild */
+ if (y < BY1) /* object enters playfield from the top */
{
- if (cut_mode==CUT_BELOW) /* Element oberhalb des Bildes */
+ if (cut_mode==CUT_BELOW) /* object completely above top border */
return;
y = BY1;
cy = TILEY - dy;
dy = 0;
}
- else if (y > BY2) /* Element kommt von unten ins Bild */
+ else if (y > BY2) /* object enters playfield from the bottom */
{
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) /* object leaves playfield to the top */
{
height += dy;
cy = -dy;
}
else if (dy > 0 && cut_mode == CUT_ABOVE)
{
- if (y == BY2) /* Element unterhalb des Bildes */
+ if (y == BY2) /* object completely above bottom border */
return;
height = dy;
cy = TILEY - dy;
dy = TILEY;
MarkTileDirty(x, y + 1);
- } /* Element verläßt unten das Bild */
+ } /* object leaves playfield to the bottom */
else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW))
height -= dy;
- else if (dy) /* allg. Bewegung in y-Richtung */
+ else if (dy) /* general vertical movement */
MarkTileDirty(x, y + SIGN(dy));
}
- src_bitmap = new_graphic_info[graphic].bitmap;
- drawing_gc = src_bitmap->stored_clip_gc;
- src_x = new_graphic_info[graphic].src_x;
- src_y = new_graphic_info[graphic].src_y;
- offset_x = new_graphic_info[graphic].offset_x;
- offset_y = new_graphic_info[graphic].offset_y;
-
- src_x += frame * offset_x;
- src_y += frame * offset_y;
-
- src_x += cx;
- src_y += cy;
-
- dest_x = FX + x * TILEX + dx;
- dest_y = FY + y * TILEY + dy;
-
-#if DEBUG
- if (!IN_SCR_FIELD(x,y))
- {
- printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
- printf("DrawGraphicShifted(): This should never happen!\n");
- return;
- }
-#endif
-
- if (mask_mode == USE_MASKING)
- SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
-
- BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
- dest_x, dest_y);
-
- MarkTileDirty(x,y);
-}
-
-void DrawGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
- int cut_mode)
-{
- DrawGraphicShifted(x,y, dx,dy, graphic, cut_mode, USE_MASKING);
-}
-
-void DrawNewGraphicShiftedThruMask(int x,int y, int dx,int dy, int graphic,
- int frame, int cut_mode)
-{
- DrawNewGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
-}
-
-void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
- int cut_mode, int mask_mode)
-{
- int ux = LEVELX(x), uy = LEVELY(y);
- int graphic = el2gfx(element);
- int phase8 = ABS(MovPos[ux][uy]) / (TILEX / 8);
- int phase4 = phase8 / 2;
- int phase2 = phase8 / 4;
- int dir = MovDir[ux][uy];
-
- if (element == EL_PACMAN || element == EL_BUG || element == EL_SPACESHIP)
- {
- graphic += 1 * !phase2;
-
- if (dir == MV_UP)
- graphic += 1 * 2;
- else if (dir == MV_LEFT)
- graphic += 2 * 2;
- else if (dir == MV_DOWN)
- graphic += 3 * 2;
- }
- else if (element == EL_SP_SNIKSNAK)
- {
- if (dir == MV_LEFT)
- graphic = GFX_SP_SNIKSNAK_LEFT;
- else if (dir == MV_RIGHT)
- graphic = GFX_SP_SNIKSNAK_RIGHT;
- else if (dir == MV_UP)
- graphic = GFX_SP_SNIKSNAK_UP;
- else
- graphic = GFX_SP_SNIKSNAK_DOWN;
-
- graphic += (phase8 < 4 ? phase8 : 7 - phase8);
- }
- else if (element == EL_SP_ELECTRON)
- {
- graphic = GFX2_SP_ELECTRON + getGraphicAnimationPhase(8, 2, ANIM_LOOP);
- }
- else if (element == EL_MOLE || element == EL_PENGUIN ||
- element == EL_PIG || element == EL_DRAGON)
- {
- if (dir == MV_LEFT)
- graphic = (element == EL_MOLE ? GFX_MOLE_LEFT :
- element == EL_PENGUIN ? GFX_PINGUIN_LEFT :
- element == EL_PIG ? GFX_SCHWEIN_LEFT : GFX_DRACHE_LEFT);
- else if (dir == MV_RIGHT)
- graphic = (element == EL_MOLE ? GFX_MOLE_RIGHT :
- element == EL_PENGUIN ? GFX_PINGUIN_RIGHT :
- element == EL_PIG ? GFX_SCHWEIN_RIGHT : GFX_DRACHE_RIGHT);
- else if (dir == MV_UP)
- graphic = (element == EL_MOLE ? GFX_MOLE_UP :
- element == EL_PENGUIN ? GFX_PINGUIN_UP :
- element == EL_PIG ? GFX_SCHWEIN_UP : GFX_DRACHE_UP);
- else
- graphic = (element == EL_MOLE ? GFX_MOLE_DOWN :
- element == EL_PENGUIN ? GFX_PINGUIN_DOWN :
- element == EL_PIG ? GFX_SCHWEIN_DOWN : GFX_DRACHE_DOWN);
+ src_bitmap = graphic_info[graphic].bitmap;
+ src_x = graphic_info[graphic].src_x;
+ src_y = graphic_info[graphic].src_y;
+ offset_x = graphic_info[graphic].offset_x;
+ offset_y = graphic_info[graphic].offset_y;
- graphic += phase4;
- }
- else if (element == EL_SATELLITE)
- {
- graphic = GFX_SONDE_START + getGraphicAnimationPhase(8, 2, ANIM_LOOP);
- }
- else if (element == EL_ACID)
- {
- graphic = GFX_GEBLUBBER + getGraphicAnimationPhase(4, 10, ANIM_LOOP);
- }
- else if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
- {
- graphic += !phase2;
- }
- else if (element == EL_BALLOON)
- {
- graphic += phase4;
- }
- else if ((element == EL_ROCK ||
- element == EL_SP_ZONK ||
- element == EL_BD_ROCK ||
- element == EL_SP_INFOTRON ||
- IS_GEM(element))
- && !cut_mode)
- {
- if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
- {
- if (element == EL_ROCK ||
- element == EL_SP_ZONK ||
- element == EL_BD_ROCK)
- {
- if (dir == MV_LEFT)
- graphic += (4 - phase4) % 4;
- else if (dir == MV_RIGHT)
- graphic += phase4;
- else
- graphic += phase2 * 2;
- }
- else if (element != EL_SP_INFOTRON)
- graphic += phase2;
- }
- }
- else if (element == EL_MAGIC_WALL_ACTIVE ||
- element == EL_MAGIC_WALL_EMPTYING ||
- element == EL_BD_MAGIC_WALL_ACTIVE ||
- element == EL_BD_MAGIC_WALL_EMPTYING ||
- element == EL_MAGIC_WALL_FULL ||
- element == EL_BD_MAGIC_WALL_FULL)
- {
- graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
- }
- else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
- {
- graphic = (element == EL_AMOEBA_DEAD ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
- graphic += (x + 2 * y + 4) % 4;
- }
- else if (element == EL_WALL_GROWING)
- {
- boolean links_massiv = FALSE, rechts_massiv = FALSE;
+ drawing_gc = src_bitmap->stored_clip_gc;
- if (!IN_LEV_FIELD(ux-1, uy) || IS_MAUER(Feld[ux-1][uy]))
- links_massiv = TRUE;
- if (!IN_LEV_FIELD(ux+1, uy) || IS_MAUER(Feld[ux+1][uy]))
- rechts_massiv = TRUE;
+ src_x += frame * offset_x;
+ src_y += frame * offset_y;
- if (links_massiv && rechts_massiv)
- graphic = GFX_MAUERWERK;
- else if (links_massiv)
- graphic = GFX_MAUER_R;
- else if (rechts_massiv)
- graphic = GFX_MAUER_L;
- }
-#if 0
- else if ((element == EL_INVISIBLE_STEELWALL ||
- element == EL_INVISIBLE_WALL ||
- element == EL_INVISIBLE_SAND) && game.light_time_left)
+ src_x += cx;
+ src_y += cy;
+
+ dest_x = FX + x * TILEX + dx;
+ dest_y = FY + y * TILEY + dy;
+
+#if DEBUG
+ if (!IN_SCR_FIELD(x,y))
{
- graphic = (element == EL_INVISIBLE_STEELWALL ? GFX_INVISIBLE_STEEL_ON :
- element == EL_INVISIBLE_WALL ? GFX_UNSICHTBAR_ON :
- GFX_SAND_INVISIBLE_ON);
+ printf("DrawGraphicShifted(): x = %d, y = %d, graphic = %d\n",x,y,graphic);
+ printf("DrawGraphicShifted(): This should never happen!\n");
+ return;
}
#endif
- if (dx || dy)
- DrawGraphicShifted(x, y, dx, dy, graphic, cut_mode, mask_mode);
- else if (mask_mode == USE_MASKING)
- DrawGraphicThruMask(x, y, graphic);
+ if (mask_mode == USE_MASKING)
+ {
+ SetClipOrigin(src_bitmap, drawing_gc, dest_x - src_x, dest_y - src_y);
+ BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height,
+ dest_x, dest_y);
+ }
else
- DrawGraphic(x, y, graphic);
-}
-
-inline static int getFramePosition(int x, int y)
-{
- int element = Feld[x][y];
- int frame_pos = -1;
+ BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height,
+ dest_x, dest_y);
- if (element == EL_QUICKSAND_FULL ||
- element == EL_MAGIC_WALL_FULL ||
- element == EL_BD_MAGIC_WALL_FULL)
- frame_pos = -1;
- else if (IS_MOVING(x, y) || CAN_MOVE(element) || CAN_FALL(element))
- frame_pos = ABS(MovPos[x][y]) / (TILEX / 8);
-
- return frame_pos;
+ MarkTileDirty(x,y);
}
-inline static int getGfxAction(int x, int y)
+void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic,
+ int frame, int cut_mode)
{
- int gfx_action = GFX_ACTION_DEFAULT;
-
- if (GfxAction[x][y] != GFX_ACTION_DEFAULT)
- gfx_action = GfxAction[x][y];
- else if (IS_MOVING(x, y))
- gfx_action = GFX_ACTION_MOVING;
-
- return gfx_action;
+ DrawGraphicShifted(x,y, dx,dy, graphic, frame, cut_mode, USE_MASKING);
}
-void DrawNewScreenElementExt(int x, int y, int dx, int dy, int element,
+void DrawScreenElementExt(int x, int y, int dx, int dy, int element,
int cut_mode, int mask_mode)
{
- int ux = LEVELX(x), uy = LEVELY(y);
- int move_dir = MovDir[ux][uy];
- int move_pos = getFramePosition(ux, uy);
- int gfx_action = getGfxAction(ux, uy);
- int graphic = el_dir_act2img(element, move_dir, gfx_action);
- int frame = getNewGraphicAnimationFrame(graphic, move_pos);
+ int lx = LEVELX(x), ly = LEVELY(y);
+ int graphic;
+ int frame;
+
+ if (IN_LEV_FIELD(lx, ly))
+ {
+ SetRandomAnimationValue(lx, ly);
+
+ graphic = el_act_dir2img(element, GfxAction[lx][ly], MovDir[lx][ly]);
+ frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]);
+ }
+ else /* border element */
+ {
+ graphic = el2img(element);
+ frame = getGraphicAnimationFrame(graphic, -1);
+ }
if (element == EL_WALL_GROWING)
{
boolean left_stopped = FALSE, right_stopped = FALSE;
- if (!IN_LEV_FIELD(ux - 1, uy) || IS_MAUER(Feld[ux - 1][uy]))
+ if (!IN_LEV_FIELD(lx - 1, ly) || IS_MAUER(Feld[lx - 1][ly]))
left_stopped = TRUE;
- if (!IN_LEV_FIELD(ux + 1, uy) || IS_MAUER(Feld[ux + 1][uy]))
+ if (!IN_LEV_FIELD(lx + 1, ly) || IS_MAUER(Feld[lx + 1][ly]))
right_stopped = TRUE;
if (left_stopped && right_stopped)
graphic = IMG_WALL;
else if (left_stopped)
+ {
graphic = IMG_WALL_GROWING_ACTIVE_RIGHT;
+ frame = graphic_info[graphic].anim_frames - 1;
+ }
else if (right_stopped)
- graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
- }
-#if 0
- else if ((element == EL_ROCK ||
- element == EL_SP_ZONK ||
- element == EL_BD_ROCK ||
- element == EL_SP_INFOTRON ||
- IS_GEM(element))
- && !cut_mode)
- {
- if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
{
- if (element == EL_ROCK ||
- element == EL_SP_ZONK ||
- element == EL_BD_ROCK)
- {
- if (move_dir == MV_LEFT)
- graphic += (4 - phase4) % 4;
- else if (move_dir == MV_RIGHT)
- graphic += phase4;
- else
- graphic += phase2 * 2;
- }
- else if (element != EL_SP_INFOTRON)
- graphic += phase2;
+ graphic = IMG_WALL_GROWING_ACTIVE_LEFT;
+ frame = graphic_info[graphic].anim_frames - 1;
}
}
-#endif
+#if 0
else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
{
graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 :
graphic += (x + 2 * y + 4) % 4;
}
+#endif
+
+#if 0
+ if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
+ {
+ if (Feld[lx][ly] == EL_AMOEBA_DRIPPING)
+ printf("---> %d -> %d / %d [%d]\n",
+ element, graphic, frame, GfxRandom[lx][ly]);
+ }
+#endif
if (dx || dy)
- DrawNewGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
+ DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode);
else if (mask_mode == USE_MASKING)
- DrawNewGraphicThruMask(x, y, graphic, frame);
+ DrawGraphicThruMask(x, y, graphic, frame);
else
- DrawNewGraphic(x, y, graphic, frame);
+ DrawGraphic(x, y, graphic, frame);
}
void DrawLevelElementExt(int x, int y, int dx, int dy, int element,
cut_mode, mask_mode);
}
-void DrawNewLevelElementExt(int x, int y, int dx, int dy, int element,
- int cut_mode, int mask_mode)
-{
- if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawNewScreenElementExt(SCREENX(x), SCREENY(y), dx, dy, element,
- cut_mode, mask_mode);
-}
-
void DrawScreenElementShifted(int x, int y, int dx, int dy, int element,
int cut_mode)
{
DrawScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
}
-void DrawNewScreenElementShifted(int x, int y, int dx, int dy, int element,
- int cut_mode)
-{
- DrawNewScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
-}
-
void DrawLevelElementShifted(int x, int y, int dx, int dy, int element,
int cut_mode)
{
DrawLevelElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
}
-void DrawNewLevelElementShifted(int x, int y, int dx, int dy, int element,
- int cut_mode)
+#if 0
+void DrawOldScreenElementThruMask(int x, int y, int element)
{
- DrawNewLevelElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING);
+ DrawOldScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
}
void DrawScreenElementThruMask(int x, int y, int element)
{
DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
}
-
-void DrawNewScreenElementThruMask(int x, int y, int element)
-{
- DrawNewScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
+#endif
void DrawLevelElementThruMask(int x, int y, int element)
{
DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
}
-void DrawNewLevelElementThruMask(int x, int y, int element)
-{
- DrawNewLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING);
-}
-
void DrawLevelFieldThruMask(int x, int y)
{
DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
}
-void DrawNewLevelFieldThruMask(int x, int y)
-{
- DrawNewLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING);
-}
-
-void ErdreichAnbroeckeln(int x, int y)
+void DrawCrumbledSand(int x, int y)
{
Bitmap *src_bitmap;
int src_x, src_y;
int i, width, height, cx,cy;
- int ux = LEVELX(x), uy = LEVELY(y);
+ int lx = LEVELX(x), ly = LEVELY(y);
int element, graphic;
int snip = 4;
static int xy[4][2] =
{ 0, +1 }
};
- if (!IN_LEV_FIELD(ux, uy))
+ if (!IN_LEV_FIELD(lx, ly))
return;
- element = Feld[ux][uy];
+ element = Feld[lx][ly];
if (element == EL_SAND ||
element == EL_LANDMINE ||
if (!IN_SCR_FIELD(x, y))
return;
- graphic = GFX_ERDENRAND;
+ graphic = IMG_SAND_CRUMBLED;
- getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ src_bitmap = graphic_info[graphic].bitmap;
+ src_x = graphic_info[graphic].src_x;
+ src_y = graphic_info[graphic].src_y;
for(i=0; i<4; i++)
{
- int uxx, uyy;
+ int lxx, lyy;
- uxx = ux + xy[i][0];
- uyy = uy + xy[i][1];
- if (!IN_LEV_FIELD(uxx, uyy))
+ lxx = lx + xy[i][0];
+ lyy = ly + xy[i][1];
+ if (!IN_LEV_FIELD(lxx, lyy))
element = EL_STEELWALL;
else
- element = Feld[uxx][uyy];
+ element = Feld[lxx][lyy];
if (element == EL_SAND ||
element == EL_LANDMINE ||
}
else
{
- graphic = GFX_ERDENRAND;
+ graphic = IMG_SAND_CRUMBLED;
- getGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ src_bitmap = graphic_info[graphic].bitmap;
+ src_x = graphic_info[graphic].src_x;
+ src_y = graphic_info[graphic].src_y;
for(i=0; i<4; i++)
{
- int xx, yy, uxx, uyy;
+ int xx, yy, lxx, lyy;
xx = x + xy[i][0];
yy = y + xy[i][1];
- uxx = ux + xy[i][0];
- uyy = uy + xy[i][1];
-
- if (!IN_LEV_FIELD(uxx, uyy) ||
- (Feld[uxx][uyy] != EL_SAND &&
- Feld[uxx][uyy] != EL_LANDMINE &&
- Feld[uxx][uyy] != EL_TRAP &&
- Feld[uxx][uyy] != EL_TRAP_ACTIVE) ||
+ lxx = lx + xy[i][0];
+ lyy = ly + xy[i][1];
+
+ if (!IN_LEV_FIELD(lxx, lyy) ||
+ (Feld[lxx][lyy] != EL_SAND &&
+ Feld[lxx][lyy] != EL_LANDMINE &&
+ Feld[lxx][lyy] != EL_TRAP &&
+ Feld[lxx][lyy] != EL_TRAP_ACTIVE) ||
!IN_SCR_FIELD(xx, yy))
continue;
}
}
-void DrawScreenElement(int x, int y, int element)
+static int getBorderElement(int x, int y)
{
- DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
- ErdreichAnbroeckeln(x, y);
+ int border[7][2] =
+ {
+ { EL_STEELWALL_TOPLEFT, EL_INVISIBLE_STEELWALL_TOPLEFT },
+ { EL_STEELWALL_TOPRIGHT, EL_INVISIBLE_STEELWALL_TOPRIGHT },
+ { EL_STEELWALL_BOTTOMLEFT, EL_INVISIBLE_STEELWALL_BOTTOMLEFT },
+ { EL_STEELWALL_BOTTOMRIGHT, EL_INVISIBLE_STEELWALL_BOTTOMRIGHT },
+ { EL_STEELWALL_VERTICAL, EL_INVISIBLE_STEELWALL_VERTICAL },
+ { EL_STEELWALL_HORIZONTAL, EL_INVISIBLE_STEELWALL_HORIZONTAL },
+ { EL_STEELWALL, EL_INVISIBLE_STEELWALL }
+ };
+ int steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
+ int steel_position = (x == -1 && y == -1 ? 0 :
+ x == lev_fieldx && y == -1 ? 1 :
+ x == -1 && y == lev_fieldy ? 2 :
+ x == lev_fieldx && y == lev_fieldy ? 3 :
+ x == -1 || x == lev_fieldx ? 4 :
+ y == -1 || y == lev_fieldy ? 5 : 6);
+
+ return border[steel_position][steel_type];
}
-void DrawNewScreenElement(int x, int y, int element)
+void DrawScreenElement(int x, int y, int element)
{
- DrawNewScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
- ErdreichAnbroeckeln(x, y);
+ DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING);
+ DrawCrumbledSand(x, y);
}
void DrawLevelElement(int x, int y, int element)
DrawScreenElement(SCREENX(x), SCREENY(y), element);
}
-void DrawNewLevelElement(int x, int y, int element)
-{
- if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawNewScreenElement(SCREENX(x), SCREENY(y), element);
-}
-
void DrawScreenField(int x, int y)
{
- int ux = LEVELX(x), uy = LEVELY(y);
+ int lx = LEVELX(x), ly = LEVELY(y);
int element, content;
- if (!IN_LEV_FIELD(ux, uy))
+ if (!IN_LEV_FIELD(lx, ly))
{
- if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
+ if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy)
element = EL_EMPTY;
else
- element = BorderElement;
+ element = getBorderElement(lx, ly);
DrawScreenElement(x, y, element);
return;
}
- element = Feld[ux][uy];
- content = Store[ux][uy];
+ element = Feld[lx][ly];
+ content = Store[lx][ly];
- if (IS_MOVING(ux, uy))
+ if (IS_MOVING(lx, ly))
{
- int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT);
+ int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT);
boolean cut_mode = NO_CUTTING;
if (element == EL_QUICKSAND_EMPTYING ||
DrawScreenElement(x, y, EL_EMPTY);
if (horiz_move)
- DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
+ DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING);
else if (cut_mode == NO_CUTTING)
- DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
+ DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], element, cut_mode);
else
- DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
+ DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode);
if (content == EL_ACID)
- DrawLevelElementThruMask(ux, uy + 1, EL_ACID);
+ DrawLevelElementThruMask(lx, ly + 1, EL_ACID);
}
- else if (IS_BLOCKED(ux, uy))
+ else if (IS_BLOCKED(lx, ly))
{
int oldx, oldy;
int sx, sy;
boolean cut_mode = NO_CUTTING;
int element_old, content_old;
- Blocked2Moving(ux, uy, &oldx, &oldy);
+ Blocked2Moving(lx, ly, &oldx, &oldy);
sx = SCREENX(oldx);
sy = SCREENY(oldy);
horiz_move = (MovDir[oldx][oldy] == MV_LEFT ||
DrawScreenElement(x, y, EL_EMPTY);
}
-void DrawNewScreenField(int x, int y)
-{
- int ux = LEVELX(x), uy = LEVELY(y);
- int element, content;
-
- if (!IN_LEV_FIELD(ux, uy))
- {
- if (ux < -1 || ux > lev_fieldx || uy < -1 || uy > lev_fieldy)
- element = EL_EMPTY;
- else
- element = BorderElement;
-
- DrawNewScreenElement(x, y, element);
- return;
- }
-
- element = Feld[ux][uy];
- content = Store[ux][uy];
-
- if (IS_MOVING(ux, uy))
- {
- int horiz_move = (MovDir[ux][uy] == MV_LEFT || MovDir[ux][uy] == MV_RIGHT);
- boolean cut_mode = NO_CUTTING;
-
- if (element == EL_QUICKSAND_EMPTYING ||
- element == EL_MAGIC_WALL_EMPTYING ||
- element == EL_BD_MAGIC_WALL_EMPTYING ||
- element == EL_AMOEBA_DRIPPING)
- cut_mode = CUT_ABOVE;
- else if (element == EL_QUICKSAND_FILLING ||
- element == EL_MAGIC_WALL_FILLING ||
- element == EL_BD_MAGIC_WALL_FILLING)
- cut_mode = CUT_BELOW;
-
- if (cut_mode == CUT_ABOVE)
- DrawNewScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
- else
- DrawNewScreenElement(x, y, EL_EMPTY);
-
- if (horiz_move)
- DrawNewScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
- else if (cut_mode == NO_CUTTING)
- DrawNewScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
- else
- DrawNewScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
-
- if (content == EL_ACID)
- DrawNewLevelElementThruMask(ux, uy + 1, EL_ACID);
- }
- else if (IS_BLOCKED(ux, uy))
- {
- int oldx, oldy;
- int sx, sy;
- int horiz_move;
- boolean cut_mode = NO_CUTTING;
- int element_old, content_old;
-
- Blocked2Moving(ux, uy, &oldx, &oldy);
- sx = SCREENX(oldx);
- sy = SCREENY(oldy);
- horiz_move = (MovDir[oldx][oldy] == MV_LEFT ||
- MovDir[oldx][oldy] == MV_RIGHT);
-
- element_old = Feld[oldx][oldy];
- content_old = Store[oldx][oldy];
-
- if (element_old == EL_QUICKSAND_EMPTYING ||
- element_old == EL_MAGIC_WALL_EMPTYING ||
- element_old == EL_BD_MAGIC_WALL_EMPTYING ||
- element_old == EL_AMOEBA_DRIPPING)
- cut_mode = CUT_ABOVE;
-
- DrawNewScreenElement(x, y, EL_EMPTY);
-
- if (horiz_move)
- DrawNewScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
- NO_CUTTING);
- else if (cut_mode == NO_CUTTING)
- DrawNewScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
- cut_mode);
- else
- DrawNewScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
- cut_mode);
- }
- else if (IS_DRAWABLE(element))
- DrawNewScreenElement(x, y, element);
- else
- DrawNewScreenElement(x, y, EL_EMPTY);
-}
-
void DrawLevelField(int x, int y)
{
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
}
}
-void DrawNewLevelField(int x, int y)
-{
- if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawNewScreenField(SCREENX(x), SCREENY(y));
- else if (IS_MOVING(x, y))
- {
- int newx,newy;
-
- Moving2Blocked(x, y, &newx, &newy);
- if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
- DrawNewScreenField(SCREENX(newx), SCREENY(newy));
- }
- else if (IS_BLOCKED(x, y))
- {
- int oldx, oldy;
-
- Blocked2Moving(x, y, &oldx, &oldy);
- if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy)))
- DrawNewScreenField(SCREENX(oldx), SCREENY(oldy));
- }
-}
-
void DrawMiniElement(int x, int y, int element)
{
int graphic;
- if (!element)
- {
- DrawMiniGraphic(x, y, -1);
- return;
- }
-
- graphic = el2gfx(element);
+ graphic = el2edimg(element);
DrawMiniGraphic(x, y, graphic);
}
else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy)
DrawMiniElement(sx, sy, Feld[x][y]);
else
- {
- int steel_type, steel_position;
- int border[6][2] =
- {
- { GFX_VSTEEL_UPPER_LEFT, GFX_ISTEEL_UPPER_LEFT },
- { GFX_VSTEEL_UPPER_RIGHT, GFX_ISTEEL_UPPER_RIGHT },
- { GFX_VSTEEL_LOWER_LEFT, GFX_ISTEEL_LOWER_LEFT },
- { GFX_VSTEEL_LOWER_RIGHT, GFX_ISTEEL_LOWER_RIGHT },
- { GFX_VSTEEL_VERTICAL, GFX_ISTEEL_VERTICAL },
- { GFX_VSTEEL_HORIZONTAL, GFX_ISTEEL_HORIZONTAL }
- };
+ DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y)));
+}
+
+void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y)
+{
+ Bitmap *src_bitmap = graphic_info[graphic].bitmap;
+ int mini_startx = src_bitmap->width * 3 / 4;
+ int mini_starty = src_bitmap->height * 2 / 3;
+ int src_x = mini_startx + graphic_info[graphic].src_x / 8;
+ int src_y = mini_starty + graphic_info[graphic].src_y / 8;
- steel_type = (BorderElement == EL_STEELWALL ? 0 : 1);
- steel_position = (x == -1 && y == -1 ? 0 :
- x == lev_fieldx && y == -1 ? 1 :
- x == -1 && y == lev_fieldy ? 2 :
- x == lev_fieldx && y == lev_fieldy ? 3 :
- x == -1 || x == lev_fieldx ? 4 :
- y == -1 || y == lev_fieldy ? 5 : -1);
+ if (src_x + MICRO_TILEX > src_bitmap->width ||
+ src_y + MICRO_TILEY > src_bitmap->height)
+ {
+ /* graphic of desired size seems not to be contained in this image;
+ dirty workaround: get it from the middle of the normal sized image */
- if (steel_position != -1)
- DrawMiniGraphic(sx, sy, border[steel_position][steel_type]);
+ getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y);
+ src_x += (TILEX / 2 - MICRO_TILEX / 2);
+ src_y += (TILEY / 2 - MICRO_TILEY / 2);
}
+
+ *bitmap = src_bitmap;
+ *x = src_x;
+ *y = src_y;
}
void DrawMicroElement(int xpos, int ypos, int element)
{
- int graphic;
-
- if (element == EL_EMPTY)
- return;
-
- graphic = el2gfx(element);
+ Bitmap *src_bitmap;
+ int src_x, src_y;
+ int graphic = el2preimg(element);
- if (graphic >= GFX_START_ROCKSSP && graphic <= GFX_END_ROCKSSP)
- {
- graphic -= GFX_START_ROCKSSP;
- BlitBitmap(pix[PIX_SP], drawto,
- MICRO_SP_STARTX + (graphic % MICRO_SP_PER_LINE) * MICRO_TILEX,
- MICRO_SP_STARTY + (graphic / MICRO_SP_PER_LINE) * MICRO_TILEY,
- MICRO_TILEX, MICRO_TILEY, xpos, ypos);
- }
- else if (graphic >= GFX_START_ROCKSDC && graphic <= GFX_END_ROCKSDC)
- {
- graphic -= GFX_START_ROCKSDC;
- BlitBitmap(pix[PIX_DC], drawto,
- MICRO_DC_STARTX + (graphic % MICRO_DC_PER_LINE) * MICRO_TILEX,
- MICRO_DC_STARTY + (graphic / MICRO_DC_PER_LINE) * MICRO_TILEY,
- MICRO_TILEX, MICRO_TILEY, xpos, ypos);
- }
- else if (graphic >= GFX_START_ROCKSMORE && graphic <= GFX_END_ROCKSMORE)
- {
- graphic -= GFX_START_ROCKSMORE;
- BlitBitmap(pix[PIX_MORE], drawto,
- MICRO_MORE_STARTX + (graphic % MICRO_MORE_PER_LINE)*MICRO_TILEX,
- MICRO_MORE_STARTY + (graphic / MICRO_MORE_PER_LINE)*MICRO_TILEY,
- MICRO_TILEX, MICRO_TILEY, xpos, ypos);
- }
- else if (graphic >= GFX_CHAR_START && graphic <= GFX_CHAR_END)
- {
- graphic -= GFX_CHAR_START;
- BlitBitmap(pix[PIX_FONT_EM], drawto,
- MICRO_FONT_STARTX + (graphic % MICRO_GFX_PER_LINE)* MICRO_TILEX,
- MICRO_FONT_STARTY + (graphic / MICRO_GFX_PER_LINE)* MICRO_TILEY,
- MICRO_TILEX, MICRO_TILEY, xpos, ypos);
- }
- else
- BlitBitmap(pix[PIX_ELEMENTS], drawto,
- MICRO_GFX_STARTX + (graphic % MICRO_GFX_PER_LINE) * MICRO_TILEX,
- MICRO_GFX_STARTY + (graphic / MICRO_GFX_PER_LINE) * MICRO_TILEY,
- MICRO_TILEX, MICRO_TILEY, xpos, ypos);
+ getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y);
+ BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY,
+ xpos, ypos);
}
void DrawLevel()
{
int x,y;
+ SetDrawBackgroundMask(REDRAW_NONE);
ClearWindow();
for(x=BX1; x<=BX2; x++)
{
int x, y;
- ClearRectangle(drawto, xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
+ DrawBackground(xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE);
if (lev_fieldx < STD_LEV_FIELDX)
xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX;
if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy)
DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
Ur[lx][ly]);
- else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1)
+ else if (lx >= -1 && lx < lev_fieldx+1 && ly >= -1 && ly < lev_fieldy+1
+ && BorderElement != EL_EMPTY)
DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY,
- BorderElement);
+ getBorderElement(lx, ly));
}
}
{
char label_text[MAX_MICROLABEL_SIZE + 1];
- ClearRectangle(drawto, SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
+ DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE);
strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name :
mode == MICROLABEL_CREATED_BY ? "created by" :
CloseDoor(DOOR_CLOSE_1);
/* save old door content */
- BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+ BlitBitmap(bitmap_db_door, bitmap_db_door,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE,
DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1);
+ SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+
/* clear door drawing field */
- ClearRectangle(drawto, DX, DY, DXSIZE, DYSIZE);
+ DrawBackground(DX, DY, DXSIZE, DYSIZE);
/* write text for request */
for(ty=0; ty < MAX_REQUEST_LINES; ty++)
strncpy(text_line, text, tl);
text_line[tl] = 0;
- DrawTextExt(drawto, DX + 50 - (tl * 14)/2, DY + 8 + ty * 16,
- text_line, FS_SMALL, FC_YELLOW);
+ DrawText(DX + 50 - (tl * 14)/2, DY + 8 + ty * 16,
+ text_line, FS_SMALL, FC_YELLOW);
text += tl + (tc == ' ' ? 1 : 0);
}
}
/* copy request gadgets to door backbuffer */
- BlitBitmap(drawto, pix[PIX_DB_DOOR],
+ BlitBitmap(drawto, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
#endif
if (!(req_state & REQUEST_WAIT_FOR))
- return(FALSE);
+ {
+ SetDrawBackgroundMask(REDRAW_FIELD);
+
+ return FALSE;
+ }
if (game_status != MAINMENU)
InitAnimation();
request_gadget_id = -1;
+ SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1);
+
while(result < 0)
{
if (PendingEvent())
if (!(req_state & REQ_STAY_CLOSED) && (old_door_state & DOOR_OPEN_1))
{
- BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+ BlitBitmap(bitmap_db_door, bitmap_db_door,
DOOR_GFX_PAGEX2,DOOR_GFX_PAGEY1, DXSIZE,DYSIZE,
DOOR_GFX_PAGEX1,DOOR_GFX_PAGEY1);
OpenDoor(DOOR_OPEN_1);
RemapAllGadgets();
+ SetDrawBackgroundMask(REDRAW_FIELD);
+
#if defined(PLATFORM_UNIX)
/* continue network game after request */
if (options.network &&
SendToServer_ContinuePlaying();
#endif
- return(result);
+ return result;
}
unsigned int OpenDoor(unsigned int door_state)
if (door_state & DOOR_COPY_BACK)
{
- BlitBitmap(pix[PIX_DB_DOOR], pix[PIX_DB_DOOR],
+ BlitBitmap(bitmap_db_door, bitmap_db_door,
DOOR_GFX_PAGEX2, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE + VYSIZE,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
door_state &= ~DOOR_COPY_BACK;
{
unsigned int new_door_state;
- BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+ BlitBitmap(backbuffer, bitmap_db_door,
DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1);
- BlitBitmap(backbuffer, pix[PIX_DB_DOOR],
+ BlitBitmap(backbuffer, bitmap_db_door,
VX, VY, VXSIZE, VYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2);
new_door_state = MoveDoor(door_state);
{
stepsize = 20;
door_delay_value = 0;
+
StopSound(SND_MENU_DOOR_OPENING);
StopSound(SND_MENU_DOOR_CLOSING);
}
+ if (global.autoplay_leveldir)
+ {
+ door_state |= DOOR_NO_DELAY;
+ door_state &= ~DOOR_CLOSE_ALL;
+ }
+
if (door_state & DOOR_ACTION)
{
if (!(door_state & DOOR_NO_DELAY))
for(x=start; x<=DXSIZE; x+=stepsize)
{
- Bitmap *bitmap = pix[PIX_DOOR];
+ Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
GC gc = bitmap->stored_clip_gc;
- WaitUntilDelayReached(&door_delay, door_delay_value);
+ if (!(door_state & DOOR_NO_DELAY))
+ WaitUntilDelayReached(&door_delay, door_delay_value);
if (door_state & DOOR_ACTION_1)
{
int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x);
int j = (DXSIZE - i) / 3;
- BlitBitmap(pix[PIX_DB_DOOR], drawto,
+ BlitBitmap(bitmap_db_door, drawto,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i/2,
DXSIZE,DYSIZE - i/2, DX, DY);
int i = (door_state & DOOR_OPEN_2 ? VXSIZE - x : x);
int j = (VXSIZE - i) / 3;
- BlitBitmap(pix[PIX_DB_DOOR], drawto,
+ BlitBitmap(bitmap_db_door, drawto,
DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i/2,
VXSIZE, VYSIZE - i/2, VX, VY);
void DrawSpecialEditorDoor()
{
/* draw bigger toolbox window */
- BlitBitmap(pix[PIX_DOOR], drawto,
- DOOR_GFX_PAGEX7, 0, 108, 56, EX - 4, EY - 12);
+ BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto,
+ DOOR_GFX_PAGEX7, 0, EXSIZE + 8, 8,
+ EX - 4, EY - 12);
+ BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
+ EX - 4, VY - 4, EXSIZE + 8, EYSIZE - VYSIZE + 4,
+ EX - 4, EY - 4);
redraw_mask |= REDRAW_ALL;
}
void UndrawSpecialEditorDoor()
{
/* draw normal tape recorder window */
- BlitBitmap(pix[PIX_BACK], drawto,
- 562, 344, 108, 56, EX - 4, EY - 12);
+ BlitBitmap(graphic_info[IMG_GLOBAL_BORDER].bitmap, drawto,
+ EX - 4, EY - 12, EXSIZE + 8, EYSIZE - VYSIZE + 12,
+ EX - 4, EY - 12);
redraw_mask |= REDRAW_ALL;
}
for (i=0; i<NUM_TOOL_BUTTONS; i++)
{
- Bitmap *gd_bitmap = pix[PIX_DOOR];
+ Bitmap *gd_bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap;
Bitmap *deco_bitmap = None;
int deco_x = 0, deco_y = 0, deco_xpos = 0, deco_ypos = 0;
struct GadgetInfo *gi;
if (id >= TOOL_CTRL_ID_PLAYER_1 && id <= TOOL_CTRL_ID_PLAYER_4)
{
- getMiniGraphicSource(GFX_SPIELER1 + id - TOOL_CTRL_ID_PLAYER_1,
+ int player_nr = id - TOOL_CTRL_ID_PLAYER_1;
+
+ getMiniGraphicSource(PLAYER_NR_GFX(IMG_PLAYER1, player_nr),
&deco_bitmap, &deco_x, &deco_y);
deco_xpos = (toolbutton_info[i].width - MINI_TILEX) / 2;
deco_ypos = (toolbutton_info[i].height - MINI_TILEY) / 2;
}
}
+void FreeToolButtons()
+{
+ int i;
+
+ for (i=0; i<NUM_TOOL_BUTTONS; i++)
+ FreeGadget(tool_gadget[i]);
+}
+
static void UnmapToolButtons()
{
int i;
}
}
-int el2gfx_OLD(int element)
+int el_act_dir2img(int element, int action, int direction)
{
- switch(element)
- {
- case EL_EMPTY: return -1;
- case EL_SAND: return GFX_ERDREICH;
- case EL_WALL: return GFX_MAUERWERK;
- case EL_WALL_CRUMBLED: return GFX_FELSBODEN;
- case EL_ROCK: return GFX_FELSBROCKEN;
- case EL_EMERALD: return GFX_EDELSTEIN;
- case EL_EXIT_CLOSED: return GFX_AUSGANG_ZU;
- case EL_EXIT_OPENING: return GFX_AUSGANG_ACT;
- case EL_EXIT_OPEN: return GFX_AUSGANG_AUF;
- case EL_SP_EXIT_OPEN: return GFX_SP_EXIT;
- case EL_PLAYER1: return GFX_SPIELER1;
- case EL_PLAYER2: return GFX_SPIELER2;
- case EL_PLAYER3: return GFX_SPIELER3;
- case EL_PLAYER4: return GFX_SPIELER4;
- case EL_BUG: return GFX_KAEFER;
- case EL_BUG_RIGHT: return GFX_KAEFER_RIGHT;
- case EL_BUG_UP: return GFX_KAEFER_UP;
- case EL_BUG_LEFT: return GFX_KAEFER_LEFT;
- case EL_BUG_DOWN: return GFX_KAEFER_DOWN;
- case EL_SPACESHIP: return GFX_FLIEGER;
- case EL_SPACESHIP_RIGHT: return GFX_FLIEGER_RIGHT;
- case EL_SPACESHIP_UP: return GFX_FLIEGER_UP;
- case EL_SPACESHIP_LEFT: return GFX_FLIEGER_LEFT;
- case EL_SPACESHIP_DOWN: return GFX_FLIEGER_DOWN;
- case EL_BD_BUTTERFLY: return GFX_BUTTERFLY;
- case EL_BD_BUTTERFLY_RIGHT: return GFX_BUTTERFLY_RIGHT;
- case EL_BD_BUTTERFLY_UP: return GFX_BUTTERFLY_UP;
- case EL_BD_BUTTERFLY_LEFT: return GFX_BUTTERFLY_LEFT;
- case EL_BD_BUTTERFLY_DOWN: return GFX_BUTTERFLY_DOWN;
- case EL_BD_FIREFLY: return GFX_FIREFLY;
- case EL_BD_FIREFLY_RIGHT: return GFX_FIREFLY_RIGHT;
- case EL_BD_FIREFLY_UP: return GFX_FIREFLY_UP;
- case EL_BD_FIREFLY_LEFT: return GFX_FIREFLY_LEFT;
- case EL_BD_FIREFLY_DOWN: return GFX_FIREFLY_DOWN;
- case EL_YAMYAM: return GFX_MAMPFER;
- case EL_ROBOT: return GFX_ROBOT;
- case EL_STEELWALL: return GFX_BETON;
- case EL_DIAMOND: return GFX_DIAMANT;
- case EL_QUICKSAND_EMPTY: return GFX_MORAST_LEER;
- case EL_QUICKSAND_FULL: return GFX_MORAST_VOLL;
- case EL_QUICKSAND_EMPTYING: return GFX_MORAST_LEER;
- case EL_AMOEBA_DROP: return GFX_TROPFEN;
- case EL_BOMB: return GFX_BOMBE;
- case EL_MAGIC_WALL: return GFX_MAGIC_WALL_OFF;
- case EL_MAGIC_WALL_ACTIVE: return GFX_MAGIC_WALL_EMPTY;
- case EL_MAGIC_WALL_EMPTYING: return GFX_MAGIC_WALL_EMPTY;
- case EL_MAGIC_WALL_FULL: return GFX_MAGIC_WALL_FULL;
- case EL_MAGIC_WALL_DEAD: return GFX_MAGIC_WALL_DEAD;
- case EL_ACID: return GFX_SALZSAEURE;
- case EL_AMOEBA_DEAD: return GFX_AMOEBE_TOT;
- case EL_AMOEBA_WET: return GFX_AMOEBE_NASS;
- case EL_AMOEBA_DRY: return GFX_AMOEBE_NORM;
- case EL_AMOEBA_FULL: return GFX_AMOEBE_VOLL;
- case EL_BD_AMOEBA: return GFX_AMOEBE_BD;
- case EL_AMOEBA_TO_DIAMOND: return GFX_AMOEBA2DIAM;
- case EL_AMOEBA_DRIPPING: return GFX_AMOEBE_NASS;
- case EL_NUT: return GFX_KOKOSNUSS;
- case EL_GAMEOFLIFE: return GFX_LIFE;
- case EL_BIOMAZE: return GFX_LIFE_ASYNC;
- case EL_DYNAMITE_ACTIVE: return GFX_DYNAMIT;
- case EL_STONEBLOCK: return GFX_BADEWANNE;
- case EL_ACIDPOOL_TOPLEFT: return GFX_BADEWANNE1;
- case EL_ACIDPOOL_TOPRIGHT: return GFX_BADEWANNE2;
- case EL_ACIDPOOL_BOTTOMLEFT: return GFX_BADEWANNE3;
- case EL_ACIDPOOL_BOTTOM: return GFX_BADEWANNE4;
- case EL_ACIDPOOL_BOTTOMRIGHT: return GFX_BADEWANNE5;
- case EL_ROBOT_WHEEL: return GFX_ABLENK_AUS;
- case EL_ROBOT_WHEEL_ACTIVE: return GFX_ABLENK_EIN;
- case EL_KEY1: return GFX_SCHLUESSEL1;
- case EL_KEY2: return GFX_SCHLUESSEL2;
- case EL_KEY3: return GFX_SCHLUESSEL3;
- case EL_KEY4: return GFX_SCHLUESSEL4;
- case EL_GATE1: return GFX_PFORTE1;
- case EL_GATE2: return GFX_PFORTE2;
- case EL_GATE3: return GFX_PFORTE3;
- case EL_GATE4: return GFX_PFORTE4;
- case EL_GATE1_GRAY: return GFX_PFORTE1X;
- case EL_GATE2_GRAY: return GFX_PFORTE2X;
- case EL_GATE3_GRAY: return GFX_PFORTE3X;
- case EL_GATE4_GRAY: return GFX_PFORTE4X;
- case EL_DYNAMITE: return GFX_DYNAMIT_AUS;
- case EL_PACMAN: return GFX_PACMAN;
- case EL_PACMAN_RIGHT: return GFX_PACMAN_RIGHT;
- case EL_PACMAN_UP: return GFX_PACMAN_UP;
- case EL_PACMAN_LEFT: return GFX_PACMAN_LEFT;
- case EL_PACMAN_DOWN: return GFX_PACMAN_DOWN;
- case EL_INVISIBLE_WALL: return GFX_UNSICHTBAR;
- case EL_INVISIBLE_WALL_ACTIVE: return GFX_UNSICHTBAR_ON;
- case EL_WALL_EMERALD: return GFX_ERZ_EDEL;
- case EL_WALL_DIAMOND: return GFX_ERZ_DIAM;
- case EL_LAMP: return GFX_BIRNE_AUS;
- case EL_LAMP_ACTIVE: return GFX_BIRNE_EIN;
- case EL_TIME_ORB_FULL: return GFX_ZEIT_VOLL;
- case EL_TIME_ORB_EMPTY: return GFX_ZEIT_LEER;
- case EL_WALL_GROWING: return GFX_MAUER_LEBT;
- case EL_WALL_GROWING_X: return GFX_MAUER_X;
- case EL_WALL_GROWING_Y: return GFX_MAUER_Y;
- case EL_WALL_GROWING_XY: return GFX_MAUER_XY;
- case EL_BD_DIAMOND: return GFX_EDELSTEIN_BD;
- case EL_EMERALD_YELLOW: return GFX_EDELSTEIN_GELB;
- case EL_EMERALD_RED: return GFX_EDELSTEIN_ROT;
- case EL_EMERALD_PURPLE: return GFX_EDELSTEIN_LILA;
- case EL_WALL_BD_DIAMOND: return GFX_ERZ_EDEL_BD;
- case EL_WALL_EMERALD_YELLOW: return GFX_ERZ_EDEL_GELB;
- case EL_WALL_EMERALD_RED: return GFX_ERZ_EDEL_ROT;
- case EL_WALL_EMERALD_PURPLE: return GFX_ERZ_EDEL_LILA;
- case EL_DARK_YAMYAM: return GFX_MAMPFER2;
- case EL_BD_MAGIC_WALL: return GFX_MAGIC_WALL_BD_OFF;
- case EL_BD_MAGIC_WALL_ACTIVE: return GFX_MAGIC_WALL_BD_EMPTY;
- case EL_BD_MAGIC_WALL_EMPTYING: return GFX_MAGIC_WALL_BD_EMPTY;
- case EL_BD_MAGIC_WALL_FULL: return GFX_MAGIC_WALL_BD_FULL;
- case EL_BD_MAGIC_WALL_DEAD: return GFX_MAGIC_WALL_BD_DEAD;
- case EL_DYNABOMB_PLAYER1_ACTIVE: return GFX_DYNABOMB;
- case EL_DYNABOMB_PLAYER2_ACTIVE: return GFX_DYNABOMB;
- case EL_DYNABOMB_PLAYER3_ACTIVE: return GFX_DYNABOMB;
- case EL_DYNABOMB_PLAYER4_ACTIVE: return GFX_DYNABOMB;
- case EL_DYNABOMB_NR: return GFX_DYNABOMB_NR;
- case EL_DYNABOMB_SZ: return GFX_DYNABOMB_SZ;
- case EL_DYNABOMB_XL: return GFX_DYNABOMB_XL;
- case EL_SOKOBAN_OBJECT: return GFX_SOKOBAN_OBJEKT;
- case EL_SOKOBAN_FIELD_EMPTY: return GFX_SOKOBAN_FELD_LEER;
- case EL_SOKOBAN_FIELD_FULL: return GFX_SOKOBAN_FELD_VOLL;
- case EL_MOLE: return GFX_MOLE;
- case EL_PENGUIN: return GFX_PINGUIN;
- case EL_PIG: return GFX_SCHWEIN;
- case EL_DRAGON: return GFX_DRACHE;
- case EL_SATELLITE: return GFX_SONDE;
- case EL_ARROW_BLUE_LEFT: return GFX_PFEIL_LEFT;
- case EL_ARROW_BLUE_RIGHT: return GFX_PFEIL_RIGHT;
- case EL_ARROW_BLUE_UP: return GFX_PFEIL_UP;
- case EL_ARROW_BLUE_DOWN: return GFX_PFEIL_DOWN;
- case EL_SPEED_PILL: return GFX_SPEED_PILL;
- case EL_SP_TERMINAL_ACTIVE: return GFX_SP_TERMINAL;
- case EL_SP_BUGGY_BASE_ACTIVE: return GFX_SP_BUG_ACTIVE;
- case EL_SP_ZONK: return GFX_SP_ZONK;
- /* ^^^^^^^^^^ non-standard position in supaplex graphic set! */
- case EL_INVISIBLE_STEELWALL: return GFX_INVISIBLE_STEEL;
- case EL_INVISIBLE_STEELWALL_ACTIVE: return GFX_INVISIBLE_STEEL_ON;
- case EL_BLACK_ORB: return GFX_BLACK_ORB;
- case EL_EM_GATE1: return GFX_EM_GATE_1;
- case EL_EM_GATE2: return GFX_EM_GATE_2;
- case EL_EM_GATE3: return GFX_EM_GATE_3;
- case EL_EM_GATE4: return GFX_EM_GATE_4;
- case EL_EM_GATE1_GRAY: return GFX_EM_GATE_1X;
- case EL_EM_GATE2_GRAY: return GFX_EM_GATE_2X;
- case EL_EM_GATE3_GRAY: return GFX_EM_GATE_3X;
- case EL_EM_GATE4_GRAY: return GFX_EM_GATE_4X;
- case EL_EM_KEY1_FILE: return GFX_EM_KEY_1;
- case EL_EM_KEY2_FILE: return GFX_EM_KEY_2;
- case EL_EM_KEY3_FILE: return GFX_EM_KEY_3;
- case EL_EM_KEY4_FILE: return GFX_EM_KEY_4;
- case EL_EM_KEY1: return GFX_EM_KEY_1;
- case EL_EM_KEY2: return GFX_EM_KEY_2;
- case EL_EM_KEY3: return GFX_EM_KEY_3;
- case EL_EM_KEY4: return GFX_EM_KEY_4;
- case EL_PEARL: return GFX_PEARL;
- case EL_CRYSTAL: return GFX_CRYSTAL;
- case EL_WALL_PEARL: return GFX_WALL_PEARL;
- case EL_WALL_CRYSTAL: return GFX_WALL_CRYSTAL;
- case EL_DOOR_WHITE: return GFX_DOOR_WHITE;
- case EL_DOOR_WHITE_GRAY: return GFX_DOOR_WHITE_GRAY;
- case EL_KEY_WHITE: return GFX_KEY_WHITE;
- case EL_SHIELD_NORMAL: return GFX_SHIELD_PASSIVE;
- case EL_SHIELD_DEADLY: return GFX_SHIELD_ACTIVE;
- case EL_EXTRA_TIME: return GFX_EXTRA_TIME;
- case EL_SWITCHGATE_OPEN: return GFX_SWITCHGATE_OPEN;
- case EL_SWITCHGATE_CLOSED: return GFX_SWITCHGATE_CLOSED;
- case EL_SWITCHGATE_SWITCH_UP: return GFX_SWITCHGATE_SWITCH_1;
- case EL_SWITCHGATE_SWITCH_DOWN: return GFX_SWITCHGATE_SWITCH_2;
- case EL_CONVEYOR_BELT1_LEFT: return GFX_BELT1_LEFT;
- case EL_CONVEYOR_BELT1_MIDDLE: return GFX_BELT1_MIDDLE;
- case EL_CONVEYOR_BELT1_RIGHT: return GFX_BELT1_RIGHT;
- case EL_CONVEYOR_BELT1_LEFT_ACTIVE: return GFX_BELT1_LEFT;
- case EL_CONVEYOR_BELT1_MIDDLE_ACTIVE:return GFX_BELT1_MIDDLE;
- case EL_CONVEYOR_BELT1_RIGHT_ACTIVE:return GFX_BELT1_RIGHT;
- case EL_CONVEYOR_BELT1_SWITCH_LEFT: return GFX_BELT1_SWITCH_LEFT;
- case EL_CONVEYOR_BELT1_SWITCH_MIDDLE:return GFX_BELT1_SWITCH_MIDDLE;
- case EL_CONVEYOR_BELT1_SWITCH_RIGHT:return GFX_BELT1_SWITCH_RIGHT;
- case EL_CONVEYOR_BELT2_LEFT: return GFX_BELT2_LEFT;
- case EL_CONVEYOR_BELT2_MIDDLE: return GFX_BELT2_MIDDLE;
- case EL_CONVEYOR_BELT2_RIGHT: return GFX_BELT2_RIGHT;
- case EL_CONVEYOR_BELT2_LEFT_ACTIVE: return GFX_BELT2_LEFT;
- case EL_CONVEYOR_BELT2_MIDDLE_ACTIVE:return GFX_BELT2_MIDDLE;
- case EL_CONVEYOR_BELT2_RIGHT_ACTIVE:return GFX_BELT2_RIGHT;
- case EL_CONVEYOR_BELT2_SWITCH_LEFT: return GFX_BELT2_SWITCH_LEFT;
- case EL_CONVEYOR_BELT2_SWITCH_MIDDLE:return GFX_BELT2_SWITCH_MIDDLE;
- case EL_CONVEYOR_BELT2_SWITCH_RIGHT:return GFX_BELT2_SWITCH_RIGHT;
- case EL_CONVEYOR_BELT3_LEFT: return GFX_BELT3_LEFT;
- case EL_CONVEYOR_BELT3_MIDDLE: return GFX_BELT3_MIDDLE;
- case EL_CONVEYOR_BELT3_RIGHT: return GFX_BELT3_RIGHT;
- case EL_CONVEYOR_BELT3_LEFT_ACTIVE: return GFX_BELT3_LEFT;
- case EL_CONVEYOR_BELT3_MIDDLE_ACTIVE:return GFX_BELT3_MIDDLE;
- case EL_CONVEYOR_BELT3_RIGHT_ACTIVE:return GFX_BELT3_RIGHT;
- case EL_CONVEYOR_BELT3_SWITCH_LEFT: return GFX_BELT3_SWITCH_LEFT;
- case EL_CONVEYOR_BELT3_SWITCH_MIDDLE:return GFX_BELT3_SWITCH_MIDDLE;
- case EL_CONVEYOR_BELT3_SWITCH_RIGHT:return GFX_BELT3_SWITCH_RIGHT;
- case EL_CONVEYOR_BELT4_LEFT: return GFX_BELT4_LEFT;
- case EL_CONVEYOR_BELT4_MIDDLE: return GFX_BELT4_MIDDLE;
- case EL_CONVEYOR_BELT4_RIGHT: return GFX_BELT4_RIGHT;
- case EL_CONVEYOR_BELT4_LEFT_ACTIVE: return GFX_BELT4_LEFT;
- case EL_CONVEYOR_BELT4_MIDDLE_ACTIVE:return GFX_BELT4_MIDDLE;
- case EL_CONVEYOR_BELT4_RIGHT_ACTIVE:return GFX_BELT4_RIGHT;
- case EL_CONVEYOR_BELT4_SWITCH_LEFT: return GFX_BELT4_SWITCH_LEFT;
- case EL_CONVEYOR_BELT4_SWITCH_MIDDLE:return GFX_BELT4_SWITCH_MIDDLE;
- case EL_CONVEYOR_BELT4_SWITCH_RIGHT:return GFX_BELT4_SWITCH_RIGHT;
- case EL_LANDMINE: return GFX_LANDMINE;
- case EL_ENVELOPE: return GFX_ENVELOPE;
- case EL_LIGHT_SWITCH: return GFX_LIGHT_SWITCH_OFF;
- case EL_LIGHT_SWITCH_ACTIVE: return GFX_LIGHT_SWITCH_ON;
- case EL_SIGN_EXCLAMATION: return GFX_SIGN_EXCLAMATION;
- case EL_SIGN_RADIOACTIVITY: return GFX_SIGN_RADIOACTIVITY;
- case EL_SIGN_STOP: return GFX_SIGN_STOP;
- case EL_SIGN_WHEELCHAIR: return GFX_SIGN_WHEELCHAIR;
- case EL_SIGN_PARKING: return GFX_SIGN_PARKING;
- case EL_SIGN_ONEWAY: return GFX_SIGN_ONEWAY;
- case EL_SIGN_HEART: return GFX_SIGN_HEART;
- case EL_SIGN_TRIANGLE: return GFX_SIGN_TRIANGLE;
- case EL_SIGN_ROUND: return GFX_SIGN_ROUND;
- case EL_SIGN_EXIT: return GFX_SIGN_EXIT;
- case EL_SIGN_YINYANG: return GFX_SIGN_YINYANG;
- case EL_SIGN_OTHER: return GFX_SIGN_OTHER;
- case EL_MOLE_LEFT: return GFX_MOLE_LEFT;
- case EL_MOLE_RIGHT: return GFX_MOLE_RIGHT;
- case EL_MOLE_UP: return GFX_MOLE_UP;
- case EL_MOLE_DOWN: return GFX_MOLE_DOWN;
- case EL_STEELWALL_SLANTED: return GFX_STEEL_SLANTED;
- case EL_INVISIBLE_SAND: return GFX_SAND_INVISIBLE;
- case EL_INVISIBLE_SAND_ACTIVE: return GFX_SAND_INVISIBLE_ON;
- case EL_DX_UNKNOWN_15: return GFX_DX_UNKNOWN_15;
- case EL_DX_UNKNOWN_42: return GFX_DX_UNKNOWN_42;
- case EL_TIMEGATE_OPEN: return GFX_TIMEGATE_OPEN;
- case EL_TIMEGATE_CLOSED: return GFX_TIMEGATE_CLOSED;
- case EL_TIMEGATE_SWITCH_ACTIVE: return GFX_TIMEGATE_SWITCH;
- case EL_TIMEGATE_SWITCH: return GFX_TIMEGATE_SWITCH;
- case EL_BALLOON: return GFX_BALLOON;
- case EL_BALLOON_SEND_LEFT: return GFX_BALLOON_SEND_LEFT;
- case EL_BALLOON_SEND_RIGHT: return GFX_BALLOON_SEND_RIGHT;
- case EL_BALLOON_SEND_UP: return GFX_BALLOON_SEND_UP;
- case EL_BALLOON_SEND_DOWN: return GFX_BALLOON_SEND_DOWN;
- case EL_BALLOON_SEND_ANY_DIRECTION: return GFX_BALLOON_SEND_ANY;
- case EL_EMC_STEELWALL1: return GFX_EMC_STEEL_WALL_1;
- case EL_EMC_STEELWALL2: return GFX_EMC_STEEL_WALL_2;
- case EL_EMC_STEELWALL3: return GFX_EMC_STEEL_WALL_3;
- case EL_EMC_STEELWALL4: return GFX_EMC_STEEL_WALL_4;
- case EL_EMC_WALL_PILLAR_UPPER: return GFX_EMC_WALL_1;
- case EL_EMC_WALL_PILLAR_MIDDLE: return GFX_EMC_WALL_2;
- case EL_EMC_WALL_PILLAR_LOWER: return GFX_EMC_WALL_3;
- case EL_EMC_WALL4: return GFX_EMC_WALL_4;
- case EL_EMC_WALL5: return GFX_EMC_WALL_5;
- case EL_EMC_WALL6: return GFX_EMC_WALL_6;
- case EL_EMC_WALL7: return GFX_EMC_WALL_7;
- case EL_EMC_WALL8: return GFX_EMC_WALL_8;
- case EL_TUBE_ALL: return GFX_TUBE_CROSS;
- case EL_TUBE_VERTICAL: return GFX_TUBE_VERTICAL;
- case EL_TUBE_HORIZONTAL: return GFX_TUBE_HORIZONTAL;
- case EL_TUBE_VERTICAL_LEFT: return GFX_TUBE_VERT_LEFT;
- case EL_TUBE_VERTICAL_RIGHT: return GFX_TUBE_VERT_RIGHT;
- case EL_TUBE_HORIZONTAL_UP: return GFX_TUBE_HORIZ_UP;
- case EL_TUBE_HORIZONTAL_DOWN: return GFX_TUBE_HORIZ_DOWN;
- case EL_TUBE_LEFT_UP: return GFX_TUBE_LEFT_UP;
- case EL_TUBE_LEFT_DOWN: return GFX_TUBE_LEFT_DOWN;
- case EL_TUBE_RIGHT_UP: return GFX_TUBE_RIGHT_UP;
- case EL_TUBE_RIGHT_DOWN: return GFX_TUBE_RIGHT_DOWN;
- case EL_SPRING: return GFX_SPRING;
- case EL_SPRING_MOVING: return GFX_SPRING;
- case EL_TRAP: return GFX_TRAP_INACTIVE;
- case EL_TRAP_ACTIVE: return GFX_TRAP_ACTIVE;
- case EL_BD_WALL: return GFX_BD_WALL;
- case EL_BD_ROCK: return GFX_BD_ROCK;
- case EL_DX_SUPABOMB: return GFX_DX_SUPABOMB;
- case EL_SP_MURPHY_CLONE: return GFX_SP_MURPHY_CLONE;
-
- default:
- {
- if (IS_CHAR(element))
- return GFX_CHAR_START + (element - EL_CHAR_START);
- else if (element >= EL_SP_START && element <= EL_SP_END)
- {
- int nr_element = element - EL_SP_START;
- int gfx_per_line = 8;
- int nr_graphic =
- (nr_element / gfx_per_line) * SP_PER_LINE +
- (nr_element % gfx_per_line);
+ direction = MV_DIR_BIT(direction);
- return GFX_START_ROCKSSP + nr_graphic;
- }
- else
- return -1;
- }
- }
+ return element_info[element].direction_graphic[action][direction];
}
-int el2gfx(int element)
+int el_act2img(int element, int action)
{
-#if 1
- int graphic_OLD = el2gfx_OLD(element);
-
- return graphic_OLD;
-#else
-
- int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
-
-#if DEBUG
- int graphic_OLD = el2gfx_OLD(element);
-
- if (element >= MAX_ELEMENTS)
- {
- Error(ERR_WARN, "el2gfx: element == %d >= MAX_ELEMENTS", element);
- }
-
- if (graphic_NEW != graphic_OLD)
- {
- Error(ERR_WARN, "el2gfx: graphic_NEW (%d) != graphic_OLD (%d)",
- graphic_NEW, graphic_OLD);
- }
-#endif
+ return element_info[element].graphic[action];
+}
- return graphic_NEW;
-#endif
+int el_dir2img(int element, int direction)
+{
+ return el_act_dir2img(element, ACTION_DEFAULT, direction);
}
int el2img(int element)
{
-#if 1
- int graphic_NEW = element_info[element].graphic[GFX_ACTION_DEFAULT];
-
- return graphic_NEW;
-#else
-
- switch(element)
- {
- case EL_BD_BUTTERFLY: return IMG_BD_BUTTERFLY;
- case EL_BD_FIREFLY: return IMG_BD_FIREFLY;
- case EL_SP_ELECTRON: return IMG_SP_ELECTRON;
-
- default:
- break;
- }
-
- return IMG_EMPTY;
-#endif
+ return element_info[element].graphic[ACTION_DEFAULT];
}
-int el_dir2img(int element, int direction)
+int el2edimg(int element)
{
- return el_dir_act2img(element, direction, GFX_ACTION_DEFAULT);
+ return element_info[element].editor_graphic;
}
-int el_dir_act2img(int element, int direction, int action)
+int el2preimg(int element)
{
- action = graphics_action_mapping[action];
- direction = MV_DIR_BIT(direction);
-
- return element_info[element].direction_graphic[action][direction];
+ return element_info[element].preview_graphic;
}
projects / rocksndiamonds.git / blobdiff