X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=2d35e042e0b67db6629289cf29ee25bf6725ec65;hb=074c00b42409c74e9c5856db1be03dced3a15ae9;hp=4fdb41205329838f3a0a77c71bfb87cb173223d5;hpb=c8a5fd317789166da7aafff91d43672f69c78729;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 4fdb4120..2d35e042 100644 --- a/src/tools.c +++ b/src/tools.c @@ -40,6 +40,39 @@ static int el_act2crm(int, int); static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS]; static int request_gadget_id = -1; +void DumpTile(int x, int y) +{ + int sx = SCREENX(x); + int sy = SCREENX(y); + + printf_line("-", 79); + printf("Field Info: SCREEN(%d, %d), LEVEL(%d, %d)\n", sx, sy, x, y); + printf_line("-", 79); + + if (!IN_LEV_FIELD(x, y)) + { + printf("(not in level field)\n"); + printf("\n"); + + return; + } + + printf(" Feld: %d ['%s']\n", Feld[x][y], + element_info[Feld[x][y]].token_name); + printf(" Back: %d\n", Back[x][y]); + printf(" Store: %d\n", Store[x][y]); + printf(" Store2: %d\n", Store2[x][y]); + printf(" StorePlayer: %d\n", StorePlayer[x][y]); + printf(" MovPos: %d\n", MovPos[x][y]); + printf(" MovDir: %d\n", MovDir[x][y]); + printf(" MovDelay: %d\n", MovDelay[x][y]); + printf(" ChangeDelay: %d\n", ChangeDelay[x][y]); + printf(" GfxElement: %d\n", GfxElement[x][y]); + printf(" GfxAction: %d\n", GfxAction[x][y]); + printf(" GfxFrame: %d\n", GfxFrame[x][y]); + printf("\n"); +} + void SetDrawtoField(int mode) { if (mode == DRAW_BUFFERED && setup.soft_scrolling) @@ -91,8 +124,8 @@ void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) if (setup.direct_draw) SetDrawtoField(DRAW_BACKBUFFER); - for(xx=BX1; xx<=BX2; xx++) - for(yy=BY1; yy<=BY2; yy++) + for (xx = BX1; xx <= BX2; xx++) + for (yy = BY1; yy <= BY2; yy++) if (xx >= x1 && xx <= x2 && yy >= y1 && yy <= y2) DrawScreenField(xx, yy); DrawAllPlayers(); @@ -225,26 +258,30 @@ 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) - BlitBitmap(backbuffer, window, VX,VY, VXSIZE,VYSIZE, VX,VY); +#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); + 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); + 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); + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS, + VIDEO_CONTROL_XSIZE, VIDEO_CONTROL_YSIZE, + VX + VIDEO_CONTROL_XPOS, VY + VIDEO_CONTROL_YPOS); } +#endif } if (redraw_mask & REDRAW_DOOR_3) @@ -263,8 +300,8 @@ void BackToFront() if (redraw_mask & REDRAW_TILES) { - for(x=0; xuse_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 (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; + + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + { + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); + + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + } + + return graphic; + } + 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]; + + 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 DrawAllPlayers() { int i; - for(i=0; ijx; + int jy = player->jy; + int move_dir = player->MovDir; #if 0 - int jx = player->jx, jy = player->jy; - int last_jx = player->last_jx, last_jy = player->last_jy; - int next_jx = jx + (jx - last_jx), next_jy = jy + (jy - last_jy); - 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 frame = 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); - int move_dir = player->MovDir; - int action = ACTION_DEFAULT; #else - int jx = player->jx, 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); +#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 frame = 0; - boolean player_is_moving = (player->MovPos ? TRUE : FALSE); int action = ACTION_DEFAULT; -#endif + 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)) + if (!IN_LEV_FIELD(jx, jy)) { printf("DrawPlayerField(): x = %d, y = %d\n",jx,jy); printf("DrawPlayerField(): sx = %d, sy = %d\n",sx,sy); @@ -594,15 +665,13 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_EXPLOSION) return; - action = (player->Pushing ? ACTION_PUSHING : - player->is_digging ? ACTION_DIGGING : - player->is_collecting ? ACTION_COLLECTING : - player->is_moving ? ACTION_MOVING : - player->snapped ? ACTION_SNAPPING : ACTION_DEFAULT); - -#if 0 - printf("::: '%s'\n", element_action_info[action].suffix); -#endif + 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); @@ -632,24 +701,8 @@ void DrawPlayer(struct PlayerInfo *player) else DrawLevelField(last_jx, last_jy); - if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) - { -#if 1 -#if 1 + if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) DrawLevelElement(next_jx, next_jy, EL_EMPTY); -#else - if (player->GfxPos) - { - if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL) - DrawLevelElement(next_jx, next_jy, EL_SOKOBAN_FIELD_EMPTY); - else - DrawLevelElement(next_jx, next_jy, EL_EMPTY); - } - else - DrawLevelField(next_jx, next_jy); -#endif -#endif - } } if (!IN_SCR_FIELD(sx, sy)) @@ -670,13 +723,8 @@ void DrawPlayer(struct PlayerInfo *player) { if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) { -#if 1 if (GFX_CRUMBLED(GfxElement[jx][jy])) DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); -#else - if (GfxElement[jx][jy] == EL_SAND) - DrawLevelFieldCrumbledSandDigging(jx, jy, move_dir, player->StepFrame); -#endif else { int old_element = GfxElement[jx][jy]; @@ -698,21 +746,38 @@ void DrawPlayer(struct PlayerInfo *player) /* draw player himself */ /* ----------------------------------------------------------------------- */ +#if 1 + + graphic = getPlayerGraphic(player, move_dir); + + /* in the case of changed player action or direction, prevent the current + animation frame from being restarted for identical animations */ + if (player->Frame == 0 && equalGraphics(graphic, last_player_graphic)) + player->Frame = last_player_frame; + +#else + if (player->use_murphy_graphic) { static int last_horizontal_dir = MV_LEFT; - int direction; if (move_dir == MV_LEFT || move_dir == MV_RIGHT) last_horizontal_dir = move_dir; - direction = (player->snapped ? move_dir : last_horizontal_dir); + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); + + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ + { + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); + } } else graphic = el_act_dir2img(player->element_nr, player->GfxAction, move_dir); +#endif + frame = getGraphicAnimationFrame(graphic, player->Frame); if (player->GfxPos) @@ -743,14 +808,14 @@ void DrawPlayer(struct PlayerInfo *player) #if 0 printf("::: %d, %d [%d, %d] [%d]\n", - player->Pushing, player_is_moving, player->GfxAction, + player->is_pushing, player_is_moving, player->GfxAction, player->is_moving, player_is_moving); #endif #if 1 - if (player->Pushing && player->is_moving) + if (player->is_pushing && player->is_moving) #else - if (player->Pushing && player_is_moving) + if (player->is_pushing && player_is_moving) #endif { int px = SCREENX(next_jx), py = SCREENY(next_jy); @@ -758,48 +823,21 @@ void DrawPlayer(struct PlayerInfo *player) if (Back[next_jx][next_jy]) DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); -#if 1 if ((sxx || syy) && element == EL_SOKOBAN_OBJECT) DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, NO_CUTTING); -#else - if ((sxx || syy) && - (element == EL_SOKOBAN_FIELD_EMPTY || - Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)) - DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, - NO_CUTTING); -#endif else { -#if 1 int element = MovingOrBlocked2Element(next_jx, next_jy); -#else + int graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); #if 1 - int element = Feld[jx][jy]; + int frame = getGraphicAnimationFrame(graphic, player->StepFrame); #else - int element = Feld[next_jx][next_jy]; -#endif -#endif - -#if 1 - int graphic = el2img(element); - int frame = 0; - -#if 0 - if ((sxx || syy) && IS_PUSHABLE(element)) -#endif - { - graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); - frame = getGraphicAnimationFrame(graphic, player->Frame); - } - -#if 0 - printf("::: pushing %d: %d ...\n", sxx, frame); + int frame = getGraphicAnimationFrame(graphic, player->Frame); #endif DrawGraphicShifted(px, py, sxx, syy, graphic, frame, NO_CUTTING, NO_MASKING); -#endif } } @@ -820,14 +858,7 @@ void DrawPlayer(struct PlayerInfo *player) if (player_is_moving && last_element == EL_EXPLOSION) { -#if 1 int graphic = el_act2img(GfxElement[last_jx][last_jy], ACTION_EXPLODING); -#else - int stored = Store[last_jx][last_jy]; - int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION : - stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON : - IMG_SP_EXPLOSION); -#endif int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); int phase = ExplodePhase[last_jx][last_jy] - 1; int frame = getGraphicAnimationFrame(graphic, phase - delay); @@ -864,7 +895,7 @@ void DrawPlayer(struct PlayerInfo *player) SetDrawtoField(DRAW_DIRECT); } - MarkTileDirty(sx,sy); + MarkTileDirty(sx, sy); } void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y) @@ -988,7 +1019,7 @@ void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) BlitBitmap(src_bitmap, d, src_x, src_y, MINI_TILEX, MINI_TILEY, x, y); } -void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, +void DrawGraphicShifted(int x, int y, int dx, int dy, int graphic, int frame, int cut_mode, int mask_mode) { Bitmap *src_bitmap; @@ -1108,13 +1139,13 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, BlitBitmap(src_bitmap, drawto_field, src_x, src_y, width, height, dest_x, dest_y); - MarkTileDirty(x,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); + DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, USE_MASKING); } void DrawScreenElementExt(int x, int y, int dx, int dy, int element, @@ -1128,7 +1159,7 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, { SetRandomAnimationValue(lx, ly); - graphic = el_act_dir2img(element, GfxAction[lx][ly], MovDir[lx][ly]); + graphic = el_act_dir2img(element, GfxAction[lx][ly], GfxDir[lx][ly]); frame = getGraphicAnimationFrame(graphic, GfxFrame[lx][ly]); } else /* border element */ @@ -1198,6 +1229,10 @@ void DrawLevelFieldThruMask(int x, int y) DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } +#define TILE_GFX_ELEMENT(x, y) \ + (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? \ + GfxElement[x][y] : Feld[x][y]) + static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) { Bitmap *src_bitmap; @@ -1227,8 +1262,7 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) if (!IN_LEV_FIELD(x, y)) return; - element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? - GfxElement[x][y] : Feld[x][y]); + element = TILE_GFX_ELEMENT(x, y); /* crumble field itself */ if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) @@ -1238,12 +1272,17 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) { int xx = x + xy[i][0]; int yy = y + xy[i][1]; +#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 /* check if neighbour field is of same type */ if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) @@ -1283,18 +1322,30 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); #endif - for(i=0; i<4; 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 1 + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + IS_MOVING(xx, yy)) + continue; + + element = TILE_GFX_ELEMENT(xx, yy); + + 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 1 graphic = el_act2crm(Feld[xx][yy], ACTION_DEFAULT); @@ -1372,7 +1423,7 @@ void DrawLevelFieldCrumbledSandNeighbours(int x, int y) }; int i; - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) { int xx = x + xy[i][0]; int yy = y + xy[i][1]; @@ -1471,7 +1522,13 @@ void DrawScreenField(int x, int y) DrawScreenElementShifted(x, y, 0, MovPos[lx][ly], content, cut_mode); if (content == EL_ACID) - DrawLevelElementThruMask(lx, ly + 1, 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); + + DrawLevelElementThruMask(newlx, newly, EL_ACID); + } } else if (IS_BLOCKED(lx, ly)) { @@ -1561,7 +1618,7 @@ void DrawEnvelopeBackground(int envelope_nr, int startx, int starty, { int font_width = getFontWidth(font_nr); int font_height = getFontHeight(font_nr); - int graphic = IMG_GAME_ENVELOPE_1_BACKGROUND + envelope_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; @@ -1599,67 +1656,36 @@ void DrawEnvelopeBackground(int envelope_nr, int startx, int starty, dst_x, dst_y); } -void ShowEnvelope(int envelope_nr) +void AnimateEnvelope(int envelope_nr, int anim_mode, int action) { - int element = EL_ENVELOPE_1 + envelope_nr; - int graphic = IMG_GAME_ENVELOPE_1_BACKGROUND + envelope_nr; - int sound_opening = element_info[element].sound[ACTION_OPENING]; - int sound_closing = element_info[element].sound[ACTION_CLOSING]; + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; boolean draw_masked = graphic_info[graphic].draw_masked; - int anim_mode = graphic_info[graphic].anim_mode; int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); - int font_nr = FONT_TEXT_1; - int font_width = getFontWidth(font_nr); - int font_height = getFontHeight(font_nr); boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); unsigned long anim_delay = 0; - int anim_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); - int wait_delay_value = (ffwd_delay ? 500 : 1000); - int start_pos_vertically = 0; - int i, x, y; - - game.envelope_active = TRUE; - - if (anim_mode != ANIM_NONE) - PlaySoundStereo(sound_opening, SOUND_MIDDLE); - - if (anim_mode == ANIM_DEFAULT) - { - /* open envelope window horizontally */ - for (i = 0; i <= level.envelope_xsize[envelope_nr]; i++) - { - int xsize = i + 2; - int ysize = 2; - int startx = (SXSIZE - xsize * font_width) / 2; - int starty = (SYSIZE - ysize * font_height) / 2; - - SetDrawtoField(DRAW_BUFFERED); - - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); - - SetDrawtoField(DRAW_BACKBUFFER); - - for (y=0; y < ysize; y++) for (x=0; x < xsize; x++) - DrawEnvelopeBackground(envelope_nr, startx, starty, x, y, xsize, ysize, - font_nr); - - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); - - WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); - } - } - - if (anim_mode == ANIM_NONE) - start_pos_vertically = level.envelope_ysize[envelope_nr]; + 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; - /* open envelope window vertically */ - for (i = start_pos_vertically; i <= level.envelope_ysize[envelope_nr]; i++) + for (x = xstart, y = ystart; x <= xend && y <= yend; x += xstep, y += ystep) { - int xsize = level.envelope_xsize[envelope_nr] + 2; - int ysize = i + 2; - int startx = (SXSIZE - xsize * font_width) / 2; - int starty = (SYSIZE - ysize * font_height) / 2; + 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; SetDrawtoField(DRAW_BUFFERED); @@ -1667,85 +1693,55 @@ void ShowEnvelope(int envelope_nr) SetDrawtoField(DRAW_BACKBUFFER); - for (y=0; y < ysize; y++) for (x=0; x < xsize; x++) - DrawEnvelopeBackground(envelope_nr, startx, starty, x, y, xsize, ysize, - font_nr); + for (yy = 0; yy < ysize; yy++) for (xx = 0; xx < xsize; xx++) + DrawEnvelopeBackground(envelope_nr, sx,sy, xx,yy, xsize, ysize, font_nr); - DrawTextToTextArea(SX + startx + font_width, SY + starty + font_height, - level.envelope_text[envelope_nr], FONT_TEXT_1, - level.envelope_xsize[envelope_nr], i, mask_mode); + DrawTextToTextArea(SX + sx + font_width, SY + sy + font_height, + level.envelope_text[envelope_nr], font_nr, max_xsize, + xsize - 2, ysize - 2, mask_mode); redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; BackToFront(); - WaitUntilDelayReached(&anim_delay, anim_delay_value); + WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); } +} - if (tape.playing) - Delay(wait_delay_value); - else - WaitForEventToContinue(); - - if (anim_mode != ANIM_NONE) - PlaySoundStereo(sound_closing, SOUND_MIDDLE); - - if (anim_mode != ANIM_NONE) - { - /* close envelope window vertically */ - for (i = level.envelope_ysize[envelope_nr]; i >= 0; i--) - { - int xsize = level.envelope_xsize[envelope_nr] + 2; - int ysize = i + 2; - int startx = (SXSIZE - xsize * font_width) / 2; - int starty = (SYSIZE - ysize * font_height) / 2; - - SetDrawtoField(DRAW_BUFFERED); - - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); - - SetDrawtoField(DRAW_BACKBUFFER); - - for (y=0; y < ysize; y++) for (x=0; x < xsize; x++) - DrawEnvelopeBackground(envelope_nr, startx, starty, x, y, xsize, ysize, - font_nr); - - DrawTextToTextArea(SX + startx + font_width, SY + starty + font_height, - level.envelope_text[envelope_nr], FONT_TEXT_1, - level.envelope_xsize[envelope_nr], i, mask_mode); +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); - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); + game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ - WaitUntilDelayReached(&anim_delay, anim_delay_value); - } - } + PlaySoundStereo(sound_opening, SOUND_MIDDLE); if (anim_mode == ANIM_DEFAULT) - { - /* close envelope window horizontally */ - for (i = level.envelope_xsize[envelope_nr]; i >= 0; i--) - { - int xsize = i + 2; - int ysize = 2; - int startx = (SXSIZE - xsize * font_width) / 2; - int starty = (SYSIZE - ysize * font_height) / 2; - - SetDrawtoField(DRAW_BUFFERED); + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); - BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); - SetDrawtoField(DRAW_BACKBUFFER); + if (tape.playing) + Delay(wait_delay_value); + else + WaitForEventToContinue(); - for (y=0; y < ysize; y++) for (x=0; x < xsize; x++) - DrawEnvelopeBackground(envelope_nr, startx, starty, x, y, xsize, ysize, - font_nr); + PlaySoundStereo(sound_closing, SOUND_MIDDLE); - redraw_mask |= REDRAW_FIELD | REDRAW_FROM_BACKBUFFER; - BackToFront(); + if (anim_mode != ANIM_NONE) + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); - WaitUntilDelayReached(&anim_delay, anim_delay_value / 2); - } - } + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_CLOSING); game.envelope_active = FALSE; @@ -1786,8 +1782,8 @@ void DrawLevel() SetDrawBackgroundMask(REDRAW_NONE); ClearWindow(); - for(x=BX1; x<=BX2; x++) - for(y=BY1; y<=BY2; y++) + for (x = BX1; x <= BX2; x++) + for (y = BY1; y <= BY2; y++) DrawScreenField(x, y); redraw_mask |= REDRAW_FIELD; @@ -1797,8 +1793,8 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) { int x,y; - for(x=0; x MAX_REQUEST_LINE_FONT1_LEN) + { + max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; + font_nr = FONT_LEVEL_NUMBER; + + break; + } + } + +#if 1 + /* disable deactivated drawing when quick-loading level tape recording */ + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); +#endif #if 1 SetMouseCursor(CURSOR_DEFAULT); @@ -2076,15 +2096,15 @@ boolean Request(char *text, unsigned int req_state) game_status = GAME_MODE_PSEUDO_DOOR; /* write text for request */ - for(ty=0; ty < MAX_REQUEST_LINES; ty++) + for (ty = 0; ty < MAX_REQUEST_LINES; ty++) { - char text_line[MAX_REQUEST_LINE_LEN + 1]; - int tx, tl, tc; + char text_line[max_request_line_len + 1]; + int tx, tl, tc = 0; if (!*text) break; - for(tl=0,tx=0; tx < MAX_REQUEST_LINE_LEN; tl++,tx++) + for (tl = 0, tx = 0; tx < max_request_line_len; tl++, tx++) { tc = *(text + tx); if (!tc || tc == ' ') @@ -2101,9 +2121,9 @@ boolean Request(char *text, unsigned int req_state) strncpy(text_line, text, tl); text_line[tl] = 0; - DrawText(DX + (DXSIZE - tl * getFontWidth(FONT_TEXT_2)) / 2, - DY + 8 + ty * (getFontHeight(FONT_TEXT_2) + 2), - text_line, FONT_TEXT_2); + DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, + DY + 8 + ty * (getFontHeight(font_nr) + 2), + text_line, font_nr); text += tl + (tc == ' ' ? 1 : 0); } @@ -2158,7 +2178,7 @@ boolean Request(char *text, unsigned int req_state) SetMouseCursor(CURSOR_DEFAULT); #endif - while(result < 0) + while (result < 0) { if (PendingEvent()) { @@ -2303,6 +2323,12 @@ 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; } @@ -2352,7 +2378,7 @@ unsigned int MoveDoor(unsigned int door_state) static int door1 = DOOR_OPEN_1; static int door2 = DOOR_CLOSE_2; unsigned long door_delay = 0; - unsigned long door_delay_value = door_1.step_delay; + unsigned long door_delay_value; int stepsize = 1; if (door_state == DOOR_GET_STATE) @@ -2377,13 +2403,18 @@ unsigned int MoveDoor(unsigned int door_state) else if (door2 == DOOR_CLOSE_2 && door_state & DOOR_CLOSE_2) door_state &= ~DOOR_CLOSE_2; + door_delay_value = (door_state & DOOR_ACTION_1 ? door_1.step_delay : + door_2.step_delay); + if (setup.quick_doors) { 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) @@ -2401,7 +2432,7 @@ unsigned int MoveDoor(unsigned int door_state) door_1.anim_mode == ANIM_VERTICAL ? DYSIZE : DXSIZE); int x; - if (!(door_state & DOOR_NO_DELAY)) + if (!(door_state & DOOR_NO_DELAY) && !setup.quick_doors) { /* opening door sound has priority over simultaneously closing door */ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) @@ -2410,7 +2441,7 @@ unsigned int MoveDoor(unsigned int door_state) PlaySoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); } - for(x = start; x <= end && !(door_1_done && door_2_done); x += stepsize) + for (x = start; x <= end && !(door_1_done && door_2_done); x += stepsize) { Bitmap *bitmap = graphic_info[IMG_GLOBAL_DOOR].bitmap; GC gc = bitmap->stored_clip_gc; @@ -2584,11 +2615,13 @@ 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; @@ -2727,7 +2760,7 @@ void CreateToolButtons() { int i; - for (i=0; i