From: Holger Schemel Date: Thu, 25 Nov 2004 02:37:03 +0000 (+0100) Subject: rnd-20041125-1-src X-Git-Tag: 3.1.1^2~46 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d4758d12db28cd36edca33c9c7ab05476a8f85e7;p=rocksndiamonds.git rnd-20041125-1-src --- diff --git a/src/conftime.h b/src/conftime.h index 6b86fe8b..ecb956dd 100644 --- a/src/conftime.h +++ b/src/conftime.h @@ -1 +1 @@ -#define COMPILE_DATE_STRING "[2004-11-24 01:32]" +#define COMPILE_DATE_STRING "[2004-11-25 03:34]" diff --git a/src/game_em/graphics.c b/src/game_em/graphics.c index fce6e032..99d8e3b9 100644 --- a/src/game_em/graphics.c +++ b/src/game_em/graphics.c @@ -143,8 +143,8 @@ static void blitplayer(struct PLAYER *ply) (unsigned int)(dy - screen_y) < ((MAX_BUF_YSIZE - 1) * TILEY - 1)) { spr = map_spr[ply->num][frame][ply->anim]; - x %= MAX_BUF_XSIZE * TILEX; - y %= MAX_BUF_YSIZE * TILEY; + x %= MAX_BUF_XSIZE * TILEX; + y %= MAX_BUF_YSIZE * TILEY; dx %= MAX_BUF_XSIZE * TILEX; dy %= MAX_BUF_YSIZE * TILEY; @@ -170,7 +170,7 @@ static void blitplayer(struct PLAYER *ply) dst_y = (y / TILEY) * TILEY; #if 1 -#if 1 +#if 0 { int tile = Draw[ply->oldy][ply->oldx]; struct GraphicInfo_EM *g = &graphic_info_em[tile][frame]; @@ -206,8 +206,32 @@ static void blitplayer(struct PLAYER *ply) #if 1 #if 1 { + /* + d? == 1: + 0-3: 0, 1 + 4-7: 0, 1 + + d? == 2: + 0-3: 0, 1 + 4-7: 1, 2 + */ + + int dx = (ply->x - ply->oldx); + int dy = (ply->y - ply->oldy); + int old_x = ply->oldx ; + int old_y = ply->oldy ; + int new_x = ply->oldx ; + int new_y = ply->oldy ; + int xxx = (frame * ply->oldx + (8 - frame) * ply->x) / 8; + int yyy = (frame * ply->oldy + (8 - frame) * ply->y) / 8; + int tileXXX = Draw[ply->y][ply->x]; int tile = Draw[ply->y][ply->x]; struct GraphicInfo_EM *g = &graphic_info_em[tile][frame]; + int xx = ply->x - 1, yy = ply->y; + + printf("::: %d: %d,%d -> %d,%d: %d, %d, %d, %d [%d,%d] <-> ", + frame, ply->oldx, ply->oldy, ply->x, ply->y, + src_x, src_y, dst_x, dst_y, xxx, yyy); if (g->width > 0 && g->height > 0) { @@ -220,6 +244,9 @@ static void blitplayer(struct PLAYER *ply) dst_x - src_x, dst_y - src_y); BlitBitmapMasked(g->bitmap, screenBitmap, src_x, src_y, g->width, g->height, dst_x, dst_y); + + printf("::: %d, %d, %d, %d\n", + src_x, src_y, dst_x, dst_y); } } #else diff --git a/src/init.c b/src/init.c index b02d0883..30357927 100644 --- a/src/init.c +++ b/src/init.c @@ -1246,7 +1246,7 @@ static void InitGraphicInfo() } #if defined(TARGET_X11_NATIVE_PERFORMANCE_WORKAROUND) - /* currently we need only a tile clip mask from the first frame */ + /* currently we only need a tile clip mask from the first frame */ getGraphicSource(i, first_frame, &src_bitmap, &src_x, &src_y); if (copy_clipmask_gc == None) diff --git a/src/libgame/types.h b/src/libgame/types.h index 558f180c..22790dc8 100644 --- a/src/libgame/types.h +++ b/src/libgame/types.h @@ -44,7 +44,7 @@ typedef unsigned char byte; #endif #ifndef SIGN -#define SIGN(a) ((a) < 0 ? -1 : ((a)>0 ? 1 : 0)) +#define SIGN(a) ((a) < 0 ? -1 : ((a) > 0 ? 1 : 0)) #endif #define SIZEOF_ARRAY(array, type) (sizeof(array) / sizeof(type)) diff --git a/src/main.h b/src/main.h index f65bffb9..4b22fe90 100644 --- a/src/main.h +++ b/src/main.h @@ -557,12 +557,15 @@ #define VY 400 #define EX DX #define EY (VY - 44) -#define TILEX 32 -#define TILEY 32 -#define MINI_TILEX (TILEX / 2) -#define MINI_TILEY (TILEY / 2) -#define MICRO_TILEX (TILEX / 8) -#define MICRO_TILEY (TILEY / 8) +#define TILESIZE 32 +#define TILEX TILESIZE +#define TILEY TILESIZE +#define MINI_TILESIZE (TILESIZE / 2) +#define MINI_TILEX MINI_TILESIZE +#define MINI_TILEY MINI_TILESIZE +#define MICRO_TILESIZE (TILESIZE / 8) +#define MICRO_TILEX MICRO_TILESIZE +#define MICRO_TILEY MICRO_TILESIZE #define MIDPOSX (SCR_FIELDX / 2) #define MIDPOSY (SCR_FIELDY / 2) #define SXSIZE (SCR_FIELDX * TILEX) diff --git a/src/tools.c b/src/tools.c index ba053b0d..e83389da 100644 --- a/src/tools.c +++ b/src/tools.c @@ -436,9 +436,9 @@ void SetDoorBackgroundImage(int graphic) graphic_info[IMG_BACKGROUND].bitmap); } -void DrawBackground(int dest_x, int dest_y, int width, int height) +void DrawBackground(int dst_x, int dst_y, int width, int height) { - ClearRectangleOnBackground(backbuffer, dest_x, dest_y, width, height); + ClearRectangleOnBackground(backbuffer, dst_x, dst_y, width, height); redraw_mask |= REDRAW_FIELD; } @@ -511,1544 +511,1599 @@ inline int getGraphicAnimationFrame(int graphic, int sync_frame) sync_frame); } -inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y, - int graphic, int sync_frame, int mask_mode) +inline void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap, + int *x, int *y, boolean get_backside) { - int frame = getGraphicAnimationFrame(graphic, sync_frame); + struct GraphicInfo *g = &graphic_info[graphic]; + int src_x = g->src_x + (get_backside ? g->offset2_x : 0); + int src_y = g->src_y + (get_backside ? g->offset2_y : 0); - if (mask_mode == USE_MASKING) - DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame); - else - DrawGraphicExt(dst_bitmap, x, y, graphic, frame); + *bitmap = g->bitmap; + + if (g->offset_y == 0) /* frames are ordered horizontally */ + { + int max_width = g->anim_frames_per_line * g->width; +#if 1 + int pos = (src_y / g->height) * max_width + src_x + frame * g->offset_x; + + *x = pos % max_width; + *y = src_y % g->height + pos / max_width * g->height; +#else + *x = (src_x + frame * g->offset_x) % max_width; + *y = src_y + (src_x + frame * g->offset_x) / max_width * g->height; +#endif + } + else if (g->offset_x == 0) /* frames are ordered vertically */ + { + int max_height = g->anim_frames_per_line * g->height; +#if 1 + int pos = (src_x / g->width) * max_height + src_y + frame * g->offset_y; + + *x = src_x % g->width + pos / max_height * g->width; + *y = pos % max_height; +#else + *x = src_x + (src_y + frame * g->offset_y) / max_height * g->width; + *y = (src_y + frame * g->offset_y) % max_height; +#endif + } + else /* frames are ordered diagonally */ + { + *x = src_x + frame * g->offset_x; + *y = src_y + frame * g->offset_y; + } } -inline void DrawGraphicAnimation(int x, int y, int graphic) +void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y) { - int lx = LEVELX(x), ly = LEVELY(y); + getGraphicSourceExt(graphic, frame, bitmap, x, y, FALSE); +} +void DrawGraphic(int x, int y, int graphic, int frame) +{ +#if DEBUG if (!IN_SCR_FIELD(x, y)) + { + printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic); + printf("DrawGraphic(): This should never happen!\n"); return; + } +#endif - DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY, - graphic, GfxFrame[lx][ly], NO_MASKING); + DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame); MarkTileDirty(x, y); } -void DrawLevelGraphicAnimation(int x, int y, int graphic) +void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, + int frame) { - DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); + Bitmap *src_bitmap; + int src_x, src_y; + + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); } -void DrawLevelElementAnimation(int x, int y, int element) +void DrawGraphicThruMask(int x, int y, int graphic, int frame) { -#if 1 - int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); - - DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); -#else - DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element)); +#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, + frame); + MarkTileDirty(x, y); } -inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic) +void DrawGraphicThruMaskExt(DrawBuffer *d, int dst_x, int dst_y, int graphic, + int frame) { - 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; + Bitmap *src_bitmap; + int src_x, src_y; - DrawGraphicAnimation(sx, sy, graphic); + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - if (GFX_CRUMBLED(Feld[x][y])) - DrawLevelFieldCrumbledSand(x, y); + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, d, src_x, src_y, TILEX, TILEY, dst_x, dst_y); } -void DrawLevelElementAnimationIfNeeded(int x, int y, int element) +void DrawMiniGraphic(int x, int y, int graphic) { - int sx = SCREENX(x), sy = SCREENY(y); - int graphic; - - if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy)) - return; + DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic); + MarkTileDirty(x / 2, y / 2); +} - graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); +void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +{ + struct GraphicInfo *g = &graphic_info[graphic]; + int mini_startx = 0; + int mini_starty = g->bitmap->height * 2 / 3; - if (!IS_NEW_FRAME(GfxFrame[x][y], graphic)) - return; + *bitmap = g->bitmap; + *x = mini_startx + g->src_x / 2; + *y = mini_starty + g->src_y / 2; +} - DrawGraphicAnimation(sx, sy, graphic); +void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) +{ + Bitmap *src_bitmap; + int src_x, src_y; - if (GFX_CRUMBLED(element)) - DrawLevelFieldCrumbledSand(x, y); + getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y); } -static int getPlayerGraphic(struct PlayerInfo *player, int move_dir) +inline static void DrawGraphicShiftedNormal(int x, int y, int dx, int dy, + int graphic, int frame, + int cut_mode, int mask_mode) { - if (player->use_murphy_graphic) - { - /* this works only because currently only one player can be "murphy" ... */ - static int last_horizontal_dir = MV_LEFT; - int graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); + Bitmap *src_bitmap; + int src_x, src_y; + int dst_x, dst_y; + int width = TILEX, height = TILEY; + int cx = 0, cy = 0; - if (move_dir == MV_LEFT || move_dir == MV_RIGHT) - last_horizontal_dir = move_dir; + if (dx || dy) /* shifted graphic */ + { + if (x < BX1) /* object enters playfield from the left */ + { + x = BX1; + width = dx; + cx = TILEX - dx; + dx = 0; + } + else if (x > BX2) /* object enters playfield from the right */ + { + x = BX2; + width = -dx; + dx = TILEX + dx; + } + else if (x==BX1 && dx < 0) /* object leaves playfield to the left */ + { + width += dx; + cx = -dx; + dx = 0; + } + else if (x==BX2 && dx > 0) /* object leaves playfield to the right */ + width -= dx; + else if (dx) /* general horizontal movement */ + MarkTileDirty(x + SIGN(dx), y); - if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + if (y < BY1) /* object enters playfield from the top */ { - int direction = (player->is_snapping ? move_dir : last_horizontal_dir); + if (cut_mode==CUT_BELOW) /* object completely above top border */ + return; - graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + y = BY1; + height = dy; + cy = TILEY - dy; + dy = 0; + } + else if (y > BY2) /* object enters playfield from the bottom */ + { + y = BY2; + height = -dy; + dy = TILEY + dy; + } + else if (y==BY1 && dy < 0) /* object leaves playfield to the top */ + { + height += dy; + cy = -dy; + dy = 0; } + else if (dy > 0 && cut_mode == CUT_ABOVE) + { + if (y == BY2) /* object completely above bottom border */ + return; - return graphic; + height = dy; + cy = TILEY - dy; + dy = TILEY; + MarkTileDirty(x, y + 1); + } /* object leaves playfield to the bottom */ + else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW)) + height -= dy; + else if (dy) /* general vertical movement */ + MarkTileDirty(x, y + SIGN(dy)); } - else - return el_act_dir2img(player->element_nr, player->GfxAction, move_dir); -} -static boolean equalGraphics(int graphic1, int graphic2) -{ - struct GraphicInfo *g1 = &graphic_info[graphic1]; - struct GraphicInfo *g2 = &graphic_info[graphic2]; +#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 - return (g1->bitmap == g2->bitmap && - g1->src_x == g2->src_x && - g1->src_y == g2->src_y && - g1->anim_frames == g2->anim_frames && - g1->anim_delay == g2->anim_delay && - g1->anim_mode == g2->anim_mode); -} + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -void DrawAllPlayers() -{ - int i; + src_x += cx; + src_y += cy; - for (i = 0; i < MAX_PLAYERS; i++) - if (stored_player[i].active) - DrawPlayer(&stored_player[i]); -} + dst_x = FX + x * TILEX + dx; + dst_y = FY + y * TILEY + dy; -void DrawPlayerField(int x, int y) -{ - if (!IS_PLAYER(x, y)) - return; + if (mask_mode == USE_MASKING) + { + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); + } + else + BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); - DrawPlayer(PLAYERINFO(x, y)); + MarkTileDirty(x, y); } -void DrawPlayer(struct PlayerInfo *player) +inline static void DrawGraphicShiftedDouble(int x, int y, int dx, int dy, + int graphic, int frame, + int cut_mode, int mask_mode) { - int jx = player->jx; - int jy = player->jy; - int move_dir = player->MovDir; -#if 0 - int last_jx = player->last_jx; - int last_jy = player->last_jy; - int next_jx = jx + (jx - last_jx); - int next_jy = jy + (jy - last_jy); - boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); -#else - int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? +1 : 0); - int dy = (move_dir == MV_UP ? -1 : move_dir == MV_DOWN ? +1 : 0); - int last_jx = (player->is_moving ? jx - dx : jx); - int last_jy = (player->is_moving ? jy - dy : jy); - int next_jx = jx + dx; - int next_jy = jy + dy; - boolean player_is_moving = (player->MovPos ? TRUE : FALSE); -#endif - 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; - int action = ACTION_DEFAULT; - int last_player_graphic = getPlayerGraphic(player, move_dir); - int last_player_frame = player->Frame; - int frame = 0; + Bitmap *src_bitmap; + int src_x, src_y; + int dst_x, dst_y; + int width = TILEX, height = TILEY; + int x1 = x; + int y1 = y; + int x2 = x + SIGN(dx); + int y2 = y + SIGN(dy); + int anim_frames = graphic_info[graphic].anim_frames; + int sync_frame = (dx ? ABS(dx) : ABS(dy)) * anim_frames / TILESIZE; - if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) - return; + /* re-calculate animation frame for two-tile movement animation */ + frame = getGraphicAnimationFrame(graphic, sync_frame); -#if DEBUG - if (!IN_LEV_FIELD(jx, jy)) + if (IN_SCR_FIELD(x1, y1)) /* movement start graphic inside screen area */ { - printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy); - printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy); - printf("DrawPlayerField(): This should never happen!\n"); - return; - } -#endif - - if (element == EL_EXPLOSION) - return; - - action = (player->is_pushing ? ACTION_PUSHING : - player->is_digging ? ACTION_DIGGING : - player->is_collecting ? ACTION_COLLECTING : - player->is_moving ? ACTION_MOVING : - player->is_snapping ? ACTION_SNAPPING : - player->is_dropping ? ACTION_DROPPING : - player->is_waiting ? player->action_waiting : ACTION_DEFAULT); - - InitPlayerGfxAnimation(player, action, move_dir); + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE); - /* ----------------------------------------------------------------------- */ - /* draw things in the field the player is leaving, if needed */ - /* ----------------------------------------------------------------------- */ + dst_x = FX + x1 * TILEX; + dst_y = FY + y1 * TILEY; -#if 1 - if (player->is_moving) -#else - if (player_is_moving) -#endif - { - if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element)) + if (mask_mode == USE_MASKING) { - DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]); - - if (last_element == EL_DYNAMITE_ACTIVE || - last_element == EL_SP_DISK_RED_ACTIVE) - DrawDynamite(last_jx, last_jy); - else - DrawLevelFieldThruMask(last_jx, last_jy); + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); } - else if (last_element == EL_DYNAMITE_ACTIVE || - last_element == EL_SP_DISK_RED_ACTIVE) - DrawDynamite(last_jx, last_jy); else - DrawLevelField(last_jx, last_jy); + BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); - if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) - DrawLevelElement(next_jx, next_jy, EL_EMPTY); + MarkTileDirty(x1, y1); } - if (!IN_SCR_FIELD(sx, sy)) - return; - - if (setup.direct_draw) - SetDrawtoField(DRAW_BUFFERED); + if (IN_SCR_FIELD(x2, y2)) /* movement end graphic inside screen area */ + { + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, FALSE); - /* ----------------------------------------------------------------------- */ - /* draw things behind the player, if needed */ - /* ----------------------------------------------------------------------- */ + dst_x = FX + x2 * TILEX; + dst_y = FY + y2 * TILEY; - if (Back[jx][jy]) - DrawLevelElement(jx, jy, Back[jx][jy]); - else if (IS_ACTIVE_BOMB(element)) - DrawLevelElement(jx, jy, EL_EMPTY); - else - { - if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) + if (mask_mode == USE_MASKING) { - if (GFX_CRUMBLED(GfxElement[jx][jy])) - DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); - else - { - int old_element = GfxElement[jx][jy]; - int old_graphic = el_act_dir2img(old_element, action, move_dir); - int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); - - DrawGraphic(sx, sy, old_graphic, frame); - } + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); } else - { - GfxElement[jx][jy] = EL_UNDEFINED; + BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, + dst_x, dst_y); - DrawLevelField(jx, jy); - } + MarkTileDirty(x2, y2); } +} - /* ----------------------------------------------------------------------- */ - /* draw player himself */ - /* ----------------------------------------------------------------------- */ +static void DrawGraphicShifted(int x, int y, int dx, int dy, + int graphic, int frame, + int cut_mode, int mask_mode) +{ + if (graphic < 0) + { + DrawGraphic(x, y, graphic, frame); -#if 1 + return; + } - graphic = getPlayerGraphic(player, move_dir); + if (graphic_info[graphic].double_movement) /* EM style movement images */ + DrawGraphicShiftedDouble(x, y, dx, dy, graphic, frame, cut_mode,mask_mode); + else + DrawGraphicShiftedNormal(x, y, dx, dy, graphic, frame, cut_mode,mask_mode); +} - /* in the case of changed player action or direction, prevent the current - animation frame from being restarted for identical animations */ - if (player->Frame == 0 && equalGraphics(graphic, last_player_graphic)) - player->Frame = last_player_frame; +void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic, + int frame, int cut_mode) +{ + DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, USE_MASKING); +} -#else +void DrawScreenElementExt(int x, int y, int dx, int dy, int element, + int cut_mode, int mask_mode) +{ + int lx = LEVELX(x), ly = LEVELY(y); + int graphic; + int frame; - if (player->use_murphy_graphic) + if (IN_LEV_FIELD(lx, ly)) { - static int last_horizontal_dir = MV_LEFT; - - if (move_dir == MV_LEFT || move_dir == MV_RIGHT) - last_horizontal_dir = move_dir; + SetRandomAnimationValue(lx, ly); - graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); + graphic = el_act_dir2img(element, GfxAction[lx][ly], GfxDir[lx][ly]); + frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]); - if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + /* do not use double (EM style) movement graphic when not moving */ + if (graphic_info[graphic].double_movement && !dx && !dy) { - int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - - graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + graphic = el_act_dir2img(element, ACTION_DEFAULT, GfxDir[lx][ly]); + frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]); } } - else - graphic = el_act_dir2img(player->element_nr, player->GfxAction, move_dir); + else /* border element */ + { + graphic = el2img(element); + frame = getGraphicAnimationFrame(graphic, -1); + } -#endif + if (element == EL_EXPANDABLE_WALL) + { + boolean left_stopped = FALSE, right_stopped = FALSE; - frame = getGraphicAnimationFrame(graphic, player->Frame); + if (!IN_LEV_FIELD(lx - 1, ly) || IS_WALL(Feld[lx - 1][ly])) + left_stopped = TRUE; + if (!IN_LEV_FIELD(lx + 1, ly) || IS_WALL(Feld[lx + 1][ly])) + right_stopped = TRUE; - if (player->GfxPos) - { - if (move_dir == MV_LEFT || move_dir == MV_RIGHT) - sxx = player->GfxPos; - else - syy = player->GfxPos; + if (left_stopped && right_stopped) + graphic = IMG_WALL; + else if (left_stopped) + { + graphic = IMG_EXPANDABLE_WALL_GROWING_RIGHT; + frame = graphic_info[graphic].anim_frames - 1; + } + else if (right_stopped) + { + graphic = IMG_EXPANDABLE_WALL_GROWING_LEFT; + frame = graphic_info[graphic].anim_frames - 1; + } } - if (!setup.soft_scrolling && ScreenMovPos) - sxx = syy = 0; + if (dx || dy) + DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode); + else if (mask_mode == USE_MASKING) + DrawGraphicThruMask(x, y, graphic, frame); + else + DrawGraphic(x, y, graphic, frame); +} - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); +void DrawLevelElementExt(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))) + DrawScreenElementExt(SCREENX(x), SCREENY(y), dx, dy, element, + cut_mode, mask_mode); +} - if (SHIELD_ON(player)) - { - int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE : - IMG_SHIELD_NORMAL_ACTIVE); - int frame = getGraphicAnimationFrame(graphic, -1); +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); +} - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); - } +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); +} - /* ----------------------------------------------------------------------- */ - /* draw things the player is pushing, if needed */ - /* ----------------------------------------------------------------------- */ +void DrawLevelElementThruMask(int x, int y, int element) +{ + DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); +} -#if 0 - printf("::: %d, %d [%d, %d] [%d]\n", - player->is_pushing, player_is_moving, player->GfxAction, - player->is_moving, player_is_moving); -#endif +void DrawLevelFieldThruMask(int x, int y) +{ + DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); +} + +#define TILE_GFX_ELEMENT(x, y) \ + (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) +static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) +{ + Bitmap *src_bitmap; + int src_x, src_y; + int sx = SCREENX(x), sy = SCREENY(y); + int element; + int width, height, cx, cy, i; #if 1 - if (player->is_pushing && player->is_moving) + int crumbled_border_size = graphic_info[graphic].border_size; #else - if (player->is_pushing && player_is_moving) + int snip = TILEX / 8; /* number of border pixels from "crumbled graphic" */ #endif + static int xy[4][2] = { - int px = SCREENX(next_jx), py = SCREENY(next_jy); + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; - if (Back[next_jx][next_jy]) - DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); - - if ((sxx || syy) && element == EL_SOKOBAN_OBJECT) - DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, - NO_CUTTING); - else - { - int element = MovingOrBlocked2Element(next_jx, next_jy); - int graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); -#if 1 - int frame = getGraphicAnimationFrame(graphic, player->StepFrame); -#else - int frame = getGraphicAnimationFrame(graphic, player->Frame); +#if 0 + if (x == 0 && y == 7) + printf("::: %d, %d [%d]\n", GfxElement[x][y], Feld[x][y], + crumbled_border_size); #endif - DrawGraphicShifted(px, py, sxx, syy, graphic, frame, - NO_CUTTING, NO_MASKING); - } - } - - /* ----------------------------------------------------------------------- */ - /* draw things in front of player (active dynamite or dynabombs) */ - /* ----------------------------------------------------------------------- */ - - if (IS_ACTIVE_BOMB(element)) - { - graphic = el2img(element); - frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); + if (!IN_LEV_FIELD(x, y)) + return; - if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); - else - DrawGraphicThruMask(sx, sy, graphic, frame); - } + element = TILE_GFX_ELEMENT(x, y); - if (player_is_moving && last_element == EL_EXPLOSION) + /* crumble field itself */ + if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) { - int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING); - int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); - int phase = ExplodePhase[last_jx][last_jy] - 1; - int frame = getGraphicAnimationFrame(graphic, phase - delay); - - if (phase >= delay) - DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame); - } + if (!IN_SCR_FIELD(sx, sy)) + return; - /* ----------------------------------------------------------------------- */ - /* draw elements the player is just walking/passing through/under */ - /* ----------------------------------------------------------------------- */ + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - if (player_is_moving) - { - /* handle the field the player is leaving ... */ - if (IS_ACCESSIBLE_INSIDE(last_element)) - DrawLevelField(last_jx, last_jy); - else if (IS_ACCESSIBLE_UNDER(last_element)) - DrawLevelFieldThruMask(last_jx, last_jy); - } + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; #if 1 - /* do not redraw accessible elements if the player is just pushing them */ - if (!player_is_moving || !player->is_pushing) - { - /* ... and the field the player is entering */ - if (IS_ACCESSIBLE_INSIDE(element)) - DrawLevelField(jx, jy); - else if (IS_ACCESSIBLE_UNDER(element)) - DrawLevelFieldThruMask(jx, jy); - } - + element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : + BorderElement); #else + element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); +#endif + + /* check if neighbour field is of same type */ + if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) + continue; #if 0 - /* !!! I have forgotton what this should be good for !!! */ - /* !!! causes player being visible when pushing from within tubes !!! */ - if (!player->is_pushing) -#endif - { - /* ... and the field the player is entering */ - if (IS_ACCESSIBLE_INSIDE(element)) - DrawLevelField(jx, jy); - else if (IS_ACCESSIBLE_UNDER(element)) - DrawLevelFieldThruMask(jx, jy); - } + if (Feld[x][y] == EL_CUSTOM_START + 123) + printf("::: crumble [%d] THE CHAOS ENGINE (%d, %d): %d, %d\n", + i, Feld[x][y], element, + GFX_CRUMBLED(element), IS_MOVING(x, y)); #endif - if (setup.direct_draw) - { - int dest_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX; - int dest_y = SY + SCREENY(MIN(jy, last_jy)) * TILEY; - int x_size = TILEX * (1 + ABS(jx - last_jx)); - int y_size = TILEY * (1 + ABS(jy - last_jy)); - - BlitBitmap(drawto_field, window, - dest_x, dest_y, x_size, y_size, dest_x, dest_y); - SetDrawtoField(DRAW_DIRECT); - } + if (i == 1 || i == 2) + { + width = crumbled_border_size; + height = TILEY; + cx = (i == 2 ? TILEX - crumbled_border_size : 0); + cy = 0; + } + else + { + width = TILEX; + height = crumbled_border_size; + cx = 0; + cy = (i == 3 ? TILEY - crumbled_border_size : 0); + } - MarkTileDirty(sx, sy); -} + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, + width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); + } -inline void getGraphicSourceExt(int graphic, int frame, Bitmap **bitmap, - int *x, int *y, boolean get_backside) -{ - struct GraphicInfo *g = &graphic_info[graphic]; - int src_x = g->src_x + (get_backside ? g->offset2_x : 0); - int src_y = g->src_y + (get_backside ? g->offset2_y : 0); + MarkTileDirty(sx, sy); + } + else /* crumble neighbour fields */ + { +#if 0 + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); +#endif - *bitmap = g->bitmap; + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; - if (g->offset_y == 0) /* frames are ordered horizontally */ - { - int max_width = g->anim_frames_per_line * g->width; #if 1 - int pos = (src_y / g->height) * max_width + src_x + frame * g->offset_x; + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + IS_MOVING(xx, yy)) + continue; - *x = pos % max_width; - *y = src_y % g->height + pos / max_width * g->height; + element = TILE_GFX_ELEMENT(xx, yy); + + if (!GFX_CRUMBLED(element)) + continue; #else - *x = (src_x + frame * g->offset_x) % max_width; - *y = src_y + (src_x + frame * g->offset_x) / max_width * g->height; + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !GFX_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; #endif - } - else if (g->offset_x == 0) /* frames are ordered vertically */ - { - int max_height = g->anim_frames_per_line * g->height; + #if 1 - int pos = (src_x / g->width) * max_height + src_y + frame * g->offset_y; + graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); + crumbled_border_size = graphic_info[graphic].border_size; - *x = src_x % g->width + pos / max_height * g->width; - *y = pos % max_height; -#else - *x = src_x + (src_y + frame * g->offset_y) / max_height * g->width; - *y = (src_y + frame * g->offset_y) % max_height; + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); #endif - } - else /* frames are ordered diagonally */ - { - *x = src_x + frame * g->offset_x; - *y = src_y + frame * g->offset_y; + + if (i == 1 || i == 2) + { + width = crumbled_border_size; + height = TILEY; + cx = (i == 1 ? TILEX - crumbled_border_size : 0); + cy = 0; + } + else + { + width = TILEX; + height = crumbled_border_size; + cx = 0; + cy = (i == 0 ? TILEY - crumbled_border_size : 0); + } + + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, + width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); + + MarkTileDirty(sxx, syy); + } } } -void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y) +void DrawLevelFieldCrumbledSand(int x, int y) { - getGraphicSourceExt(graphic, frame, bitmap, x, y, FALSE); -} +#if 1 + int graphic; -void DrawGraphic(int x, int y, int graphic, int frame) -{ -#if DEBUG - if (!IN_SCR_FIELD(x, y)) - { - printf("DrawGraphic(): x = %d, y = %d, graphic = %d\n", x, y, graphic); - printf("DrawGraphic(): This should never happen!\n"); + if (!IN_LEV_FIELD(x, y)) return; - } -#endif - DrawGraphicExt(drawto_field, FX + x * TILEX, FY + y * TILEY, graphic, frame); - MarkTileDirty(x, y); + graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); + + DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); +#else + DrawLevelFieldCrumbledSandExt(x, y, IMG_SAND_CRUMBLED, 0); +#endif } -void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, - int frame) +void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, + int step_frame) { - Bitmap *src_bitmap; - int src_x, src_y; +#if 1 + int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); + int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); +#else + int graphic1 = el_act_dir2img(EL_SAND, ACTION_DIGGING, direction); + int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction); +#endif + int frame1 = getGraphicAnimationFrame(graphic1, step_frame); + int frame2 = getGraphicAnimationFrame(graphic2, step_frame); + int sx = SCREENX(x), sy = SCREENY(y); - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); + DrawGraphic(sx, sy, graphic1, frame1); + DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); } -void DrawGraphicThruMask(int x, int y, int graphic, int frame) +void DrawLevelFieldCrumbledSandNeighbours(int x, int y) { -#if DEBUG - if (!IN_SCR_FIELD(x, y)) + int sx = SCREENX(x), sy = SCREENY(y); + static int xy[4][2] = { - 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, - frame); - MarkTileDirty(x, y); -} - -void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic, - int frame) -{ -#if 1 - Bitmap *src_bitmap; - int src_x, src_y; - GC drawing_gc; - - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - drawing_gc = src_bitmap->stored_clip_gc; -#else - GC drawing_gc = src_bitmap->stored_clip_gc; - 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; + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + int i; - src_x += frame * offset_x; - src_y += frame * offset_y; + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; -#endif + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !GFX_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; - 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); + DrawLevelField(xx, yy); + } } -void DrawMiniGraphic(int x, int y, int graphic) +static int getBorderElement(int x, int y) { - DrawMiniGraphicExt(drawto, SX + x * MINI_TILEX,SY + y * MINI_TILEY, graphic); - MarkTileDirty(x / 2, y / 2); + 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 getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +void DrawScreenElement(int x, int y, int element) { - struct GraphicInfo *g = &graphic_info[graphic]; - int mini_startx = 0; - int mini_starty = g->bitmap->height * 2 / 3; - - *bitmap = g->bitmap; - *x = mini_startx + g->src_x / 2; - *y = mini_starty + g->src_y / 2; + DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); + DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); } -void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) +void DrawLevelElement(int x, int y, int element) { - Bitmap *src_bitmap; - int src_x, src_y; - - getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y); + if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawScreenElement(SCREENX(x), SCREENY(y), element); } -void DrawGraphicShifted(int x, int y, int dx, int dy, int graphic, int frame, - int cut_mode, int mask_mode) +void DrawScreenField(int x, int y) { - Bitmap *src_bitmap; - GC drawing_gc; - int src_x, src_y; - int width = TILEX, height = TILEY; - int cx = 0, cy = 0; - int dest_x, dest_y; + int lx = LEVELX(x), ly = LEVELY(y); + int element, content; - if (graphic < 0) + if (!IN_LEV_FIELD(lx, ly)) { - DrawGraphic(x, y, graphic, frame); + if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy) + element = EL_EMPTY; + else + element = getBorderElement(lx, ly); + + DrawScreenElement(x, y, element); return; } - if (dx || dy) /* shifted graphic */ + element = Feld[lx][ly]; + content = Store[lx][ly]; + + if (IS_MOVING(lx, ly)) { - if (x < BX1) /* object enters playfield from the left */ - { - x = BX1; - width = dx; - cx = TILEX - dx; - dx = 0; - } - else if (x > BX2) /* object enters playfield from the right */ - { - x = BX2; - width = -dx; - dx = TILEX + dx; - } - else if (x==BX1 && dx < 0) /* object leaves playfield to the left */ - { - width += dx; - cx = -dx; - dx = 0; - } - else if (x==BX2 && dx > 0) /* object leaves playfield to the right */ - width -= dx; - else if (dx) /* general horizontal movement */ - MarkTileDirty(x + SIGN(dx), y); + int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT); + boolean cut_mode = NO_CUTTING; - if (y < BY1) /* object enters playfield from the top */ - { - if (cut_mode==CUT_BELOW) /* object completely above top border */ - return; + if (element == EL_QUICKSAND_EMPTYING || + element == EL_MAGIC_WALL_EMPTYING || + element == EL_BD_MAGIC_WALL_EMPTYING || + element == EL_AMOEBA_DROPPING) + 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; - y = BY1; - height = dy; - cy = TILEY - dy; - dy = 0; - } - else if (y > BY2) /* object enters playfield from the bottom */ - { - y = BY2; - height = -dy; - dy = TILEY + dy; - } - else if (y==BY1 && dy < 0) /* object leaves playfield to the top */ - { - height += dy; - cy = -dy; - dy = 0; - } - else if (dy > 0 && cut_mode == CUT_ABOVE) + if (cut_mode == CUT_ABOVE) + DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING); + else + DrawScreenElement(x, y, EL_EMPTY); + + if (horiz_move) + DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING); + else if (cut_mode == NO_CUTTING) + DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], element, cut_mode); + else + DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode); + + if (content == EL_ACID) { - if (y == BY2) /* object completely above bottom border */ - return; + int dir = MovDir[lx][ly]; + int newlx = lx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0); + int newly = ly + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0); - height = dy; - cy = TILEY - dy; - dy = TILEY; - MarkTileDirty(x, y + 1); - } /* object leaves playfield to the bottom */ - else if (dy > 0 && (y == BY2 || cut_mode == CUT_BELOW)) - height -= dy; - else if (dy) /* general vertical movement */ - MarkTileDirty(x, y + SIGN(dy)); + DrawLevelElementThruMask(newlx, newly, EL_ACID); + } } + else if (IS_BLOCKED(lx, ly)) + { + int oldx, oldy; + int sx, sy; + int horiz_move; + boolean cut_mode = NO_CUTTING; + int element_old, content_old; -#if 1 - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#else - 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; - - src_x += frame * offset_x; - src_y += frame * offset_y; -#endif - - drawing_gc = src_bitmap->stored_clip_gc; + Blocked2Moving(lx, ly, &oldx, &oldy); + sx = SCREENX(oldx); + sy = SCREENY(oldy); + horiz_move = (MovDir[oldx][oldy] == MV_LEFT || + MovDir[oldx][oldy] == MV_RIGHT); - src_x += cx; - src_y += cy; + element_old = Feld[oldx][oldy]; + content_old = Store[oldx][oldy]; - dest_x = FX + x * TILEX + dx; - dest_y = FY + y * TILEY + dy; + if (element_old == EL_QUICKSAND_EMPTYING || + element_old == EL_MAGIC_WALL_EMPTYING || + element_old == EL_BD_MAGIC_WALL_EMPTYING || + element_old == EL_AMOEBA_DROPPING) + cut_mode = CUT_ABOVE; -#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 + DrawScreenElement(x, y, EL_EMPTY); - 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); + if (horiz_move) + DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old, + NO_CUTTING); + else if (cut_mode == NO_CUTTING) + DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old, + cut_mode); + else + DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old, + cut_mode); } + else if (IS_DRAWABLE(element)) + DrawScreenElement(x, y, element); else - BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, - dest_x, dest_y); - - MarkTileDirty(x, y); + DrawScreenElement(x, y, EL_EMPTY); } -void DrawGraphicShiftedThruMask(int x, int y, int dx, int dy, int graphic, - int frame, int cut_mode) +void DrawLevelField(int x, int y) { - DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, USE_MASKING); -} + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawScreenField(SCREENX(x), SCREENY(y)); + else if (IS_MOVING(x, y)) + { + int newx,newy; -void DrawScreenElementExt(int x, int y, int dx, int dy, int element, - int cut_mode, int mask_mode) -{ - 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], GfxDir[lx][ly]); - frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]); - } - else /* border element */ - { - graphic = el2img(element); - frame = getGraphicAnimationFrame(graphic, -1); + Moving2Blocked(x, y, &newx, &newy); + if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) + DrawScreenField(SCREENX(newx), SCREENY(newy)); } - - if (element == EL_EXPANDABLE_WALL) + else if (IS_BLOCKED(x, y)) { - boolean left_stopped = FALSE, right_stopped = FALSE; - - if (!IN_LEV_FIELD(lx - 1, ly) || IS_WALL(Feld[lx - 1][ly])) - left_stopped = TRUE; - if (!IN_LEV_FIELD(lx + 1, ly) || IS_WALL(Feld[lx + 1][ly])) - right_stopped = TRUE; + int oldx, oldy; - if (left_stopped && right_stopped) - graphic = IMG_WALL; - else if (left_stopped) - { - graphic = IMG_EXPANDABLE_WALL_GROWING_RIGHT; - frame = graphic_info[graphic].anim_frames - 1; - } - else if (right_stopped) - { - graphic = IMG_EXPANDABLE_WALL_GROWING_LEFT; - frame = graphic_info[graphic].anim_frames - 1; - } + Blocked2Moving(x, y, &oldx, &oldy); + if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy))) + DrawScreenField(SCREENX(oldx), SCREENY(oldy)); } - - if (dx || dy) - DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode); - else if (mask_mode == USE_MASKING) - DrawGraphicThruMask(x, y, graphic, frame); - else - DrawGraphic(x, y, graphic, frame); -} - -void DrawLevelElementExt(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))) - DrawScreenElementExt(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) +void DrawMiniElement(int x, int y, int element) { - DrawScreenElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING); -} + int graphic; -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); + graphic = el2edimg(element); + DrawMiniGraphic(x, y, graphic); } -void DrawLevelElementThruMask(int x, int y, int element) +void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) { - DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); -} + int x = sx + scroll_x, y = sy + scroll_y; -void DrawLevelFieldThruMask(int x, int y) -{ - DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); + if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy) + DrawMiniElement(sx, sy, EL_EMPTY); + else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy) + DrawMiniElement(sx, sy, Feld[x][y]); + else + DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y))); } -#define TILE_GFX_ELEMENT(x, y) \ - (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ - GfxElement[x][y] : Feld[x][y]) - -static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) +void DrawEnvelopeBackground(int envelope_nr, int startx, int starty, + int x, int y, int xsize, int ysize, int font_nr) { + int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; Bitmap *src_bitmap; int src_x, src_y; - int sx = SCREENX(x), sy = SCREENY(y); - int element; - int width, height, cx, cy, i; -#if 1 - int crumbled_border_size = graphic_info[graphic].border_size; -#else - int snip = TILEX / 8; /* number of border pixels from "crumbled graphic" */ -#endif - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + int dst_x = SX + startx + x * font_width; + int dst_y = SY + starty + y * font_height; + int width = graphic_info[graphic].width; + int height = graphic_info[graphic].height; + int inner_width = MAX(width - 2 * font_width, font_width); + int inner_height = MAX(height - 2 * font_height, font_height); + int inner_sx = (width >= 3 * font_width ? font_width : 0); + int inner_sy = (height >= 3 * font_height ? font_height : 0); + boolean draw_masked = graphic_info[graphic].draw_masked; -#if 0 - if (x == 0 && y == 7) - printf("::: %d, %d [%d]\n", GfxElement[x][y], Feld[x][y], - crumbled_border_size); -#endif + getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); - if (!IN_LEV_FIELD(x, y)) + if (src_bitmap == NULL || width < font_width || height < font_height) + { + ClearRectangle(drawto, dst_x, dst_y, font_width, font_height); return; + } - element = TILE_GFX_ELEMENT(x, y); + src_x += (x == 0 ? 0 : x == xsize - 1 ? width - font_width : + inner_sx + (x - 1) * font_width % inner_width); + src_y += (y == 0 ? 0 : y == ysize - 1 ? height - font_height : + inner_sy + (y - 1) * font_height % inner_height); - /* crumble field itself */ - if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) + if (draw_masked) { - if (!IN_SCR_FIELD(sx, sy)) - return; - - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - - for (i = 0; i < 4; i++) - { - int xx = x + xy[i][0]; - int yy = y + xy[i][1]; + SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, + dst_x - src_x, dst_y - src_y); + BlitBitmapMasked(src_bitmap, drawto, src_x, src_y, font_width, font_height, + dst_x, dst_y); + } + else + BlitBitmap(src_bitmap, drawto, src_x, src_y, font_width, font_height, + dst_x, dst_y); +} +void AnimateEnvelope(int envelope_nr, int anim_mode, int action) +{ + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; #if 1 - element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : - BorderElement); + Bitmap *src_bitmap = graphic_info[graphic].bitmap; + int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND); #else - element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); + boolean draw_masked = graphic_info[graphic].draw_masked; + int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); #endif + boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); + unsigned long anim_delay = 0; + int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + int anim_delay_value = (no_delay ? 0 : frame_delay_value); + int font_nr = FONT_ENVELOPE_1 + envelope_nr; + int font_width = getFontWidth(font_nr); + int font_height = getFontHeight(font_nr); + int max_xsize = level.envelope_xsize[envelope_nr]; + int max_ysize = level.envelope_ysize[envelope_nr]; + int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize : 0); + int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize : 0); + int xend = max_xsize; + int yend = (anim_mode != ANIM_DEFAULT ? max_ysize : 0); + int xstep = (xstart < xend ? 1 : 0); + int ystep = (ystart < yend || xstep == 0 ? 1 : 0); + int x, y; - /* check if neighbour field is of same type */ - if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) - continue; + for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep) + { + int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2; + int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2; + int sx = (SXSIZE - xsize * font_width) / 2; + int sy = (SYSIZE - ysize * font_height) / 2; + int xx, yy; -#if 0 - if (Feld[x][y] == EL_CUSTOM_START + 123) - printf("::: crumble [%d] THE CHAOS ENGINE (%d, %d): %d, %d\n", - i, Feld[x][y], element, - GFX_CRUMBLED(element), IS_MOVING(x, y)); -#endif + SetDrawtoField(DRAW_BUFFERED); - if (i == 1 || i == 2) - { - width = crumbled_border_size; - height = TILEY; - cx = (i == 2 ? TILEX - crumbled_border_size : 0); - cy = 0; - } - else - { - width = TILEX; - height = crumbled_border_size; - cx = 0; - cy = (i == 3 ? TILEY - crumbled_border_size : 0); - } + BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); - } + SetDrawtoField(DRAW_BACKBUFFER); - MarkTileDirty(sx, sy); - } - else /* crumble neighbour fields */ - { -#if 0 - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#endif + for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) + DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); - for (i = 0; i < 4; i++) - { - int xx = x + xy[i][0]; - int yy = y + xy[i][1]; - int sxx = sx + xy[i][0]; - int syy = sy + xy[i][1]; + DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, + level.envelope_text[envelope_nr], font_nr, max_xsize, + xsize - 2, ysize - 2, mask_mode); -#if 1 - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - IS_MOVING(xx, yy)) - continue; + redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; + BackToFront(); - element = TILE_GFX_ELEMENT(xx, yy); + WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); + } +} - if (!GFX_CRUMBLED(element)) - continue; -#else - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - !GFX_CRUMBLED(Feld[xx][yy]) || - IS_MOVING(xx, yy)) - continue; -#endif +void ShowEnvelope(int envelope_nr) +{ + int element = EL_ENVELOPE_1 + envelope_nr; + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; + int sound_opening = element_info[element].sound[ACTION_OPENING]; + int sound_closing = element_info[element].sound[ACTION_CLOSING]; + boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); + int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1); + int wait_delay_value = (no_delay ? 0 : normal_delay_value); + int anim_mode = graphic_info[graphic].anim_mode; + int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL: + anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode); -#if 1 - graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); - crumbled_border_size = graphic_info[graphic].border_size; + game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#endif + PlaySoundStereo(sound_opening, SOUND_MIDDLE); - if (i == 1 || i == 2) - { - width = crumbled_border_size; - height = TILEY; - cx = (i == 1 ? TILEX - crumbled_border_size : 0); - cy = 0; - } - else - { - width = TILEX; - height = crumbled_border_size; - cx = 0; - cy = (i == 0 ? TILEY - crumbled_border_size : 0); - } + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); - MarkTileDirty(sxx, syy); - } - } -} + if (tape.playing) + Delay(wait_delay_value); + else + WaitForEventToContinue(); -void DrawLevelFieldCrumbledSand(int x, int y) -{ -#if 1 - int graphic; + PlaySoundStereo(sound_closing, SOUND_MIDDLE); - if (!IN_LEV_FIELD(x, y)) - return; + if (anim_mode != ANIM_NONE) + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); - graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_CLOSING); - DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); -#else - DrawLevelFieldCrumbledSandExt(x, y, IMG_SAND_CRUMBLED, 0); -#endif -} + game.envelope_active = FALSE; -void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, - int step_frame) -{ -#if 1 - int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); - int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); -#else - int graphic1 = el_act_dir2img(EL_SAND, ACTION_DIGGING, direction); - int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction); -#endif - int frame1 = getGraphicAnimationFrame(graphic1, step_frame); - int frame2 = getGraphicAnimationFrame(graphic2, step_frame); - int sx = SCREENX(x), sy = SCREENY(y); + SetDrawtoField(DRAW_BUFFERED); - DrawGraphic(sx, sy, graphic1, frame1); - DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); + redraw_mask |= REDRAW_FIELD; + BackToFront(); } -void DrawLevelFieldCrumbledSandNeighbours(int x, int y) +void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { - int sx = SCREENX(x), sy = SCREENY(y); - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; - int i; - - for (i = 0; i < 4; i++) - { - int xx = x + xy[i][0]; - int yy = y + xy[i][1]; - int sxx = sx + xy[i][0]; - int syy = sy + xy[i][1]; - - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - !GFX_CRUMBLED(Feld[xx][yy]) || - IS_MOVING(xx, yy)) - continue; + 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; - DrawLevelField(xx, yy); - } + *bitmap = src_bitmap; + *x = src_x; + *y = src_y; } -static int getBorderElement(int x, int y) +void DrawMicroElement(int xpos, int ypos, int element) { - 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); + Bitmap *src_bitmap; + int src_x, src_y; + int graphic = el2preimg(element); - return border[steel_position][steel_type]; + getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY, + xpos, ypos); } -void DrawScreenElement(int x, int y, int element) +void DrawLevel() { - DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); - DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); -} + int x,y; -void DrawLevelElement(int x, int y, int element) -{ - if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawScreenElement(SCREENX(x), SCREENY(y), element); + SetDrawBackgroundMask(REDRAW_NONE); + ClearWindow(); + + for (x = BX1; x <= BX2; x++) + for (y = BY1; y <= BY2; y++) + DrawScreenField(x, y); + + redraw_mask |= REDRAW_FIELD; } -void DrawScreenField(int x, int y) +void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) { - int lx = LEVELX(x), ly = LEVELY(y); - int element, content; - - if (!IN_LEV_FIELD(lx, ly)) - { - if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy) - element = EL_EMPTY; - else - element = getBorderElement(lx, ly); + int x,y; - DrawScreenElement(x, y, element); - return; - } + for (x = 0; x < size_x; x++) + for (y = 0; y < size_y; y++) + DrawMiniElementOrWall(x, y, scroll_x, scroll_y); - element = Feld[lx][ly]; - content = Store[lx][ly]; + redraw_mask |= REDRAW_FIELD; +} - if (IS_MOVING(lx, ly)) - { - int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT); - boolean cut_mode = NO_CUTTING; +static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) +{ + int x, y; - if (element == EL_QUICKSAND_EMPTYING || - element == EL_MAGIC_WALL_EMPTYING || - element == EL_BD_MAGIC_WALL_EMPTYING || - element == EL_AMOEBA_DROPPING) - 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; + DrawBackground(xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE); - if (cut_mode == CUT_ABOVE) - DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING); - else - DrawScreenElement(x, y, EL_EMPTY); + if (lev_fieldx < STD_LEV_FIELDX) + xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX; + if (lev_fieldy < STD_LEV_FIELDY) + ypos += (STD_LEV_FIELDY - lev_fieldy) / 2 * MICRO_TILEY; - if (horiz_move) - DrawScreenElementShifted(x, y, MovPos[lx][ly], 0, element, NO_CUTTING); - else if (cut_mode == NO_CUTTING) - DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], element, cut_mode); - else - DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode); + xpos += MICRO_TILEX; + ypos += MICRO_TILEY; - if (content == EL_ACID) + for (x = -1; x <= STD_LEV_FIELDX; x++) + { + for (y = -1; y <= STD_LEV_FIELDY; y++) { - int dir = MovDir[lx][ly]; - int newlx = lx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0); - int newly = ly + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0); + int lx = from_x + x, ly = from_y + y; - DrawLevelElementThruMask(newlx, newly, EL_ACID); + if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy) + DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, + level.field[lx][ly]); + 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, + getBorderElement(lx, ly)); } } - else if (IS_BLOCKED(lx, ly)) - { - int oldx, oldy; - int sx, sy; - int horiz_move; - boolean cut_mode = NO_CUTTING; - int element_old, content_old; - Blocked2Moving(lx, ly, &oldx, &oldy); - sx = SCREENX(oldx); - sy = SCREENY(oldy); - horiz_move = (MovDir[oldx][oldy] == MV_LEFT || - MovDir[oldx][oldy] == MV_RIGHT); + redraw_mask |= REDRAW_MICROLEVEL; +} - element_old = Feld[oldx][oldy]; - content_old = Store[oldx][oldy]; +#define MICROLABEL_EMPTY 0 +#define MICROLABEL_LEVEL_NAME 1 +#define MICROLABEL_CREATED_BY 2 +#define MICROLABEL_LEVEL_AUTHOR 3 +#define MICROLABEL_IMPORTED_FROM 4 +#define MICROLABEL_LEVEL_IMPORT_INFO 5 - if (element_old == EL_QUICKSAND_EMPTYING || - element_old == EL_MAGIC_WALL_EMPTYING || - element_old == EL_BD_MAGIC_WALL_EMPTYING || - element_old == EL_AMOEBA_DROPPING) - cut_mode = CUT_ABOVE; +static void DrawMicroLevelLabelExt(int mode) +{ + char label_text[MAX_OUTPUT_LINESIZE + 1]; + int max_len_label_text; + int font_nr = FONT_TEXT_2; - DrawScreenElement(x, y, EL_EMPTY); + if (mode == MICROLABEL_CREATED_BY || mode == MICROLABEL_IMPORTED_FROM) + font_nr = FONT_TEXT_3; - if (horiz_move) - DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old, - NO_CUTTING); - else if (cut_mode == NO_CUTTING) - DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old, - cut_mode); - else - DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old, - cut_mode); + max_len_label_text = SXSIZE / getFontWidth(font_nr); + + DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, getFontHeight(font_nr)); + + strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name : + mode == MICROLABEL_CREATED_BY ? "created by" : + mode == MICROLABEL_LEVEL_AUTHOR ? level.author : + mode == MICROLABEL_IMPORTED_FROM ? "imported from" : + mode == MICROLABEL_LEVEL_IMPORT_INFO ? + leveldir_current->imported_from : ""), + max_len_label_text); + label_text[max_len_label_text] = '\0'; + + if (strlen(label_text) > 0) + { + int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; + int lypos = MICROLABEL_YPOS; + + DrawText(lxpos, lypos, label_text, font_nr); } - else if (IS_DRAWABLE(element)) - DrawScreenElement(x, y, element); - else - DrawScreenElement(x, y, EL_EMPTY); + + redraw_mask |= REDRAW_MICROLEVEL; } -void DrawLevelField(int x, int y) +void DrawMicroLevel(int xpos, int ypos, boolean restart) { - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawScreenField(SCREENX(x), SCREENY(y)); - else if (IS_MOVING(x, y)) + static unsigned long scroll_delay = 0; + static unsigned long label_delay = 0; + static int from_x, from_y, scroll_direction; + static int label_state, label_counter; + int last_game_status = game_status; /* save current game status */ + + /* force PREVIEW font on preview level */ + game_status = GAME_MODE_PSEUDO_PREVIEW; + + if (restart) { - int newx,newy; + from_x = from_y = 0; + scroll_direction = MV_RIGHT; + label_state = 1; + label_counter = 0; - Moving2Blocked(x, y, &newx, &newy); - if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) - DrawScreenField(SCREENX(newx), SCREENY(newy)); + DrawMicroLevelExt(xpos, ypos, from_x, from_y); + DrawMicroLevelLabelExt(label_state); + + /* initialize delay counters */ + DelayReached(&scroll_delay, 0); + DelayReached(&label_delay, 0); + + if (leveldir_current->name) + { + int text_width = getTextWidth(leveldir_current->name, FONT_TEXT_1); + int lxpos = SX + (SXSIZE - text_width) / 2; + int lypos = SY + 352; + + DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); + } + + game_status = last_game_status; /* restore current game status */ + + return; } - else if (IS_BLOCKED(x, y)) + + /* scroll micro level, if needed */ + if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) && + DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY)) { - int oldx, oldy; + switch (scroll_direction) + { + case MV_LEFT: + if (from_x > 0) + from_x--; + else + scroll_direction = MV_UP; + break; - Blocked2Moving(x, y, &oldx, &oldy); - if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy))) - DrawScreenField(SCREENX(oldx), SCREENY(oldy)); + case MV_RIGHT: + if (from_x < lev_fieldx - STD_LEV_FIELDX) + from_x++; + else + scroll_direction = MV_DOWN; + break; + + case MV_UP: + if (from_y > 0) + from_y--; + else + scroll_direction = MV_RIGHT; + break; + + case MV_DOWN: + if (from_y < lev_fieldy - STD_LEV_FIELDY) + from_y++; + else + scroll_direction = MV_LEFT; + break; + + default: + break; + } + + DrawMicroLevelExt(xpos, ypos, from_x, from_y); } -} -void DrawMiniElement(int x, int y, int element) -{ - int graphic; + /* redraw micro level label, if needed */ + if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 && + strcmp(level.author, ANONYMOUS_NAME) != 0 && + strcmp(level.author, leveldir_current->name) != 0 && + DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY)) + { + int max_label_counter = 23; - graphic = el2edimg(element); - DrawMiniGraphic(x, y, graphic); + if (leveldir_current->imported_from != NULL) + max_label_counter += 14; + + label_counter = (label_counter + 1) % max_label_counter; + label_state = (label_counter >= 0 && label_counter <= 7 ? + MICROLABEL_LEVEL_NAME : + label_counter >= 9 && label_counter <= 12 ? + MICROLABEL_CREATED_BY : + label_counter >= 14 && label_counter <= 21 ? + MICROLABEL_LEVEL_AUTHOR : + label_counter >= 23 && label_counter <= 26 ? + MICROLABEL_IMPORTED_FROM : + label_counter >= 28 && label_counter <= 35 ? + MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY); + DrawMicroLevelLabelExt(label_state); + } + + game_status = last_game_status; /* restore current game status */ } -void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) +inline void DrawGraphicAnimationExt(DrawBuffer *dst_bitmap, int x, int y, + int graphic, int sync_frame, int mask_mode) { - int x = sx + scroll_x, y = sy + scroll_y; + int frame = getGraphicAnimationFrame(graphic, sync_frame); - if (x < -1 || x > lev_fieldx || y < -1 || y > lev_fieldy) - DrawMiniElement(sx, sy, EL_EMPTY); - else if (x > -1 && x < lev_fieldx && y > -1 && y < lev_fieldy) - DrawMiniElement(sx, sy, Feld[x][y]); + if (mask_mode == USE_MASKING) + DrawGraphicThruMaskExt(dst_bitmap, x, y, graphic, frame); else - DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y))); + DrawGraphicExt(dst_bitmap, x, y, graphic, frame); } -void DrawEnvelopeBackground(int envelope_nr, int startx, int starty, - int x, int y, int xsize, int ysize, int font_nr) +inline void DrawGraphicAnimation(int x, int y, int graphic) { - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; - Bitmap *src_bitmap; - int src_x, src_y; - int dst_x = SX + startx + x * font_width; - int dst_y = SY + starty + y * font_height; - int width = graphic_info[graphic].width; - int height = graphic_info[graphic].height; - int inner_width = MAX(width - 2 * font_width, font_width); - int inner_height = MAX(height - 2 * font_height, font_height); - int inner_sx = (width >= 3 * font_width ? font_width : 0); - int inner_sy = (height >= 3 * font_height ? font_height : 0); - boolean draw_masked = graphic_info[graphic].draw_masked; - - getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); + int lx = LEVELX(x), ly = LEVELY(y); - if (src_bitmap == NULL || width < font_width || height < font_height) - { - ClearRectangle(drawto, dst_x, dst_y, font_width, font_height); + if (!IN_SCR_FIELD(x, y)) return; - } - src_x += (x == 0 ? 0 : x == xsize - 1 ? width - font_width : - inner_sx + (x - 1) * font_width % inner_width); - src_y += (y == 0 ? 0 : y == ysize - 1 ? height - font_height : - inner_sy + (y - 1) * font_height % inner_height); + DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY, + graphic, GfxFrame[lx][ly], NO_MASKING); + MarkTileDirty(x, y); +} - if (draw_masked) - { - SetClipOrigin(src_bitmap, src_bitmap->stored_clip_gc, - dst_x - src_x, dst_y - src_y); - BlitBitmapMasked(src_bitmap, drawto, src_x, src_y, font_width, font_height, - dst_x, dst_y); - } - else - BlitBitmap(src_bitmap, drawto, src_x, src_y, font_width, font_height, - dst_x, dst_y); +void DrawLevelGraphicAnimation(int x, int y, int graphic) +{ + DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); } -void AnimateEnvelope(int envelope_nr, int anim_mode, int action) +void DrawLevelElementAnimation(int x, int y, int element) { - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; #if 1 - Bitmap *src_bitmap = graphic_info[graphic].bitmap; - int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND); + int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); + + DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); #else - boolean draw_masked = graphic_info[graphic].draw_masked; - int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); + DrawGraphicAnimation(SCREENX(x), SCREENY(y), el2img(element)); #endif - boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.warp_forward); - unsigned long anim_delay = 0; - int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); - int anim_delay_value = (no_delay ? 0 : frame_delay_value); - int font_nr = FONT_ENVELOPE_1 + envelope_nr; - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); - int max_xsize = level.envelope_xsize[envelope_nr]; - int max_ysize = level.envelope_ysize[envelope_nr]; - int xstart = (anim_mode & ANIM_VERTICAL ? max_xsize : 0); - int ystart = (anim_mode & ANIM_HORIZONTAL ? max_ysize : 0); - int xend = max_xsize; - int yend = (anim_mode != ANIM_DEFAULT ? max_ysize : 0); - int xstep = (xstart < xend ? 1 : 0); - int ystep = (ystart < yend || xstep == 0 ? 1 : 0); - int x, y; +} + +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); + + if (GFX_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSand(x, y); +} + +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], GfxDir[x][y]); - for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep) - { - int xsize = (action == ACTION_CLOSING ? xend - (x - xstart) : x) + 2; - int ysize = (action == ACTION_CLOSING ? yend - (y - ystart) : y) + 2; - int sx = (SXSIZE - xsize * font_width) / 2; - int sy = (SYSIZE - ysize * font_height) / 2; - int xx, yy; + if (!IS_NEW_FRAME(GfxFrame[x][y], graphic)) + return; - SetDrawtoField(DRAW_BUFFERED); + DrawGraphicAnimation(sx, sy, graphic); - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + if (GFX_CRUMBLED(element)) + DrawLevelFieldCrumbledSand(x, y); +} - SetDrawtoField(DRAW_BACKBUFFER); +static int getPlayerGraphic(struct PlayerInfo *player, int move_dir) +{ + if (player->use_murphy_graphic) + { + /* this works only because currently only one player can be "murphy" ... */ + static int last_horizontal_dir = MV_LEFT; + int graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); - for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) - DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; - DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, - level.envelope_text[envelope_nr], font_nr, max_xsize, - xsize - 2, ysize - 2, mask_mode); + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + { + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + } - WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); + return graphic; } + else + return el_act_dir2img(player->element_nr, player->GfxAction, move_dir); } -void ShowEnvelope(int envelope_nr) +static boolean equalGraphics(int graphic1, int graphic2) { - int element = EL_ENVELOPE_1 + envelope_nr; - int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; - int sound_opening = element_info[element].sound[ACTION_OPENING]; - int sound_closing = element_info[element].sound[ACTION_CLOSING]; - boolean ffwd_delay = (tape.playing && tape.fast_forward); - boolean no_delay = (tape.warp_forward); - int normal_delay_value = ONE_SECOND_DELAY / (ffwd_delay ? 2 : 1); - int wait_delay_value = (no_delay ? 0 : normal_delay_value); - int anim_mode = graphic_info[graphic].anim_mode; - int main_anim_mode = (anim_mode == ANIM_NONE ? ANIM_VERTICAL|ANIM_HORIZONTAL: - anim_mode == ANIM_DEFAULT ? ANIM_VERTICAL : anim_mode); + struct GraphicInfo *g1 = &graphic_info[graphic1]; + struct GraphicInfo *g2 = &graphic_info[graphic2]; - game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ + return (g1->bitmap == g2->bitmap && + g1->src_x == g2->src_x && + g1->src_y == g2->src_y && + g1->anim_frames == g2->anim_frames && + g1->anim_delay == g2->anim_delay && + g1->anim_mode == g2->anim_mode); +} - PlaySoundStereo(sound_opening, SOUND_MIDDLE); +void DrawAllPlayers() +{ + int i; - if (anim_mode == ANIM_DEFAULT) - AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); + for (i = 0; i < MAX_PLAYERS; i++) + if (stored_player[i].active) + DrawPlayer(&stored_player[i]); +} - AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); +void DrawPlayerField(int x, int y) +{ + if (!IS_PLAYER(x, y)) + return; - if (tape.playing) - Delay(wait_delay_value); - else - WaitForEventToContinue(); + DrawPlayer(PLAYERINFO(x, y)); +} - PlaySoundStereo(sound_closing, SOUND_MIDDLE); +void DrawPlayer(struct PlayerInfo *player) +{ + int jx = player->jx; + int jy = player->jy; + int move_dir = player->MovDir; +#if 0 + int last_jx = player->last_jx; + int last_jy = player->last_jy; + int next_jx = jx + (jx - last_jx); + int next_jy = jy + (jy - last_jy); + boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); +#else + int dx = (move_dir == MV_LEFT ? -1 : move_dir == MV_RIGHT ? +1 : 0); + int dy = (move_dir == MV_UP ? -1 : move_dir == MV_DOWN ? +1 : 0); + int last_jx = (player->is_moving ? jx - dx : jx); + int last_jy = (player->is_moving ? jy - dy : jy); + int next_jx = jx + dx; + int next_jy = jy + dy; + boolean player_is_moving = (player->MovPos ? TRUE : FALSE); +#endif + 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; + int action = ACTION_DEFAULT; + int last_player_graphic = getPlayerGraphic(player, move_dir); + int last_player_frame = player->Frame; + int frame = 0; - if (anim_mode != ANIM_NONE) - AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); + if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) + return; - if (anim_mode == ANIM_DEFAULT) - AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_CLOSING); +#if DEBUG + if (!IN_LEV_FIELD(jx, jy)) + { + printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy); + printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy); + printf("DrawPlayerField(): This should never happen!\n"); + return; + } +#endif - game.envelope_active = FALSE; + if (element == EL_EXPLOSION) + return; - SetDrawtoField(DRAW_BUFFERED); + action = (player->is_pushing ? ACTION_PUSHING : + player->is_digging ? ACTION_DIGGING : + player->is_collecting ? ACTION_COLLECTING : + player->is_moving ? ACTION_MOVING : + player->is_snapping ? ACTION_SNAPPING : + player->is_dropping ? ACTION_DROPPING : + player->is_waiting ? player->action_waiting : ACTION_DEFAULT); - redraw_mask |= REDRAW_FIELD; - BackToFront(); -} + InitPlayerGfxAnimation(player, action, move_dir); -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; + /* ----------------------------------------------------------------------- */ + /* draw things in the field the player is leaving, if needed */ + /* ----------------------------------------------------------------------- */ - *bitmap = src_bitmap; - *x = src_x; - *y = src_y; -} +#if 1 + if (player->is_moving) +#else + if (player_is_moving) +#endif + { + if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element)) + { + DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]); -void DrawMicroElement(int xpos, int ypos, int element) -{ - Bitmap *src_bitmap; - int src_x, src_y; - int graphic = el2preimg(element); + if (last_element == EL_DYNAMITE_ACTIVE || + last_element == EL_SP_DISK_RED_ACTIVE) + DrawDynamite(last_jx, last_jy); + else + DrawLevelFieldThruMask(last_jx, last_jy); + } + else if (last_element == EL_DYNAMITE_ACTIVE || + last_element == EL_SP_DISK_RED_ACTIVE) + DrawDynamite(last_jx, last_jy); + else + DrawLevelField(last_jx, last_jy); - getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY, - xpos, ypos); -} + if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) + DrawLevelElement(next_jx, next_jy, EL_EMPTY); + } -void DrawLevel() -{ - int x,y; + if (!IN_SCR_FIELD(sx, sy)) + return; - SetDrawBackgroundMask(REDRAW_NONE); - ClearWindow(); + if (setup.direct_draw) + SetDrawtoField(DRAW_BUFFERED); - for (x = BX1; x <= BX2; x++) - for (y = BY1; y <= BY2; y++) - DrawScreenField(x, y); + /* ----------------------------------------------------------------------- */ + /* draw things behind the player, if needed */ + /* ----------------------------------------------------------------------- */ - redraw_mask |= REDRAW_FIELD; -} + if (Back[jx][jy]) + DrawLevelElement(jx, jy, Back[jx][jy]); + else if (IS_ACTIVE_BOMB(element)) + DrawLevelElement(jx, jy, EL_EMPTY); + else + { + if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) + { + if (GFX_CRUMBLED(GfxElement[jx][jy])) + DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); + else + { + int old_element = GfxElement[jx][jy]; + int old_graphic = el_act_dir2img(old_element, action, move_dir); + int frame = getGraphicAnimationFrame(old_graphic, player->StepFrame); -void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) -{ - int x,y; + DrawGraphic(sx, sy, old_graphic, frame); + } + } + else + { + GfxElement[jx][jy] = EL_UNDEFINED; - for (x = 0; x < size_x; x++) - for (y = 0; y < size_y; y++) - DrawMiniElementOrWall(x, y, scroll_x, scroll_y); + DrawLevelField(jx, jy); + } + } - redraw_mask |= REDRAW_FIELD; -} + /* ----------------------------------------------------------------------- */ + /* draw player himself */ + /* ----------------------------------------------------------------------- */ -static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) -{ - int x, y; +#if 1 + + graphic = getPlayerGraphic(player, move_dir); + + /* in the case of changed player action or direction, prevent the current + animation frame from being restarted for identical animations */ + if (player->Frame == 0 && equalGraphics(graphic, last_player_graphic)) + player->Frame = last_player_frame; + +#else - DrawBackground(xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE); + if (player->use_murphy_graphic) + { + static int last_horizontal_dir = MV_LEFT; - if (lev_fieldx < STD_LEV_FIELDX) - xpos += (STD_LEV_FIELDX - lev_fieldx) / 2 * MICRO_TILEX; - if (lev_fieldy < STD_LEV_FIELDY) - ypos += (STD_LEV_FIELDY - lev_fieldy) / 2 * MICRO_TILEY; + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; - xpos += MICRO_TILEX; - ypos += MICRO_TILEY; + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); - for (x = -1; x <= STD_LEV_FIELDX; x++) - { - for (y = -1; y <= STD_LEV_FIELDY; y++) + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ { - int lx = from_x + x, ly = from_y + y; + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - if (lx >= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy) - DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, - level.field[lx][ly]); - 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, - getBorderElement(lx, ly)); + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); } } + else + graphic = el_act_dir2img(player->element_nr, player->GfxAction, move_dir); - redraw_mask |= REDRAW_MICROLEVEL; -} - -#define MICROLABEL_EMPTY 0 -#define MICROLABEL_LEVEL_NAME 1 -#define MICROLABEL_CREATED_BY 2 -#define MICROLABEL_LEVEL_AUTHOR 3 -#define MICROLABEL_IMPORTED_FROM 4 -#define MICROLABEL_LEVEL_IMPORT_INFO 5 - -static void DrawMicroLevelLabelExt(int mode) -{ - char label_text[MAX_OUTPUT_LINESIZE + 1]; - int max_len_label_text; - int font_nr = FONT_TEXT_2; +#endif - if (mode == MICROLABEL_CREATED_BY || mode == MICROLABEL_IMPORTED_FROM) - font_nr = FONT_TEXT_3; + frame = getGraphicAnimationFrame(graphic, player->Frame); - max_len_label_text = SXSIZE / getFontWidth(font_nr); + if (player->GfxPos) + { + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + sxx = player->GfxPos; + else + syy = player->GfxPos; + } - DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, getFontHeight(font_nr)); + if (!setup.soft_scrolling && ScreenMovPos) + sxx = syy = 0; - strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name : - mode == MICROLABEL_CREATED_BY ? "created by" : - mode == MICROLABEL_LEVEL_AUTHOR ? level.author : - mode == MICROLABEL_IMPORTED_FROM ? "imported from" : - mode == MICROLABEL_LEVEL_IMPORT_INFO ? - leveldir_current->imported_from : ""), - max_len_label_text); - label_text[max_len_label_text] = '\0'; + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); - if (strlen(label_text) > 0) + if (SHIELD_ON(player)) { - int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; - int lypos = MICROLABEL_YPOS; + int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE : + IMG_SHIELD_NORMAL_ACTIVE); + int frame = getGraphicAnimationFrame(graphic, -1); - DrawText(lxpos, lypos, label_text, font_nr); + DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); } - redraw_mask |= REDRAW_MICROLEVEL; -} - -void DrawMicroLevel(int xpos, int ypos, boolean restart) -{ - static unsigned long scroll_delay = 0; - static unsigned long label_delay = 0; - static int from_x, from_y, scroll_direction; - static int label_state, label_counter; - int last_game_status = game_status; /* save current game status */ + /* ----------------------------------------------------------------------- */ + /* draw things the player is pushing, if needed */ + /* ----------------------------------------------------------------------- */ - /* force PREVIEW font on preview level */ - game_status = GAME_MODE_PSEUDO_PREVIEW; +#if 0 + printf("::: %d, %d [%d, %d] [%d]\n", + player->is_pushing, player_is_moving, player->GfxAction, + player->is_moving, player_is_moving); +#endif - if (restart) +#if 1 + if (player->is_pushing && player->is_moving) +#else + if (player->is_pushing && player_is_moving) +#endif { - from_x = from_y = 0; - scroll_direction = MV_RIGHT; - label_state = 1; - label_counter = 0; - - DrawMicroLevelExt(xpos, ypos, from_x, from_y); - DrawMicroLevelLabelExt(label_state); + int px = SCREENX(next_jx), py = SCREENY(next_jy); - /* initialize delay counters */ - DelayReached(&scroll_delay, 0); - DelayReached(&label_delay, 0); + if (Back[next_jx][next_jy]) + DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); - if (leveldir_current->name) + if ((sxx || syy) && element == EL_SOKOBAN_OBJECT) + DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, + NO_CUTTING); + else { - int text_width = getTextWidth(leveldir_current->name, FONT_TEXT_1); - int lxpos = SX + (SXSIZE - text_width) / 2; - int lypos = SY + 352; + int element = MovingOrBlocked2Element(next_jx, next_jy); + int graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); +#if 1 + int frame = getGraphicAnimationFrame(graphic, player->StepFrame); +#else + int frame = getGraphicAnimationFrame(graphic, player->Frame); +#endif - DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); + DrawGraphicShifted(px, py, sxx, syy, graphic, frame, + NO_CUTTING, NO_MASKING); } + } - game_status = last_game_status; /* restore current game status */ + /* ----------------------------------------------------------------------- */ + /* draw things in front of player (active dynamite or dynabombs) */ + /* ----------------------------------------------------------------------- */ - return; + if (IS_ACTIVE_BOMB(element)) + { + graphic = el2img(element); + frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); + + if (game.emulation == EMU_SUPAPLEX) + DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); + else + DrawGraphicThruMask(sx, sy, graphic, frame); } - /* scroll micro level, if needed */ - if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) && - DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY)) + if (player_is_moving && last_element == EL_EXPLOSION) { - switch (scroll_direction) - { - case MV_LEFT: - if (from_x > 0) - from_x--; - else - scroll_direction = MV_UP; - break; - - case MV_RIGHT: - if (from_x < lev_fieldx - STD_LEV_FIELDX) - from_x++; - else - scroll_direction = MV_DOWN; - break; + int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING); + int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); + int phase = ExplodePhase[last_jx][last_jy] - 1; + int frame = getGraphicAnimationFrame(graphic, phase - delay); - case MV_UP: - if (from_y > 0) - from_y--; - else - scroll_direction = MV_RIGHT; - break; + if (phase >= delay) + DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame); + } - case MV_DOWN: - if (from_y < lev_fieldy - STD_LEV_FIELDY) - from_y++; - else - scroll_direction = MV_LEFT; - break; + /* ----------------------------------------------------------------------- */ + /* draw elements the player is just walking/passing through/under */ + /* ----------------------------------------------------------------------- */ - default: - break; - } + if (player_is_moving) + { + /* handle the field the player is leaving ... */ + if (IS_ACCESSIBLE_INSIDE(last_element)) + DrawLevelField(last_jx, last_jy); + else if (IS_ACCESSIBLE_UNDER(last_element)) + DrawLevelFieldThruMask(last_jx, last_jy); + } - DrawMicroLevelExt(xpos, ypos, from_x, from_y); +#if 1 + /* do not redraw accessible elements if the player is just pushing them */ + if (!player_is_moving || !player->is_pushing) + { + /* ... and the field the player is entering */ + if (IS_ACCESSIBLE_INSIDE(element)) + DrawLevelField(jx, jy); + else if (IS_ACCESSIBLE_UNDER(element)) + DrawLevelFieldThruMask(jx, jy); } - /* redraw micro level label, if needed */ - if (strcmp(level.name, NAMELESS_LEVEL_NAME) != 0 && - strcmp(level.author, ANONYMOUS_NAME) != 0 && - strcmp(level.author, leveldir_current->name) != 0 && - DelayReached(&label_delay, MICROLEVEL_LABEL_DELAY)) +#else + +#if 0 + /* !!! I have forgotton what this should be good for !!! */ + /* !!! causes player being visible when pushing from within tubes !!! */ + if (!player->is_pushing) +#endif { - int max_label_counter = 23; + /* ... and the field the player is entering */ + if (IS_ACCESSIBLE_INSIDE(element)) + DrawLevelField(jx, jy); + else if (IS_ACCESSIBLE_UNDER(element)) + DrawLevelFieldThruMask(jx, jy); + } +#endif - if (leveldir_current->imported_from != NULL) - max_label_counter += 14; + if (setup.direct_draw) + { + int dst_x = SX + SCREENX(MIN(jx, last_jx)) * TILEX; + int dst_y = SY + SCREENY(MIN(jy, last_jy)) * TILEY; + int x_size = TILEX * (1 + ABS(jx - last_jx)); + int y_size = TILEY * (1 + ABS(jy - last_jy)); - label_counter = (label_counter + 1) % max_label_counter; - label_state = (label_counter >= 0 && label_counter <= 7 ? - MICROLABEL_LEVEL_NAME : - label_counter >= 9 && label_counter <= 12 ? - MICROLABEL_CREATED_BY : - label_counter >= 14 && label_counter <= 21 ? - MICROLABEL_LEVEL_AUTHOR : - label_counter >= 23 && label_counter <= 26 ? - MICROLABEL_IMPORTED_FROM : - label_counter >= 28 && label_counter <= 35 ? - MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY); - DrawMicroLevelLabelExt(label_state); + BlitBitmap(drawto_field, window, + dst_x, dst_y, x_size, y_size, dst_x, dst_y); + SetDrawtoField(DRAW_DIRECT); } - game_status = last_game_status; /* restore current game status */ + MarkTileDirty(sx, sy); } +/* ------------------------------------------------------------------------- */ + void WaitForEventToContinue() { boolean still_wait = TRUE; @@ -5476,7 +5531,7 @@ void InitGraphicInfo_EM(void) i == Xboom_2 && j == 5 ? 6 : effective_action != action ? 0 : j); -#if 1 +#if 0 Bitmap *debug_bitmap = g_em->bitmap; int debug_src_x = g_em->src_x; int debug_src_y = g_em->src_y; diff --git a/src/tools.h b/src/tools.h index 18c196f1..f41b0f83 100644 --- a/src/tools.h +++ b/src/tools.h @@ -96,8 +96,6 @@ void DrawMiniGraphic(int, int, int); void getMiniGraphicSource(int, Bitmap **, int *, int *); void DrawMiniGraphicExt(DrawBuffer *, int, int, int); -void DrawGraphicShifted(int, int, int, int, int, int, int, int); -void DrawGraphicShiftedThruMask(int, int, int, int, int, int, int); void DrawScreenElementExt(int, int, int, int, int, int, int); void DrawLevelElementExt(int, int, int, int, int, int, int); void DrawScreenElementShifted(int, int, int, int, int, int);