X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=aa1767a426c9f4e962b63a08ab06935564906ed2;hb=445f1cdcd097f1ede6f6224c1aeef91c7f8eae81;hp=57294eebd9451ae18f8d15615ca0359617b6dd7e;hpb=f2b486caeabc0548dfa744c1569496c087b7420f;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 57294eeb..aa1767a4 100644 --- a/src/tools.c +++ b/src/tools.c @@ -85,6 +85,7 @@ void DumpTile(int x, int y) printf(" MovDir: %d\n", MovDir[x][y]); printf(" MovDelay: %d\n", MovDelay[x][y]); printf(" ChangeDelay: %d\n", ChangeDelay[x][y]); + printf(" Count: %d\n", Count[x][y]); printf(" GfxElement: %d\n", GfxElement[x][y]); printf(" GfxAction: %d\n", GfxAction[x][y]); printf(" GfxFrame: %d\n", GfxFrame[x][y]); @@ -123,7 +124,12 @@ void SetDrawtoField(int mode) void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) { - if (game_status == GAME_MODE_PLAYING && !game.envelope_active) + if (game_status == GAME_MODE_PLAYING && + level.game_engine_type == GAME_ENGINE_TYPE_EM) + { + BlitScreenToBitmap_EM(backbuffer); + } + else if (game_status == GAME_MODE_PLAYING && !game.envelope_active) { if (force_redraw) { @@ -251,8 +257,8 @@ void BackToFront() { BlitBitmap(buffer, window, fx, fy, SXSIZE, SYSIZE, SX, SY); -#ifdef DEBUG #if 0 +#ifdef DEBUG printf("redrawing all (ScreenGfxPos == %d) because %s\n", ScreenGfxPos, (setup.soft_scrolling ? @@ -276,32 +282,7 @@ void BackToFront() BlitBitmap(backbuffer, window, DX, DY, DXSIZE, DYSIZE, DX, DY); if (redraw_mask & REDRAW_DOOR_2) - { -#if 0 - if ((redraw_mask & REDRAW_DOOR_2) == REDRAW_DOOR_2) -#endif - BlitBitmap(backbuffer, window, VX, VY, VXSIZE, VYSIZE, VX, VY); -#if 0 - else - { - if (redraw_mask & REDRAW_VIDEO_1) - BlitBitmap(backbuffer, window, - VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS, - VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, - VX + VIDEO_DISPLAY1_XPOS, VY + VIDEO_DISPLAY1_YPOS); - if (redraw_mask & REDRAW_VIDEO_2) - BlitBitmap(backbuffer, window, - VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS, - VIDEO_DISPLAY_XSIZE, VIDEO_DISPLAY_YSIZE, - VX + VIDEO_DISPLAY2_XPOS, VY + VIDEO_DISPLAY2_YPOS); - if (redraw_mask & REDRAW_VIDEO_3) - BlitBitmap(backbuffer, window, - VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS, - VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE, - VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS); - } -#endif - } + BlitBitmap(backbuffer, window, VX, VY, VXSIZE, VYSIZE, VX, VY); if (redraw_mask & REDRAW_DOOR_3) BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY); @@ -420,6 +401,12 @@ void FadeToFront() BackToFront(); } +void SetMainBackgroundImageIfDefined(int graphic) +{ + if (graphic_info[graphic].bitmap) + SetMainBackgroundImage(graphic); +} + void SetMainBackgroundImage(int graphic) { SetMainBackgroundBitmap(graphic == IMG_UNDEFINED ? NULL : @@ -436,9 +423,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 +498,1533 @@ 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; + 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 if (g->offset_x == 0) /* frames are ordered vertically */ + { + int max_height = g->anim_frames_per_line * g->height; + 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 /* 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); -} + if (width > 0 && height > 0) + { + 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 + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, TRUE); - 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); - - /* ----------------------------------------------------------------------- */ - /* 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); - -#endif - - frame = getGraphicAnimationFrame(graphic, player->Frame); - - if (player->GfxPos) - { - if (move_dir == MV_LEFT || move_dir == MV_RIGHT) - sxx = player->GfxPos; - else - syy = player->GfxPos; - } - - if (!setup.soft_scrolling && ScreenMovPos) - sxx = syy = 0; - - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); - - if (SHIELD_ON(player)) + else /* border element */ { - int graphic = (player->shield_deadly_time_left ? IMG_SHIELD_DEADLY_ACTIVE : - IMG_SHIELD_NORMAL_ACTIVE); - int frame = getGraphicAnimationFrame(graphic, -1); - - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); + graphic = el2img(element); + frame = getGraphicAnimationFrame(graphic, -1); } - /* ----------------------------------------------------------------------- */ - /* draw things the player is pushing, if needed */ - /* ----------------------------------------------------------------------- */ - -#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 1 - if (player->is_pushing && player->is_moving) -#else - if (player->is_pushing && player_is_moving) -#endif + if (element == EL_EXPANDABLE_WALL) { - int px = SCREENX(next_jx), py = SCREENY(next_jy); + boolean left_stopped = FALSE, right_stopped = FALSE; - if (Back[next_jx][next_jy]) - DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); + 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 ((sxx || syy) && element == EL_SOKOBAN_OBJECT) - DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, - NO_CUTTING); - else + if (left_stopped && right_stopped) + graphic = IMG_WALL; + else if (left_stopped) { - 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 - - DrawGraphicShifted(px, py, sxx, syy, graphic, frame, - NO_CUTTING, NO_MASKING); + 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; } } - /* ----------------------------------------------------------------------- */ - /* draw things in front of player (active dynamite or dynabombs) */ - /* ----------------------------------------------------------------------- */ + 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); +} - if (IS_ACTIVE_BOMB(element)) - { - graphic = el2img(element); - frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); +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 (game.emulation == EMU_SUPAPLEX) - DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); - else - DrawGraphicThruMask(sx, sy, graphic, frame); - } +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); +} - if (player_is_moving && last_element == EL_EXPLOSION) - { - 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); +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); +} - if (phase >= delay) - DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame); - } +void DrawLevelElementThruMask(int x, int y, int element) +{ + DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); +} - /* ----------------------------------------------------------------------- */ - /* draw elements the player is just walking/passing through/under */ - /* ----------------------------------------------------------------------- */ +void DrawLevelFieldThruMask(int x, int y) +{ + DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); +} - 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); - } +#define TILE_GFX_ELEMENT(x, y) \ + (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) -#if 1 - /* do not redraw accessible elements if the player is just pushing them */ - if (!player_is_moving || !player->is_pushing) +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; + int crumbled_border_size = graphic_info[graphic].border_size; + static int xy[4][2] = { - /* ... and the field the player is entering */ - if (IS_ACCESSIBLE_INSIDE(element)) - DrawLevelField(jx, jy); - else if (IS_ACCESSIBLE_UNDER(element)) - DrawLevelFieldThruMask(jx, jy); - } + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; -#else + if (!IN_LEV_FIELD(x, y)) + return; -#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); - } -#endif + element = TILE_GFX_ELEMENT(x, y); - if (setup.direct_draw) + /* crumble field itself */ + if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) { - 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)); + if (!IN_SCR_FIELD(sx, sy)) + return; - BlitBitmap(drawto_field, window, - dest_x, dest_y, x_size, y_size, dest_x, dest_y); - SetDrawtoField(DRAW_DIRECT); - } + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - MarkTileDirty(sx, sy); -} + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; -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); + element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : + BorderElement); - *bitmap = g->bitmap; + /* check if neighbour field is of same type */ + if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) + continue; - 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 (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); + } - *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 + BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, + width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); + } + + MarkTileDirty(sx, sy); } - else if (g->offset_x == 0) /* frames are ordered vertically */ + else /* crumble neighbour fields */ { - int max_height = g->anim_frames_per_line * g->height; + 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 1 - int pos = (src_x / g->width) * max_height + src_y + frame * g->offset_y; + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + IS_MOVING(xx, yy)) + continue; - *x = src_x % g->width + pos / max_height * g->width; - *y = pos % max_height; + element = TILE_GFX_ELEMENT(xx, yy); + + if (!GFX_CRUMBLED(element)) + continue; #else - *x = src_x + (src_y + frame * g->offset_y) / max_height * g->width; - *y = (src_y + frame * g->offset_y) % max_height; + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !GFX_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; #endif - } - else /* frames are ordered diagonally */ - { - *x = src_x + frame * g->offset_x; - *y = src_y + frame * g->offset_y; + + graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); + crumbled_border_size = graphic_info[graphic].border_size; + + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_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); -} + 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); -} -void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, - int frame) -{ - Bitmap *src_bitmap; - int src_x, src_y; + graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); + DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); } -void DrawGraphicThruMask(int x, int y, int graphic, int frame) +void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, + int step_frame) { -#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 + int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); + int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); + int frame1 = getGraphicAnimationFrame(graphic1, step_frame); + int frame2 = getGraphicAnimationFrame(graphic2, step_frame); + int sx = SCREENX(x), sy = SCREENY(y); - DrawGraphicThruMaskExt(drawto_field, FX + x * TILEX, FY + y *TILEY, graphic, - frame); - MarkTileDirty(x, y); + DrawGraphic(sx, sy, graphic1, frame1); + DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); } -void DrawGraphicThruMaskExt(DrawBuffer *d, int dest_x, int dest_y, int graphic, - int frame) +void DrawLevelFieldCrumbledSandNeighbours(int x, int y) { -#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; + int sx = SCREENX(x), sy = SCREENY(y); + static int xy[4][2] = + { + { 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); -} - -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; + 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 = g->bitmap; - *x = mini_startx + g->src_x / 2; - *y = mini_starty + g->src_y / 2; + return border[steel_position][steel_type]; } -void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) +void DrawScreenElement(int x, int y, int element) { - Bitmap *src_bitmap; - int src_x, src_y; + DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); + DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); +} - getMiniGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, 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); } -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); -} - -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); + DrawScreenElement(x, y, EL_EMPTY); } -void DrawScreenElementExt(int x, int y, int dx, int dy, int element, - int cut_mode, int mask_mode) +void DrawLevelField(int x, int y) { - int lx = LEVELX(x), ly = LEVELY(y); - int graphic; - int frame; - - if (IN_LEV_FIELD(lx, ly)) + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + DrawScreenField(SCREENX(x), SCREENY(y)); + else if (IS_MOVING(x, y)) { - SetRandomAnimationValue(lx, ly); + int newx,newy; - 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) +void DrawMiniElement(int x, int y, int element) { - 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) -{ - 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; + 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); +} - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); +void AnimateEnvelope(int envelope_nr, int anim_mode, int action) +{ + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; + Bitmap *src_bitmap = graphic_info[graphic].bitmap; + int mask_mode = (src_bitmap != NULL ? BLIT_MASKED : BLIT_ON_BACKGROUND); + 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; - for (i = 0; i < 4; i++) - { - int xx = x + xy[i][0]; - int yy = y + xy[i][1]; + 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 1 - element = (IN_LEV_FIELD(xx, yy) ? TILE_GFX_ELEMENT(xx, yy) : - BorderElement); -#else - element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); -#endif + SetDrawtoField(DRAW_BUFFERED); - /* check if neighbour field is of same type */ - if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) - continue; + BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); -#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_BACKBUFFER); - 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); - } + for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) + DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); - } + DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, + level.envelope_text[envelope_nr], font_nr, max_xsize, + xsize - 2, ysize - 2, mask_mode); - MarkTileDirty(sx, sy); + redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; + BackToFront(); + + WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); } - else /* crumble neighbour fields */ - { -#if 0 - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#endif +} - 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]; +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 - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - IS_MOVING(xx, yy)) - continue; + game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ - element = TILE_GFX_ELEMENT(xx, yy); + PlaySoundStereo(sound_opening, SOUND_MIDDLE); - 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 + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); -#if 1 - graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); - crumbled_border_size = graphic_info[graphic].border_size; + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); - getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#endif + if (tape.playing) + Delay(wait_delay_value); + else + WaitForEventToContinue(); - 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); - } + PlaySoundStereo(sound_closing, SOUND_MIDDLE); - BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); + if (anim_mode != ANIM_NONE) + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); - MarkTileDirty(sxx, syy); - } - } + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_CLOSING); + + game.envelope_active = FALSE; + + SetDrawtoField(DRAW_BUFFERED); + + redraw_mask |= REDRAW_FIELD; + BackToFront(); } -void DrawLevelFieldCrumbledSand(int x, int y) +void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { -#if 1 - int graphic; + 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; - if (!IN_LEV_FIELD(x, y)) - return; + *bitmap = src_bitmap; + *x = src_x; + *y = src_y; +} - graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); +void DrawMicroElement(int xpos, int ypos, int element) +{ + Bitmap *src_bitmap; + int src_x, src_y; + int graphic = el2preimg(element); - DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); -#else - DrawLevelFieldCrumbledSandExt(x, y, IMG_SAND_CRUMBLED, 0); -#endif + getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y); + BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY, + xpos, ypos); } -void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, - int step_frame) +void DrawLevel() { -#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); + int x,y; + + SetDrawBackgroundMask(REDRAW_NONE); + ClearWindow(); + + for (x = BX1; x <= BX2; x++) + for (y = BY1; y <= BY2; y++) + DrawScreenField(x, y); + + redraw_mask |= REDRAW_FIELD; +} + +void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) +{ + int x,y; + + for (x = 0; x < size_x; x++) + for (y = 0; y < size_y; y++) + DrawMiniElementOrWall(x, y, scroll_x, scroll_y); + + redraw_mask |= REDRAW_FIELD; +} + +static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) +{ + int x, y; + + DrawBackground(xpos, ypos, MICROLEVEL_XSIZE, MICROLEVEL_YSIZE); + + 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; + + xpos += MICRO_TILEX; + ypos += MICRO_TILEY; + + for (x = -1; x <= STD_LEV_FIELDX; x++) + { + for (y = -1; y <= STD_LEV_FIELDY; y++) + { + int lx = from_x + x, ly = from_y + y; + + 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)); + } + } - DrawGraphic(sx, sy, graphic1, frame1); - DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); + redraw_mask |= REDRAW_MICROLEVEL; } -void DrawLevelFieldCrumbledSandNeighbours(int x, int y) +#define MICROLABEL_EMPTY 0 +#define MICROLABEL_LEVEL_NAME 1 +#define MICROLABEL_LEVEL_AUTHOR_HEAD 2 +#define MICROLABEL_LEVEL_AUTHOR 3 +#define MICROLABEL_IMPORTED_FROM_HEAD 4 +#define MICROLABEL_IMPORTED_FROM 5 +#define MICROLABEL_IMPORTED_BY_HEAD 6 +#define MICROLABEL_IMPORTED_BY 7 + +static void DrawMicroLevelLabelExt(int mode) { - int sx = SCREENX(x), sy = SCREENY(y); - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + char label_text[MAX_OUTPUT_LINESIZE + 1]; + int max_len_label_text; + int font_nr = FONT_TEXT_2; 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 (mode == MICROLABEL_LEVEL_AUTHOR_HEAD || + mode == MICROLABEL_IMPORTED_FROM_HEAD || + mode == MICROLABEL_IMPORTED_BY_HEAD) + font_nr = FONT_TEXT_3; - if (!IN_LEV_FIELD(xx, yy) || - !IN_SCR_FIELD(sxx, syy) || - !GFX_CRUMBLED(Feld[xx][yy]) || - IS_MOVING(xx, yy)) - continue; + max_len_label_text = SXSIZE / getFontWidth(font_nr); - DrawLevelField(xx, yy); + for (i = 0; i < max_len_label_text; i++) + label_text[i] = ' '; + label_text[max_len_label_text] = '\0'; + + if (strlen(label_text) > 0) + { + int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; + int lypos = MICROLABEL2_YPOS; + + DrawText(lxpos, lypos, label_text, font_nr); } -} -static int getBorderElement(int x, int y) -{ - int border[7][2] = + strncpy(label_text, + (mode == MICROLABEL_LEVEL_NAME ? level.name : + mode == MICROLABEL_LEVEL_AUTHOR_HEAD ? "created by" : + mode == MICROLABEL_LEVEL_AUTHOR ? level.author : + mode == MICROLABEL_IMPORTED_FROM_HEAD ? "imported from" : + mode == MICROLABEL_IMPORTED_FROM ? leveldir_current->imported_from : + mode == MICROLABEL_IMPORTED_BY_HEAD ? "imported by" : + mode == MICROLABEL_IMPORTED_BY ? leveldir_current->imported_by :""), + max_len_label_text); + label_text[max_len_label_text] = '\0'; + + if (strlen(label_text) > 0) { - { 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); + int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; + int lypos = MICROLABEL2_YPOS; - return border[steel_position][steel_type]; -} + DrawText(lxpos, lypos, label_text, font_nr); + } -void DrawScreenElement(int x, int y, int element) -{ - DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); - DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); + redraw_mask |= REDRAW_MICROLEVEL; } -void DrawLevelElement(int x, int y, int element) +void DrawMicroLevel(int xpos, int ypos, boolean restart) { - if (IN_LEV_FIELD(x, y) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawScreenElement(SCREENX(x), SCREENY(y), element); -} + 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 */ -void DrawScreenField(int x, int y) -{ - int lx = LEVELX(x), ly = LEVELY(y); - int element, content; + /* force PREVIEW font on preview level */ + game_status = GAME_MODE_PSEUDO_PREVIEW; - if (!IN_LEV_FIELD(lx, ly)) + if (restart) { - if (lx < -1 || lx > lev_fieldx || ly < -1 || ly > lev_fieldy) - element = EL_EMPTY; - else - element = getBorderElement(lx, ly); + from_x = from_y = 0; + scroll_direction = MV_RIGHT; + label_state = 1; + label_counter = 0; - DrawScreenElement(x, y, element); - return; - } + DrawMicroLevelExt(xpos, ypos, from_x, from_y); + DrawMicroLevelLabelExt(label_state); - element = Feld[lx][ly]; - content = Store[lx][ly]; + /* initialize delay counters */ + DelayReached(&scroll_delay, 0); + DelayReached(&label_delay, 0); - if (IS_MOVING(lx, ly)) - { - int horiz_move = (MovDir[lx][ly] == MV_LEFT || MovDir[lx][ly] == MV_RIGHT); - boolean cut_mode = NO_CUTTING; + if (leveldir_current->name) + { + char label_text[MAX_OUTPUT_LINESIZE + 1]; + int font_nr = FONT_TEXT_1; + int max_len_label_text = SXSIZE / getFontWidth(font_nr); + int lxpos, lypos; - 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; + strncpy(label_text, leveldir_current->name, max_len_label_text); + label_text[max_len_label_text] = '\0'; - if (cut_mode == CUT_ABOVE) - DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING); - else - DrawScreenElement(x, y, EL_EMPTY); + lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; + lypos = SY + MICROLABEL1_YPOS; - 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); + DrawText(lxpos, lypos, label_text, font_nr); + } - if (content == EL_ACID) - { - 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); + game_status = last_game_status; /* restore current game status */ - DrawLevelElementThruMask(newlx, newly, EL_ACID); - } + return; } - else if (IS_BLOCKED(lx, ly)) + + /* 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; - int sx, sy; - int horiz_move; - boolean cut_mode = NO_CUTTING; - int element_old, content_old; + switch (scroll_direction) + { + case MV_LEFT: + if (from_x > 0) + from_x--; + else + scroll_direction = MV_UP; + break; - Blocked2Moving(lx, ly, &oldx, &oldy); - sx = SCREENX(oldx); - sy = SCREENY(oldy); - horiz_move = (MovDir[oldx][oldy] == MV_LEFT || - MovDir[oldx][oldy] == MV_RIGHT); + case MV_RIGHT: + if (from_x < lev_fieldx - STD_LEV_FIELDX) + from_x++; + else + scroll_direction = MV_DOWN; + break; - element_old = Feld[oldx][oldy]; - content_old = Store[oldx][oldy]; + case MV_UP: + if (from_y > 0) + from_y--; + else + scroll_direction = MV_RIGHT; + break; - 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; + case MV_DOWN: + if (from_y < lev_fieldy - STD_LEV_FIELDY) + from_y++; + else + scroll_direction = MV_LEFT; + break; - DrawScreenElement(x, y, EL_EMPTY); + default: + break; + } - 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); + DrawMicroLevelExt(xpos, ypos, from_x, from_y); } - else if (IS_DRAWABLE(element)) - DrawScreenElement(x, y, element); - else - DrawScreenElement(x, y, EL_EMPTY); -} - -void DrawLevelField(int x, int y) -{ - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawScreenField(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))) - DrawScreenField(SCREENX(newx), SCREENY(newy)); - } - else if (IS_BLOCKED(x, y)) + /* !!! THIS ALL SUCKS -- SHOULD BE CLEANLY REWRITTEN !!! */ + /* 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 oldx, oldy; + int max_label_counter = 23; - Blocked2Moving(x, y, &oldx, &oldy); - if (IN_SCR_FIELD(SCREENX(oldx), SCREENY(oldy))) - DrawScreenField(SCREENX(oldx), SCREENY(oldy)); - } -} + if (leveldir_current->imported_from != NULL && + strlen(leveldir_current->imported_from) > 0) + max_label_counter += 14; + if (leveldir_current->imported_by != NULL && + strlen(leveldir_current->imported_by) > 0) + max_label_counter += 14; -void DrawMiniElement(int x, int y, int element) -{ - int graphic; + 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_LEVEL_AUTHOR_HEAD : + label_counter >= 14 && label_counter <= 21 ? + MICROLABEL_LEVEL_AUTHOR : + label_counter >= 23 && label_counter <= 26 ? + MICROLABEL_IMPORTED_FROM_HEAD : + label_counter >= 28 && label_counter <= 35 ? + MICROLABEL_IMPORTED_FROM : + label_counter >= 37 && label_counter <= 40 ? + MICROLABEL_IMPORTED_BY_HEAD : + label_counter >= 42 && label_counter <= 49 ? + MICROLABEL_IMPORTED_BY : MICROLABEL_EMPTY); - graphic = el2edimg(element); - DrawMiniGraphic(x, y, graphic); + if (leveldir_current->imported_from == NULL && + (label_state == MICROLABEL_IMPORTED_FROM_HEAD || + label_state == MICROLABEL_IMPORTED_FROM)) + label_state = (label_state == MICROLABEL_IMPORTED_FROM_HEAD ? + MICROLABEL_IMPORTED_BY_HEAD : MICROLABEL_IMPORTED_BY); + + 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); - 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); + DrawGraphicAnimationExt(drawto_field, FX + x * TILEX, FY + y * TILEY, + graphic, GfxFrame[lx][ly], NO_MASKING); + MarkTileDirty(x, y); } -void AnimateEnvelope(int envelope_nr, int anim_mode, int action) +void DrawLevelGraphicAnimation(int x, int y, int graphic) { - 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); -#else - 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; - - 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; + DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); +} - SetDrawtoField(DRAW_BUFFERED); +void DrawLevelElementAnimation(int x, int y, int element) +{ + int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + DrawGraphicAnimation(SCREENX(x), SCREENY(y), graphic); +} - SetDrawtoField(DRAW_BACKBUFFER); +inline void DrawLevelGraphicAnimationIfNeeded(int x, int y, int graphic) +{ + int sx = SCREENX(x), sy = SCREENY(y); - for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) - DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); + if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy)) + return; - 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 (!IS_NEW_FRAME(GfxFrame[x][y], graphic)) + return; - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); + DrawGraphicAnimation(sx, sy, graphic); - WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); - } + if (GFX_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSand(x, y); } -void ShowEnvelope(int envelope_nr) +void DrawLevelElementAnimationIfNeeded(int x, int y, int element) { - 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); + int sx = SCREENX(x), sy = SCREENY(y); + int graphic; - game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ + if (!IN_LEV_FIELD(x, y) || !IN_SCR_FIELD(sx, sy)) + return; - PlaySoundStereo(sound_opening, SOUND_MIDDLE); + graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); - if (anim_mode == ANIM_DEFAULT) - AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); + if (!IS_NEW_FRAME(GfxFrame[x][y], graphic)) + return; - AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); + DrawGraphicAnimation(sx, sy, graphic); - if (tape.playing) - Delay(wait_delay_value); - else - WaitForEventToContinue(); + if (GFX_CRUMBLED(element)) + DrawLevelFieldCrumbledSand(x, y); +} - PlaySoundStereo(sound_closing, SOUND_MIDDLE); +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); - if (anim_mode != ANIM_NONE) - AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; - if (anim_mode == ANIM_DEFAULT) - AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_CLOSING); + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + { + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - game.envelope_active = FALSE; + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + } - SetDrawtoField(DRAW_BUFFERED); + return graphic; + } + else + return el_act_dir2img(player->element_nr, player->GfxAction, move_dir); +} - redraw_mask |= REDRAW_FIELD; - BackToFront(); +static boolean equalGraphics(int graphic1, int graphic2) +{ + struct GraphicInfo *g1 = &graphic_info[graphic1]; + struct GraphicInfo *g2 = &graphic_info[graphic2]; + + 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); } -void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) +void DrawAllPlayers() { - 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; + int i; - *bitmap = src_bitmap; - *x = src_x; - *y = src_y; + for (i = 0; i < MAX_PLAYERS; i++) + if (stored_player[i].active) + DrawPlayer(&stored_player[i]); } -void DrawMicroElement(int xpos, int ypos, int element) +void DrawPlayerField(int x, int y) { - Bitmap *src_bitmap; - int src_x, src_y; - int graphic = el2preimg(element); + if (!IS_PLAYER(x, y)) + return; - getMicroGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, drawto, src_x, src_y, MICRO_TILEX, MICRO_TILEY, - xpos, ypos); + DrawPlayer(PLAYERINFO(x, y)); } -void DrawLevel() +void DrawPlayer(struct PlayerInfo *player) { - int x,y; + int jx = player->jx; + int jy = player->jy; + int move_dir = player->MovDir; + 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); + 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 (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy))) + return; + +#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 - SetDrawBackgroundMask(REDRAW_NONE); - ClearWindow(); + if (element == EL_EXPLOSION) + return; - for (x = BX1; x <= BX2; x++) - for (y = BY1; y <= BY2; y++) - DrawScreenField(x, y); + 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; -} + InitPlayerGfxAnimation(player, action, move_dir); -void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) -{ - int x,y; + /* ----------------------------------------------------------------------- */ + /* draw things in the field the player is leaving, if needed */ + /* ----------------------------------------------------------------------- */ - for (x = 0; x < size_x; x++) - for (y = 0; y < size_y; y++) - DrawMiniElementOrWall(x, y, scroll_x, scroll_y); + if (player->is_moving) + { + if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element)) + { + DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]); - redraw_mask |= REDRAW_FIELD; -} + 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); -static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) -{ - int x, y; + if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) + DrawLevelElement(next_jx, next_jy, EL_EMPTY); + } - DrawBackground(xpos, ypos, MICROLEV_XSIZE, MICROLEV_YSIZE); + if (!IN_SCR_FIELD(sx, sy)) + return; - 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 (setup.direct_draw) + SetDrawtoField(DRAW_BUFFERED); - xpos += MICRO_TILEX; - ypos += MICRO_TILEY; + /* ----------------------------------------------------------------------- */ + /* draw things behind the player, if needed */ + /* ----------------------------------------------------------------------- */ - for (x = -1; x <= STD_LEV_FIELDX; x++) + if (Back[jx][jy]) + DrawLevelElement(jx, jy, Back[jx][jy]); + else if (IS_ACTIVE_BOMB(element)) + DrawLevelElement(jx, jy, EL_EMPTY); + else { - for (y = -1; y <= STD_LEV_FIELDY; y++) + if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) { - int lx = from_x + x, ly = from_y + y; + 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); - 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)); + DrawGraphic(sx, sy, old_graphic, frame); + } + } + else + { + GfxElement[jx][jy] = EL_UNDEFINED; + + /* make sure that pushed elements are drawn with correct frame rate */ + if (player->is_pushing && player->is_moving) + GfxFrame[jx][jy] = player->StepFrame; + + DrawLevelField(jx, jy); } } - redraw_mask |= REDRAW_MICROLEVEL; -} + /* ----------------------------------------------------------------------- */ + /* draw player himself */ + /* ----------------------------------------------------------------------- */ -#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 + graphic = getPlayerGraphic(player, move_dir); -static void DrawMicroLevelLabelExt(int mode) -{ - char label_text[MAX_OUTPUT_LINESIZE + 1]; - int max_len_label_text; - int font_nr = FONT_TEXT_2; + /* 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; - 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) { - from_x = from_y = 0; - scroll_direction = MV_RIGHT; - label_state = 1; - label_counter = 0; + int px = SCREENX(jx), py = SCREENY(jy); + int pxx = (TILEX - ABS(sxx)) * dx; + int pyy = (TILEY - ABS(syy)) * dy; - DrawMicroLevelExt(xpos, ypos, from_x, from_y); - DrawMicroLevelLabelExt(label_state); - - /* initialize delay counters */ - DelayReached(&scroll_delay, 0); - DelayReached(&label_delay, 0); + int graphic; + int frame; - 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; + if (!IS_MOVING(jx, jy)) /* push movement already finished */ + element = Feld[next_jx][next_jy]; - DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); - } + graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); + frame = getGraphicAnimationFrame(graphic, player->StepFrame); - game_status = last_game_status; /* restore current game status */ + /* draw background element under pushed element (like the Sokoban field) */ + if (Back[next_jx][next_jy]) + DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); - return; + /* masked drawing is needed for EMC style (double) movement graphics */ + DrawGraphicShiftedThruMask(px, py, pxx, pyy, graphic, frame, NO_CUTTING); } +#endif - /* scroll micro level, if needed */ - if ((lev_fieldx > STD_LEV_FIELDX || lev_fieldy > STD_LEV_FIELDY) && - DelayReached(&scroll_delay, MICROLEVEL_SCROLL_DELAY)) + /* ----------------------------------------------------------------------- */ + /* draw things in front of player (active dynamite or dynabombs) */ + /* ----------------------------------------------------------------------- */ + + if (IS_ACTIVE_BOMB(element)) { - switch (scroll_direction) - { - case MV_LEFT: - if (from_x > 0) - from_x--; - else - scroll_direction = MV_UP; - break; + graphic = el2img(element); + frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); - case MV_RIGHT: - if (from_x < lev_fieldx - STD_LEV_FIELDX) - from_x++; - else - scroll_direction = MV_DOWN; - break; + if (game.emulation == EMU_SUPAPLEX) + DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); + else + DrawGraphicThruMask(sx, sy, graphic, frame); + } - case MV_UP: - if (from_y > 0) - from_y--; - else - scroll_direction = MV_RIGHT; - break; + if (player_is_moving && last_element == EL_EXPLOSION) + { + 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_DOWN: - if (from_y < lev_fieldy - STD_LEV_FIELDY) - from_y++; - else - scroll_direction = MV_LEFT; - break; + if (phase >= delay) + DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame); + } - default: - break; - } + /* ----------------------------------------------------------------------- */ + /* draw elements the player is just walking/passing through/under */ + /* ----------------------------------------------------------------------- */ - DrawMicroLevelExt(xpos, ypos, from_x, from_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); } - /* 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)) + /* do not redraw accessible elements if the player is just pushing them */ + if (!player_is_moving || !player->is_pushing) { - 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); + } - 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; @@ -2122,15 +2098,15 @@ boolean Request(char *text, unsigned int req_state) } } -#if 1 + if (game_status == GAME_MODE_PLAYING && + level.game_engine_type == GAME_ENGINE_TYPE_EM) + BlitScreenToBitmap_EM(backbuffer); + /* disable deactivated drawing when quick-loading level tape recording */ if (tape.playing && tape.deactivate_display) TapeDeactivateDisplayOff(TRUE); -#endif -#if 1 SetMouseCursor(CURSOR_DEFAULT); -#endif #if defined(NETWORK_AVALIABLE) /* pause network game while waiting for request to answer */ @@ -2225,10 +2201,6 @@ boolean Request(char *text, unsigned int req_state) OpenDoor(DOOR_OPEN_1); -#if 0 - ClearEventQueue(); -#endif - if (!(req_state & REQUEST_WAIT_FOR_INPUT)) { SetDrawBackgroundMask(REDRAW_FIELD); @@ -2245,10 +2217,6 @@ boolean Request(char *text, unsigned int req_state) SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); -#if 0 - SetMouseCursor(CURSOR_DEFAULT); -#endif - while (result < 0) { if (PendingEvent()) @@ -2390,11 +2358,9 @@ boolean Request(char *text, unsigned int req_state) SendToServer_ContinuePlaying(); #endif -#if 1 /* restore deactivated drawing when quick-loading level tape recording */ if (tape.playing && tape.deactivate_display) TapeDeactivateDisplayOn(); -#endif return result; } @@ -2486,11 +2452,6 @@ unsigned int MoveDoor(unsigned int door_state) { stepsize = 20; /* must be choosen to always draw last frame */ door_delay_value = 0; - -#if 0 - StopSound(SND_DOOR_OPENING); - StopSound(SND_DOOR_CLOSING); -#endif } if (global.autoplay_leveldir) @@ -2691,14 +2652,6 @@ unsigned int MoveDoor(unsigned int door_state) } } -#if 0 - if (setup.quick_doors) - { - StopSound(SND_DOOR_OPENING); - StopSound(SND_DOOR_CLOSING); - } -#endif - if (door_state & DOOR_ACTION_1) door1 = door_state & DOOR_ACTION_1; if (door_state & DOOR_ACTION_2) @@ -2911,9 +2864,7 @@ static void HandleToolButtons(struct GadgetInfo *gi) request_gadget_id = gi->custom_id; } -#if 1 - -static struct +static struct Mapping_EM_to_RND_object { int element_em; boolean is_rnd_to_em_mapping; /* unique mapping EM <-> RND */ @@ -2923,18 +2874,18 @@ static struct int action; int direction; } -mapping_EM_to_RND_list[] = +em_object_mapping_list[] = { { Xblank, TRUE, FALSE, EL_EMPTY, -1, -1 }, { - Yacid_splash_eB, FALSE, TRUE, + Yacid_splash_eB, FALSE, FALSE, EL_ACID_SPLASH_RIGHT, -1, -1 }, { - Yacid_splash_wB, FALSE, TRUE, + Yacid_splash_wB, FALSE, FALSE, EL_ACID_SPLASH_LEFT, -1, -1 }, @@ -3699,7 +3650,7 @@ mapping_EM_to_RND_list[] = }, { Ybomb_eat, FALSE, FALSE, - EL_BOMB, ACTION_SMASHED_BY_ROCK, -1 + EL_BOMB, ACTION_ACTIVATING, -1 }, { Xballoon, TRUE, FALSE, @@ -3742,19 +3693,19 @@ mapping_EM_to_RND_list[] = EL_EMC_GRASS, -1, -1 }, { - Ygrass_nB, FALSE, TRUE, + Ygrass_nB, FALSE, FALSE, EL_EMC_GRASS, ACTION_DIGGING, MV_BIT_UP }, { - Ygrass_eB, FALSE, TRUE, + Ygrass_eB, FALSE, FALSE, EL_EMC_GRASS, ACTION_DIGGING, MV_BIT_RIGHT }, { - Ygrass_sB, FALSE, TRUE, + Ygrass_sB, FALSE, FALSE, EL_EMC_GRASS, ACTION_DIGGING, MV_BIT_DOWN }, { - Ygrass_wB, FALSE, TRUE, + Ygrass_wB, FALSE, FALSE, EL_EMC_GRASS, ACTION_DIGGING, MV_BIT_LEFT }, { @@ -3762,19 +3713,19 @@ mapping_EM_to_RND_list[] = EL_SAND, -1, -1 }, { - Ydirt_nB, FALSE, TRUE, + Ydirt_nB, FALSE, FALSE, EL_SAND, ACTION_DIGGING, MV_BIT_UP }, { - Ydirt_eB, FALSE, TRUE, + Ydirt_eB, FALSE, FALSE, EL_SAND, ACTION_DIGGING, MV_BIT_RIGHT }, { - Ydirt_sB, FALSE, TRUE, + Ydirt_sB, FALSE, FALSE, EL_SAND, ACTION_DIGGING, MV_BIT_DOWN }, { - Ydirt_wB, FALSE, TRUE, + Ydirt_wB, FALSE, FALSE, EL_SAND, ACTION_DIGGING, MV_BIT_LEFT }, { @@ -3834,7 +3785,7 @@ mapping_EM_to_RND_list[] = EL_EMC_MAGIC_BALL, -1, -1 }, { - Xball_1B, FALSE, TRUE, + Xball_1B, FALSE, FALSE, EL_EMC_MAGIC_BALL, ACTION_ACTIVE, -1 }, { @@ -3842,13 +3793,61 @@ mapping_EM_to_RND_list[] = EL_EMC_MAGIC_BALL, ACTION_ACTIVE, -1 }, { - Xball_2B, FALSE, TRUE, + Xball_2B, FALSE, FALSE, EL_EMC_MAGIC_BALL, ACTION_ACTIVE, -1 }, { Yball_eat, FALSE, FALSE, EL_EMC_MAGIC_BALL, ACTION_DROPPING, -1 }, + { + Ykey_1_eat, FALSE, FALSE, + EL_EM_KEY_1, ACTION_COLLECTING, -1 + }, + { + Ykey_2_eat, FALSE, FALSE, + EL_EM_KEY_2, ACTION_COLLECTING, -1 + }, + { + Ykey_3_eat, FALSE, FALSE, + EL_EM_KEY_3, ACTION_COLLECTING, -1 + }, + { + Ykey_4_eat, FALSE, FALSE, + EL_EM_KEY_4, ACTION_COLLECTING, -1 + }, + { + Ykey_5_eat, FALSE, FALSE, + EL_EMC_KEY_5, ACTION_COLLECTING, -1 + }, + { + Ykey_6_eat, FALSE, FALSE, + EL_EMC_KEY_6, ACTION_COLLECTING, -1 + }, + { + Ykey_7_eat, FALSE, FALSE, + EL_EMC_KEY_7, ACTION_COLLECTING, -1 + }, + { + Ykey_8_eat, FALSE, FALSE, + EL_EMC_KEY_8, ACTION_COLLECTING, -1 + }, + { + Ylenses_eat, FALSE, FALSE, + EL_EMC_LENSES, ACTION_COLLECTING, -1 + }, + { + Ymagnify_eat, FALSE, FALSE, + EL_EMC_MAGNIFIER, ACTION_COLLECTING, -1 + }, + { + Ygrass_eat, FALSE, FALSE, + EL_EMC_GRASS, ACTION_SNAPPING, -1 + }, + { + Ydirt_eat, FALSE, FALSE, + EL_SAND, ACTION_SNAPPING, -1 + }, { Xgrow_ns, TRUE, FALSE, EL_EXPANDABLE_WALL_VERTICAL, -1, -1 @@ -3890,7 +3889,7 @@ mapping_EM_to_RND_list[] = EL_AMOEBA_DRY, ACTION_OTHER, -1 }, { - Xamoeba_5, FALSE, FALSE, + Xamoeba_5, TRUE, FALSE, EL_AMOEBA_WET, ACTION_OTHER, -1 }, { @@ -3923,19 +3922,19 @@ mapping_EM_to_RND_list[] = }, { Xdoor_5, TRUE, FALSE, - EL_EM_GATE_5, -1, -1 + EL_EMC_GATE_5, -1, -1 }, { Xdoor_6, TRUE, FALSE, - EL_EM_GATE_6, -1, -1 + EL_EMC_GATE_6, -1, -1 }, { Xdoor_7, TRUE, FALSE, - EL_EM_GATE_7, -1, -1 + EL_EMC_GATE_7, -1, -1 }, { Xdoor_8, TRUE, FALSE, - EL_EM_GATE_8, -1, -1 + EL_EMC_GATE_8, -1, -1 }, { Xkey_1, TRUE, FALSE, @@ -3955,19 +3954,19 @@ mapping_EM_to_RND_list[] = }, { Xkey_5, TRUE, FALSE, - EL_EM_KEY_5, -1, -1 + EL_EMC_KEY_5, -1, -1 }, { Xkey_6, TRUE, FALSE, - EL_EM_KEY_6, -1, -1 + EL_EMC_KEY_6, -1, -1 }, { Xkey_7, TRUE, FALSE, - EL_EM_KEY_7, -1, -1 + EL_EMC_KEY_7, -1, -1 }, { Xkey_8, TRUE, FALSE, - EL_EM_KEY_8, -1, -1 + EL_EMC_KEY_8, -1, -1 }, { Xwind_n, TRUE, FALSE, @@ -4179,19 +4178,51 @@ mapping_EM_to_RND_list[] = }, { Xfake_door_5, TRUE, FALSE, - EL_EM_GATE_5_GRAY, -1, -1 + EL_EMC_GATE_5_GRAY, -1, -1 }, { Xfake_door_6, TRUE, FALSE, - EL_EM_GATE_6_GRAY, -1, -1 + EL_EMC_GATE_6_GRAY, -1, -1 }, { Xfake_door_7, TRUE, FALSE, - EL_EM_GATE_7_GRAY, -1, -1 + EL_EMC_GATE_7_GRAY, -1, -1 }, { Xfake_door_8, TRUE, FALSE, - EL_EM_GATE_8_GRAY, -1, -1 + EL_EMC_GATE_8_GRAY, -1, -1 + }, + { + Xfake_acid_1, TRUE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_2, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_3, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_4, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_5, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_6, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_7, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 + }, + { + Xfake_acid_8, FALSE, FALSE, + EL_EMC_FAKE_ACID, -1, -1 }, { Xsteel_1, TRUE, FALSE, @@ -4521,6 +4552,128 @@ mapping_EM_to_RND_list[] = } }; +static struct Mapping_EM_to_RND_player +{ + int action_em; + int player_nr; + + int element_rnd; + int action; + int direction; +} +em_player_mapping_list[] = +{ + { + SPR_walk + 0, 0, + EL_PLAYER_1, ACTION_MOVING, MV_BIT_UP, + }, + { + SPR_walk + 1, 0, + EL_PLAYER_1, ACTION_MOVING, MV_BIT_RIGHT, + }, + { + SPR_walk + 2, 0, + EL_PLAYER_1, ACTION_MOVING, MV_BIT_DOWN, + }, + { + SPR_walk + 3, 0, + EL_PLAYER_1, ACTION_MOVING, MV_BIT_LEFT, + }, + { + SPR_push + 0, 0, + EL_PLAYER_1, ACTION_PUSHING, MV_BIT_UP, + }, + { + SPR_push + 1, 0, + EL_PLAYER_1, ACTION_PUSHING, MV_BIT_RIGHT, + }, + { + SPR_push + 2, 0, + EL_PLAYER_1, ACTION_PUSHING, MV_BIT_DOWN, + }, + { + SPR_push + 3, 0, + EL_PLAYER_1, ACTION_PUSHING, MV_BIT_LEFT, + }, + { + SPR_spray + 0, 0, + EL_PLAYER_1, ACTION_SNAPPING, MV_BIT_UP, + }, + { + SPR_spray + 1, 0, + EL_PLAYER_1, ACTION_SNAPPING, MV_BIT_RIGHT, + }, + { + SPR_spray + 2, 0, + EL_PLAYER_1, ACTION_SNAPPING, MV_BIT_DOWN, + }, + { + SPR_spray + 3, 0, + EL_PLAYER_1, ACTION_SNAPPING, MV_BIT_LEFT, + }, + { + SPR_walk + 0, 1, + EL_PLAYER_2, ACTION_MOVING, MV_BIT_UP, + }, + { + SPR_walk + 1, 1, + EL_PLAYER_2, ACTION_MOVING, MV_BIT_RIGHT, + }, + { + SPR_walk + 2, 1, + EL_PLAYER_2, ACTION_MOVING, MV_BIT_DOWN, + }, + { + SPR_walk + 3, 1, + EL_PLAYER_2, ACTION_MOVING, MV_BIT_LEFT, + }, + { + SPR_push + 0, 1, + EL_PLAYER_2, ACTION_PUSHING, MV_BIT_UP, + }, + { + SPR_push + 1, 1, + EL_PLAYER_2, ACTION_PUSHING, MV_BIT_RIGHT, + }, + { + SPR_push + 2, 1, + EL_PLAYER_2, ACTION_PUSHING, MV_BIT_DOWN, + }, + { + SPR_push + 3, 1, + EL_PLAYER_2, ACTION_PUSHING, MV_BIT_LEFT, + }, + { + SPR_spray + 0, 1, + EL_PLAYER_2, ACTION_SNAPPING, MV_BIT_UP, + }, + { + SPR_spray + 1, 1, + EL_PLAYER_2, ACTION_SNAPPING, MV_BIT_RIGHT, + }, + { + SPR_spray + 2, 1, + EL_PLAYER_2, ACTION_SNAPPING, MV_BIT_DOWN, + }, + { + SPR_spray + 3, 1, + EL_PLAYER_2, ACTION_SNAPPING, MV_BIT_LEFT, + }, + { + SPR_still, 0, + EL_PLAYER_1, ACTION_DEFAULT, -1, + }, + { + SPR_still, 1, + EL_PLAYER_2, ACTION_DEFAULT, -1, + }, + + { + -1, -1, + -1, -1, -1 + } +}; + int map_element_RND_to_EM(int element_rnd) { static unsigned short mapping_RND_to_EM[NUM_FILE_ELEMENTS]; @@ -4534,10 +4687,10 @@ int map_element_RND_to_EM(int element_rnd) for (i = 0; i < NUM_FILE_ELEMENTS; i++) mapping_RND_to_EM[i] = Xalpha_quest; - for (i = 0; mapping_EM_to_RND_list[i].element_em != -1; i++) - if (mapping_EM_to_RND_list[i].is_rnd_to_em_mapping) - mapping_RND_to_EM[mapping_EM_to_RND_list[i].element_rnd] = - mapping_EM_to_RND_list[i].element_em; + for (i = 0; em_object_mapping_list[i].element_em != -1; i++) + if (em_object_mapping_list[i].is_rnd_to_em_mapping) + mapping_RND_to_EM[em_object_mapping_list[i].element_rnd] = + em_object_mapping_list[i].element_em; mapping_initialized = TRUE; } @@ -4563,9 +4716,9 @@ int map_element_EM_to_RND(int element_em) for (i = 0; i < TILE_MAX; i++) mapping_EM_to_RND[i] = EL_UNKNOWN; - for (i = 0; mapping_EM_to_RND_list[i].element_em != -1; i++) - mapping_EM_to_RND[mapping_EM_to_RND_list[i].element_em] = - mapping_EM_to_RND_list[i].element_rnd; + for (i = 0; em_object_mapping_list[i].element_em != -1; i++) + mapping_EM_to_RND[em_object_mapping_list[i].element_em] = + em_object_mapping_list[i].element_rnd; mapping_initialized = TRUE; } @@ -4578,7 +4731,7 @@ int map_element_EM_to_RND(int element_em) return EL_UNKNOWN; } -#else +#if 0 int map_element_RND_to_EM(int element_rnd) { @@ -4787,7 +4940,7 @@ int map_element_EM_to_RND(int element_em) int element_em; int element_rnd; } - mapping_EM_to_RND_list[] = + em_object_mapping_list[] = { { Xblank, EL_EMPTY }, { Yacid_splash_eB, EL_EMPTY }, @@ -5195,9 +5348,9 @@ int map_element_EM_to_RND(int element_em) for (i = 0; i < TILE_MAX; i++) mapping_EM_to_RND[i] = EL_UNKNOWN; - for (i = 0; mapping_EM_to_RND_list[i].element_em != -1; i++) - mapping_EM_to_RND[mapping_EM_to_RND_list[i].element_em] = - mapping_EM_to_RND_list[i].element_rnd; + for (i = 0; em_object_mapping_list[i].element_em != -1; i++) + mapping_EM_to_RND[em_object_mapping_list[i].element_em] = + em_object_mapping_list[i].element_rnd; mapping_initialized = TRUE; } @@ -5228,21 +5381,51 @@ int get_next_element(int element) } } +#if 0 +int el_act_dir2img(int element, int action, int direction) +{ + element = GFX_ELEMENT(element); + + if (direction == MV_NO_MOVING) + return element_info[element].graphic[action]; + + direction = MV_DIR_BIT(direction); + + return element_info[element].direction_graphic[action][direction]; +} +#else int el_act_dir2img(int element, int action, int direction) { element = GFX_ELEMENT(element); direction = MV_DIR_BIT(direction); /* default: MV_NO_MOVING => MV_DOWN */ + /* direction_graphic[][] == graphic[] for undefined direction graphics */ return element_info[element].direction_graphic[action][direction]; } +#endif + +#if 0 +static int el_act_dir2crm(int element, int action, int direction) +{ + element = GFX_ELEMENT(element); + + if (direction == MV_NO_MOVING) + return element_info[element].crumbled[action]; + direction = MV_DIR_BIT(direction); + + return element_info[element].direction_crumbled[action][direction]; +} +#else static int el_act_dir2crm(int element, int action, int direction) { element = GFX_ELEMENT(element); direction = MV_DIR_BIT(direction); /* default: MV_NO_MOVING => MV_DOWN */ + /* direction_graphic[][] == graphic[] for undefined direction graphics */ return element_info[element].direction_crumbled[action][direction]; } +#endif int el_act2img(int element, int action) { @@ -5291,10 +5474,24 @@ int el2preimg(int element) return element_info[element].special_graphic[GFX_SPECIAL_ARG_PREVIEW]; } +int font2baseimg(int font_nr) +{ + return font_info[font_nr].special_graphic[GFX_SPECIAL_ARG_DEFAULT]; +} + int getGameFrameDelay_EM(int native_em_game_frame_delay) { - return (GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay : - GameFrameDelay); + int game_frame_delay_value; + + game_frame_delay_value = + (tape.playing && tape.fast_forward ? FfwdFrameDelay : + GameFrameDelay == GAME_FRAME_DELAY ? native_em_game_frame_delay : + GameFrameDelay); + + if (tape.playing && tape.warp_forward && !tape.pausing) + game_frame_delay_value = 0; + + return game_frame_delay_value; } unsigned int InitRND(long seed) @@ -5305,43 +5502,78 @@ unsigned int InitRND(long seed) return InitEngineRND(seed); } -void InitGraphicsInfoEM(void) +#define DEBUG_EM_GFX 0 + +void InitGraphicInfo_EM(void) { - int mapping_EM_to_RND_element[TILE_MAX]; - int mapping_EM_to_RND_action[TILE_MAX]; - int mapping_EM_to_RND_direction[TILE_MAX]; - boolean mapping_EM_to_RND_backside[TILE_MAX]; - int i, j; + struct Mapping_EM_to_RND_object object_mapping[TILE_MAX]; + struct Mapping_EM_to_RND_player player_mapping[2][SPR_MAX]; + int i, j, p; + +#if DEBUG_EM_GFX + if (graphic_info_em_object[0][0].bitmap == NULL) + { + /* EM graphics not yet initialized in em_open_all() */ - /* return "EL_UNKNOWN" for all undefined elements in mapping array */ + return; + } +#endif + + /* always start with reliable default values */ for (i = 0; i < TILE_MAX; i++) { - mapping_EM_to_RND_element[i] = EL_UNKNOWN; - mapping_EM_to_RND_backside[i] = FALSE; - mapping_EM_to_RND_action[i] = ACTION_DEFAULT; - mapping_EM_to_RND_direction[i] = MV_NO_MOVING; + object_mapping[i].element_rnd = EL_UNKNOWN; + object_mapping[i].is_backside = FALSE; + object_mapping[i].action = ACTION_DEFAULT; + object_mapping[i].direction = MV_NO_MOVING; + } + + /* always start with reliable default values */ + for (p = 0; p < 2; p++) + { + for (i = 0; i < SPR_MAX; i++) + { + player_mapping[p][i].element_rnd = EL_UNKNOWN; + player_mapping[p][i].action = ACTION_DEFAULT; + player_mapping[p][i].direction = MV_NO_MOVING; + } + } + + for (i = 0; em_object_mapping_list[i].element_em != -1; i++) + { + int e = em_object_mapping_list[i].element_em; + + object_mapping[e].element_rnd = em_object_mapping_list[i].element_rnd; + object_mapping[e].is_backside = em_object_mapping_list[i].is_backside; + + if (em_object_mapping_list[i].action != -1) + object_mapping[e].action = em_object_mapping_list[i].action; + + if (em_object_mapping_list[i].direction != -1) + object_mapping[e].direction = (1 << em_object_mapping_list[i].direction); } - for (i = 0; mapping_EM_to_RND_list[i].element_em != -1; i++) + for (i = 0; em_player_mapping_list[i].action_em != -1; i++) { - int e = mapping_EM_to_RND_list[i].element_em; + int a = em_player_mapping_list[i].action_em; + int p = em_player_mapping_list[i].player_nr; - mapping_EM_to_RND_element[e] = mapping_EM_to_RND_list[i].element_rnd; - mapping_EM_to_RND_backside[e] = mapping_EM_to_RND_list[i].is_backside; + player_mapping[p][a].element_rnd = em_player_mapping_list[i].element_rnd; - if (mapping_EM_to_RND_list[i].action != -1) - mapping_EM_to_RND_action[e] = mapping_EM_to_RND_list[i].action; + if (em_player_mapping_list[i].action != -1) + player_mapping[p][a].action = em_player_mapping_list[i].action; - if (mapping_EM_to_RND_list[i].direction != -1) - mapping_EM_to_RND_direction[e] = 1<< mapping_EM_to_RND_list[i].direction; + if (em_player_mapping_list[i].direction != -1) + player_mapping[p][a].direction = + (1 << em_player_mapping_list[i].direction); } for (i = 0; i < TILE_MAX; i++) { - int element = mapping_EM_to_RND_element[i]; - int action = mapping_EM_to_RND_action[i]; - int direction = mapping_EM_to_RND_direction[i]; - int backside = mapping_EM_to_RND_backside[i]; + int element = object_mapping[i].element_rnd; + int action = object_mapping[i].action; + int direction = object_mapping[i].direction; + boolean is_backside = object_mapping[i].is_backside; boolean action_removing = (action == ACTION_DIGGING || action == ACTION_SNAPPING || action == ACTION_COLLECTING); @@ -5354,8 +5586,9 @@ void InitGraphicsInfoEM(void) for (j = 0; j < 8; j++) { - int effective_element = (j < 7 ? element : - i == Ynut_sB ? element : + int effective_element = (j > 5 && i == Yacid_splash_eB ? EL_EMPTY : + j > 5 && i == Yacid_splash_wB ? EL_EMPTY : + j < 7 ? element : i == Xdrip_stretch ? element : i == Xdrip_stretchB ? element : i == Ydrip_s1 ? element : @@ -5364,15 +5597,28 @@ void InitGraphicsInfoEM(void) i == Xball_2 ? element : i == Xball_2B ? element : i == Yball_eat ? element : + i == Ykey_1_eat ? element : + i == Ykey_2_eat ? element : + i == Ykey_3_eat ? element : + i == Ykey_4_eat ? element : + i == Ykey_5_eat ? element : + i == Ykey_6_eat ? element : + i == Ykey_7_eat ? element : + i == Ykey_8_eat ? element : + i == Ylenses_eat ? element : + i == Ymagnify_eat ? element : + i == Ygrass_eat ? element : + i == Ydirt_eat ? element : i == Yspring_kill_e ? EL_SPRING : i == Yspring_kill_w ? EL_SPRING : i == Yemerald_stone ? EL_EMERALD : i == Ydiamond_stone ? EL_ROCK : - backside ? EL_EMPTY : + i == Xsand_stonein_4 ? EL_EMPTY : + i == Xsand_stoneout_2 ? EL_ROCK : + is_backside ? EL_EMPTY : action_removing ? EL_EMPTY : element); int effective_action = (j < 7 ? action : - i == Ynut_sB ? action : i == Xdrip_stretch ? action : i == Xdrip_stretchB ? action : i == Ydrip_s1 ? action : @@ -5381,6 +5627,18 @@ void InitGraphicsInfoEM(void) i == Xball_2 ? action : i == Xball_2B ? action : i == Yball_eat ? action : + i == Ykey_1_eat ? action : + i == Ykey_2_eat ? action : + i == Ykey_3_eat ? action : + i == Ykey_4_eat ? action : + i == Ykey_5_eat ? action : + i == Ykey_6_eat ? action : + i == Ykey_7_eat ? action : + i == Ykey_8_eat ? action : + i == Ylenses_eat ? action : + i == Ymagnify_eat ? action : + i == Ygrass_eat ? action : + i == Ydirt_eat ? action : i == Xsand_stonein_1 ? action : i == Xsand_stonein_2 ? action : i == Xsand_stonein_3 ? action : @@ -5392,29 +5650,57 @@ void InitGraphicsInfoEM(void) action_active ? action : action_other ? action : ACTION_DEFAULT); - int graphic = (direction == MV_NO_MOVING ? - el_act2img(effective_element, effective_action) : - el_act_dir2img(effective_element, effective_action, + int graphic = (el_act_dir2img(effective_element, effective_action, direction)); + int crumbled = (el_act_dir2crm(effective_element, effective_action, + direction)); + int base_graphic = el_act2img(effective_element, ACTION_DEFAULT); + int base_crumbled = el_act2crm(effective_element, ACTION_DEFAULT); + boolean has_crumbled_graphics = (base_crumbled != base_graphic); struct GraphicInfo *g = &graphic_info[graphic]; - struct GraphicInfo_EM *g_em = &graphic_info_em[i][7 - j]; + struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; Bitmap *src_bitmap; int src_x, src_y; + /* ensure to get symmetric 3-frame, 2-delay animations as used in EM */ + boolean special_animation = (action != ACTION_DEFAULT && + g->anim_frames == 3 && + g->anim_delay == 2 && + g->anim_mode & ANIM_LINEAR); int sync_frame = (i == Xdrip_stretch ? 7 : i == Xdrip_stretchB ? 7 : i == Ydrip_s2 ? j + 8 : i == Ydrip_s2B ? j + 8 : i == Xacid_1 ? 0 : - i == Xacid_2 ? 1 : - i == Xacid_3 ? 2 : - i == Xacid_4 ? 3 : - i == Xacid_5 ? 4 : - i == Xacid_6 ? 5 : - i == Xacid_7 ? 6 : - i == Xacid_8 ? 7 : + i == Xacid_2 ? 10 : + i == Xacid_3 ? 20 : + i == Xacid_4 ? 30 : + i == Xacid_5 ? 40 : + i == Xacid_6 ? 50 : + i == Xacid_7 ? 60 : + i == Xacid_8 ? 70 : + i == Xfake_acid_1 ? 0 : + i == Xfake_acid_2 ? 10 : + i == Xfake_acid_3 ? 20 : + i == Xfake_acid_4 ? 30 : + i == Xfake_acid_5 ? 40 : + i == Xfake_acid_6 ? 50 : + i == Xfake_acid_7 ? 60 : + i == Xfake_acid_8 ? 70 : i == Xball_2 ? 7 : i == Xball_2B ? j + 8 : i == Yball_eat ? j + 1 : + i == Ykey_1_eat ? j + 1 : + i == Ykey_2_eat ? j + 1 : + i == Ykey_3_eat ? j + 1 : + i == Ykey_4_eat ? j + 1 : + i == Ykey_5_eat ? j + 1 : + i == Ykey_6_eat ? j + 1 : + i == Ykey_7_eat ? j + 1 : + i == Ykey_8_eat ? j + 1 : + i == Ylenses_eat ? j + 1 : + i == Ymagnify_eat ? j + 1 : + i == Ygrass_eat ? j + 1 : + i == Ydirt_eat ? j + 1 : i == Xamoeba_1 ? 0 : i == Xamoeba_2 ? 1 : i == Xamoeba_3 ? 2 : @@ -5426,57 +5712,64 @@ void InitGraphicsInfoEM(void) i == Xexit_2 ? j + 8 : i == Xexit_3 ? j + 16 : i == Xdynamite_1 ? 0 : - i == Xdynamite_2 ? 2 : - i == Xdynamite_3 ? 4 : - i == Xdynamite_4 ? 6 : + i == Xdynamite_2 ? 20 : + i == Xdynamite_3 ? 40 : + i == Xdynamite_4 ? 60 : i == Xsand_stonein_1 ? j + 1 : i == Xsand_stonein_2 ? j + 9 : i == Xsand_stonein_3 ? j + 17 : i == Xsand_stonein_4 ? j + 25 : - i == Xsand_stoneout_1 && j == 0 ? 1 : - i == Xsand_stoneout_1 && j == 1 ? 1 : - i == Xsand_stoneout_1 && j == 2 ? 2 : - i == Xsand_stoneout_1 && j == 3 ? 4 : - i == Xsand_stoneout_1 && j == 4 ? 4 : - i == Xsand_stoneout_1 && j == 5 ? 6 : - i == Xsand_stoneout_1 && j == 6 ? 8 : - i == Xsand_stoneout_1 && j == 7 ? 8 : - i == Xsand_stoneout_2 && j == 0 ? 10 : - i == Xsand_stoneout_2 && j == 1 ? 12 : - i == Xsand_stoneout_2 && j == 2 ? 14 : - i == Xsand_stoneout_2 && j == 3 ? 16 : - i == Xsand_stoneout_2 && j == 4 ? 18 : - i == Xsand_stoneout_2 && j == 5 ? 22 : - i == Xsand_stoneout_2 && j == 6 ? 26 : - i == Xsand_stoneout_2 && j == 7 ? 30 : - i == Xboom_bug && j == 2 ? 1 : - i == Xboom_bug && j == 3 ? 2 : - i == Xboom_bug && j == 4 ? 2 : - i == Xboom_bug && j == 5 ? 1 : - i == Xboom_bug && j == 6 ? 1 : + i == Xsand_stoneout_1 && j == 0 ? 0 : + i == Xsand_stoneout_1 && j == 1 ? 0 : + i == Xsand_stoneout_1 && j == 2 ? 1 : + i == Xsand_stoneout_1 && j == 3 ? 2 : + i == Xsand_stoneout_1 && j == 4 ? 2 : + i == Xsand_stoneout_1 && j == 5 ? 3 : + i == Xsand_stoneout_1 && j == 6 ? 4 : + i == Xsand_stoneout_1 && j == 7 ? 4 : + i == Xsand_stoneout_2 && j == 0 ? 5 : + i == Xsand_stoneout_2 && j == 1 ? 6 : + i == Xsand_stoneout_2 && j == 2 ? 7 : + i == Xsand_stoneout_2 && j == 3 ? 8 : + i == Xsand_stoneout_2 && j == 4 ? 9 : + i == Xsand_stoneout_2 && j == 5 ? 11 : + i == Xsand_stoneout_2 && j == 6 ? 13 : + i == Xsand_stoneout_2 && j == 7 ? 15 : + i == Xboom_bug && j == 1 ? 2 : + i == Xboom_bug && j == 2 ? 2 : + i == Xboom_bug && j == 3 ? 4 : + i == Xboom_bug && j == 4 ? 4 : + i == Xboom_bug && j == 5 ? 2 : + i == Xboom_bug && j == 6 ? 2 : i == Xboom_bug && j == 7 ? 0 : - i == Xboom_bomb && j == 2 ? 1 : - i == Xboom_bomb && j == 3 ? 2 : - i == Xboom_bomb && j == 4 ? 2 : - i == Xboom_bomb && j == 5 ? 1 : - i == Xboom_bomb && j == 6 ? 1 : + i == Xboom_bomb && j == 1 ? 2 : + i == Xboom_bomb && j == 2 ? 2 : + i == Xboom_bomb && j == 3 ? 4 : + i == Xboom_bomb && j == 4 ? 4 : + i == Xboom_bomb && j == 5 ? 2 : + i == Xboom_bomb && j == 6 ? 2 : i == Xboom_bomb && j == 7 ? 0 : - i == Xboom_android && j == 7 ? 3 : - i == Xboom_1 && j == 2 ? 1 : - i == Xboom_1 && j == 3 ? 2 : - i == Xboom_1 && j == 4 ? 2 : - i == Xboom_1 && j == 5 ? 3 : - i == Xboom_1 && j == 6 ? 3 : - i == Xboom_1 && j == 7 ? 4 : - i == Xboom_2 && j == 0 ? 4 : - i == Xboom_2 && j == 1 ? 4 : - i == Xboom_2 && j == 2 ? 5 : - i == Xboom_2 && j == 3 ? 5 : - i == Xboom_2 && j == 4 ? 5 : - i == Xboom_2 && j == 5 ? 6 : + i == Xboom_android && j == 7 ? 6 : + i == Xboom_1 && j == 1 ? 2 : + i == Xboom_1 && j == 2 ? 2 : + i == Xboom_1 && j == 3 ? 4 : + i == Xboom_1 && j == 4 ? 4 : + i == Xboom_1 && j == 5 ? 6 : + i == Xboom_1 && j == 6 ? 6 : + i == Xboom_1 && j == 7 ? 8 : + i == Xboom_2 && j == 0 ? 8 : + i == Xboom_2 && j == 1 ? 8 : + i == Xboom_2 && j == 2 ? 10 : + i == Xboom_2 && j == 3 ? 10 : + i == Xboom_2 && j == 4 ? 10 : + i == Xboom_2 && j == 5 ? 12 : + i == Xboom_2 && j == 6 ? 12 : + i == Xboom_2 && j == 7 ? 12 : + special_animation && j == 4 ? 3 : effective_action != action ? 0 : j); -#if 1 + +#if DEBUG_EM_GFX Bitmap *debug_bitmap = g_em->bitmap; int debug_src_x = g_em->src_x; int debug_src_y = g_em->src_y; @@ -5489,9 +5782,8 @@ void InitGraphicsInfoEM(void) sync_frame); getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x, &src_y, - g->double_movement && backside); + g->double_movement && is_backside); -#if 1 g_em->bitmap = src_bitmap; g_em->src_x = src_x; g_em->src_y = src_y; @@ -5501,9 +5793,36 @@ void InitGraphicsInfoEM(void) g_em->dst_offset_y = 0; g_em->width = TILEX; g_em->height = TILEY; + + g_em->crumbled_bitmap = NULL; + g_em->crumbled_src_x = 0; + g_em->crumbled_src_y = 0; + g_em->crumbled_border_size = 0; + + g_em->has_crumbled_graphics = FALSE; + g_em->preserve_background = FALSE; + +#if 0 + if (has_crumbled_graphics && crumbled == IMG_EMPTY_SPACE) + printf("::: empty crumbled: %d [%s], %d, %d\n", + effective_element, element_info[effective_element].token_name, + effective_action, direction); #endif -#if 1 + /* if element can be crumbled, but certain action graphics are just empty + space (like snapping sand with the original R'n'D graphics), do not + treat these empty space graphics as crumbled graphics in EMC engine */ + if (has_crumbled_graphics && crumbled != IMG_EMPTY_SPACE) + { + getGraphicSource(crumbled, frame, &src_bitmap, &src_x, &src_y); + + g_em->has_crumbled_graphics = TRUE; + g_em->crumbled_bitmap = src_bitmap; + g_em->crumbled_src_x = src_x; + g_em->crumbled_src_y = src_y; + g_em->crumbled_border_size = graphic_info[crumbled].border_size; + } + if (!g->double_movement && (effective_action == ACTION_FALLING || effective_action == ACTION_MOVING || effective_action == ACTION_PUSHING)) @@ -5512,50 +5831,56 @@ void InitGraphicsInfoEM(void) (effective_action == ACTION_FALLING ? MV_DOWN : direction); 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 cx = ABS(dx) * TILEX / 8; - int cy = ABS(dy) * TILEY / 8; - -#if 0 - if (i == Yemerald_sB) - printf("::: %d: ...\n", j); -#endif - - if (backside) /* tile where movement starts */ + int num_steps = (i == Ydrip_s1 || + i == Ydrip_s1B || + i == Ydrip_s2 || + i == Ydrip_s2B ? 16 : 8); + int cx = ABS(dx) * (TILEX / num_steps); + int cy = ABS(dy) * (TILEY / num_steps); + int step_frame = (i == Ydrip_s2 || + i == Ydrip_s2B ? j + 8 : j) + 1; + int step = (is_backside ? step_frame : num_steps - step_frame); + + if (is_backside) /* tile where movement starts */ { if (dx < 0 || dy < 0) { - g_em->src_offset_x = cx * (j + 1); - g_em->src_offset_y = cy * (j + 1); + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; } else { - g_em->dst_offset_x = cx * (j + 1); - g_em->dst_offset_y = cy * (j + 1); + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; } - - g_em->width = TILEX - cx * (j + 1); - g_em->height = TILEY - cy * (j + 1); } else /* tile where movement ends */ { if (dx < 0 || dy < 0) { - g_em->dst_offset_x = cx * (7 - j); - g_em->dst_offset_y = cy * (7 - j); + g_em->dst_offset_x = cx * step; + g_em->dst_offset_y = cy * step; } else { - g_em->src_offset_x = cx * (7 - j); - g_em->src_offset_y = cy * (7 - j); + g_em->src_offset_x = cx * step; + g_em->src_offset_y = cy * step; } - - g_em->width = TILEX - cx * (7 - j); - g_em->height = TILEY - cy * (7 - j); } + + g_em->width = TILEX - cx * step; + g_em->height = TILEY - cy * step; } -#endif -#if 0 + /* create unique graphic identifier to decide if tile must be redrawn */ + /* bit 31 - 16 (16 bit): EM style element + bit 15 - 12 ( 4 bit): EM style frame + bit 11 - 6 ( 6 bit): graphic width + bit 5 - 0 ( 6 bit): graphic height */ + g_em->unique_identifier = + (i << 16) | (j << 12) | (g_em->width << 6) | g_em->height; + +#if DEBUG_EM_GFX if (g_em->bitmap != debug_bitmap || g_em->src_x != debug_src_x || g_em->src_y != debug_src_y || @@ -5571,27 +5896,28 @@ void InitGraphicsInfoEM(void) if (i != last_i) { printf("\n"); - last_i = i; } - printf("::: EMC GFX ERROR for element %d -> %d ('%s')", - i, element, element_info[element].token_name); + printf("::: EMC GFX ERROR for element %d -> %d ('%s', '%s', %d)", + i, element, element_info[element].token_name, + element_action_info[effective_action].suffix, direction); if (element != effective_element) printf(" [%d ('%s')]", - effective_element,element_info[effective_element].token_name); + effective_element, + element_info[effective_element].token_name); printf("\n"); if (g_em->bitmap != debug_bitmap) - printf(" %d(%d): different bitmap!\n", - j, backside); + printf(" %d (%d): different bitmap! (0x%08x != 0x%08x)\n", + j, is_backside, (int)(g_em->bitmap), (int)(debug_bitmap)); if (g_em->src_x != debug_src_x || g_em->src_y != debug_src_y) printf(" frame %d (%c): %d,%d (%d,%d) should be %d,%d (%d,%d)\n", - j, (backside ? 'B' : 'F'), + j, (is_backside ? 'B' : 'F'), g_em->src_x, g_em->src_y, g_em->src_x / 32, g_em->src_y / 32, debug_src_x, debug_src_y, @@ -5601,15 +5927,15 @@ void InitGraphicsInfoEM(void) g_em->src_offset_y != 0 || g_em->dst_offset_x != 0 || g_em->dst_offset_y != 0) - printf(" %d(%d): offsets %d,%d and %d,%d should be all 0\n", - j, backside, + printf(" %d (%d): offsets %d,%d and %d,%d should be all 0\n", + j, is_backside, g_em->src_offset_x, g_em->src_offset_y, g_em->dst_offset_x, g_em->dst_offset_y); if (g_em->width != TILEX || g_em->height != TILEY) - printf(" %d(%d): size %d,%d should be %d,%d\n", - j, backside, + printf(" %d (%d): size %d,%d should be %d,%d\n", + j, is_backside, g_em->width, g_em->height, TILEX, TILEY); } #endif @@ -5617,7 +5943,126 @@ void InitGraphicsInfoEM(void) } } -#if 0 + for (i = 0; i < TILE_MAX; i++) + { + for (j = 0; j < 8; j++) + { + int element = object_mapping[i].element_rnd; + int action = object_mapping[i].action; + + if (action == ACTION_SMASHED_BY_ROCK && + element_info[element].graphic[action] == + element_info[element].graphic[ACTION_DEFAULT]) + { + /* no separate animation for "smashed by rock" -- use rock instead */ + struct GraphicInfo_EM *g_em = &graphic_info_em_object[i][7 - j]; + struct GraphicInfo_EM *g_xx = &graphic_info_em_object[Ystone_s][7 - j]; + + g_em->bitmap = g_xx->bitmap; + g_em->src_x = g_xx->src_x; + g_em->src_y = g_xx->src_y; + g_em->src_offset_x = g_xx->src_offset_x; + g_em->src_offset_y = g_xx->src_offset_y; + g_em->dst_offset_x = g_xx->dst_offset_x; + g_em->dst_offset_y = g_xx->dst_offset_y; + g_em->width = g_xx->width; + g_em->height = g_xx->height; + + g_em->preserve_background = TRUE; + } + } + } + + for (p = 0; p < 2; p++) + { + for (i = 0; i < SPR_MAX; i++) + { + int element = player_mapping[p][i].element_rnd; + int action = player_mapping[p][i].action; + int direction = player_mapping[p][i].direction; + + for (j = 0; j < 8; j++) + { + int effective_element = element; + int effective_action = action; + int graphic = (direction == MV_NO_MOVING ? + el_act2img(effective_element, effective_action) : + el_act_dir2img(effective_element, effective_action, + direction)); + struct GraphicInfo *g = &graphic_info[graphic]; + struct GraphicInfo_EM *g_em = &graphic_info_em_player[p][i][7 - j]; + Bitmap *src_bitmap; + int src_x, src_y; + int sync_frame = j; + +#if DEBUG_EM_GFX + Bitmap *debug_bitmap = g_em->bitmap; + int debug_src_x = g_em->src_x; + int debug_src_y = g_em->src_y; +#endif + + int frame = getAnimationFrame(g->anim_frames, + g->anim_delay, + g->anim_mode, + g->anim_start_frame, + sync_frame); + + getGraphicSourceExt(graphic, frame, &src_bitmap, &src_x,&src_y, FALSE); + + g_em->bitmap = src_bitmap; + g_em->src_x = src_x; + g_em->src_y = src_y; + g_em->src_offset_x = 0; + g_em->src_offset_y = 0; + g_em->dst_offset_x = 0; + g_em->dst_offset_y = 0; + g_em->width = TILEX; + g_em->height = TILEY; + +#if DEBUG_EM_GFX + if (g_em->bitmap != debug_bitmap || + g_em->src_x != debug_src_x || + g_em->src_y != debug_src_y) + { + static int last_i = -1; + + if (i != last_i) + { + printf("\n"); + last_i = i; + } + + printf("::: EMC GFX ERROR for p/a %d/%d -> %d ('%s', '%s', %d)", + p, i, element, element_info[element].token_name, + element_action_info[effective_action].suffix, direction); + + if (element != effective_element) + printf(" [%d ('%s')]", + effective_element, + element_info[effective_element].token_name); + + printf("\n"); + + if (g_em->bitmap != debug_bitmap) + printf(" %d: different bitmap! (0x%08x != 0x%08x)\n", + j, (int)(g_em->bitmap), (int)(debug_bitmap)); + + if (g_em->src_x != debug_src_x || + g_em->src_y != debug_src_y) + printf(" frame %d: %d,%d (%d,%d) should be %d,%d (%d,%d)\n", + j, + g_em->src_x, g_em->src_y, + g_em->src_x / 32, g_em->src_y / 32, + debug_src_x, debug_src_y, + debug_src_x / 32, debug_src_y / 32); + } +#endif + + } + } + } + +#if DEBUG_EM_GFX exit(0); #endif }