X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=cb473ce77e96463fa140c24d7da0bf2ac276036a;hb=2f5368f25e34c02cb5ff7a012aa96198442231cb;hp=b20e04cb85ef05904d15107494bb2b9f59a54ce9;hpb=601cca5b35649856ff49e1bcb3806592b736662c;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index b20e04cb..cb473ce7 100644 --- a/src/tools.c +++ b/src/tools.c @@ -34,6 +34,8 @@ /* forward declaration for internal use */ static void UnmapToolButtons(); static void HandleToolButtons(struct GadgetInfo *); +static int el_act_dir2crm(int, int, int); +static int el_act2crm(int, int); static struct GadgetInfo *tool_gadget[NUM_TOOL_BUTTONS]; static int request_gadget_id = -1; @@ -70,7 +72,7 @@ void SetDrawtoField(int mode) void RedrawPlayfield(boolean force_redraw, int x, int y, int width, int height) { - if (game_status == PLAYING) + if (game_status == GAME_MODE_PLAYING && !game.envelope_active) { if (force_redraw) { @@ -89,8 +91,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(); @@ -118,7 +120,7 @@ void BackToFront() int x,y; DrawBuffer *buffer = (drawto_field == window ? backbuffer : drawto_field); - if (setup.direct_draw && game_status == PLAYING) + if (setup.direct_draw && game_status == GAME_MODE_PLAYING) redraw_mask &= ~REDRAW_MAIN; if (redraw_mask & REDRAW_TILES && redraw_tiles > REDRAWTILES_THRESHOLD) @@ -130,7 +132,7 @@ void BackToFront() if (redraw_mask == REDRAW_NONE) return; - if (global.fps_slowdown && game_status == PLAYING) + if (global.fps_slowdown && game_status == GAME_MODE_PLAYING) { static boolean last_frame_skipped = FALSE; boolean skip_even_when_not_scrolling = TRUE; @@ -175,7 +177,8 @@ void BackToFront() if (redraw_mask & REDRAW_FIELD) { - if (game_status != PLAYING || redraw_mask & REDRAW_FROM_BACKBUFFER) + if (game_status != GAME_MODE_PLAYING || + redraw_mask & REDRAW_FROM_BACKBUFFER) { BlitBitmap(backbuffer, window, REAL_SX, REAL_SY, FULL_SXSIZE, FULL_SYSIZE, REAL_SX, REAL_SY); @@ -243,26 +246,25 @@ void BackToFront() VX+VIDEO_CONTROL_XPOS,VY+VIDEO_CONTROL_YPOS); } } + if (redraw_mask & REDRAW_DOOR_3) BlitBitmap(backbuffer, window, EX, EY, EXSIZE, EYSIZE, EX, EY); + redraw_mask &= ~REDRAW_DOORS; } if (redraw_mask & REDRAW_MICROLEVEL) { - BlitBitmap(backbuffer, window, - MICROLEV_XPOS, MICROLEV_YPOS, MICROLEV_XSIZE, MICROLEV_YSIZE, - MICROLEV_XPOS, MICROLEV_YPOS); - BlitBitmap(backbuffer, window, - SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE, - SX, MICROLABEL_YPOS); + BlitBitmap(backbuffer, window, SX, SY + 10 * TILEY, SXSIZE, 7 * TILEY, + SX, SY + 10 * TILEY); + redraw_mask &= ~REDRAW_MICROLEVEL; } 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, 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 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; - boolean player_is_moving = (last_jx != jx || last_jy != jy ? TRUE : FALSE); 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); @@ -560,36 +628,86 @@ void DrawPlayer(struct PlayerInfo *player) if (element == EL_EXPLOSION) return; - /* draw things in the field the player is leaving, if needed */ +#if 1 + + action = GetPlayerAction(player, move_dir); + +#else + + 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_sleeping ? ACTION_SLEEPING : + player->is_bored ? ACTION_BORING : + player->is_waiting ? ACTION_WAITING : ACTION_DEFAULT); + if (player->is_bored && player->num_special_action_bored > 0) + { + if (player->anim_delay_counter == 0 && player->post_delay_counter == 0) + { + int graphic_waiting; + + action = ACTION_BORING_1 + SimpleRND(player->num_special_action_bored); + special_graphic = el_act_dir2img(EL_SP_MURPHY, action, move_dir); + + player->anim_delay_counter = + graphic_info[special_graphic].anim_delay_fixed + + SimpleRND(graphic_info[special_graphic].anim_delay_random); + player->post_delay_counter = + graphic_info[special_graphic].post_delay_fixed + + SimpleRND(graphic_info[special_graphic].post_delay_random); + player->special_action_bored = action; + } + + if (player->anim_delay_counter > 0) + { + action = player->special_action_bored; + player->anim_delay_counter--; + } + + if (player->post_delay_counter > 0) + { + player->post_delay_counter--; + } + } +#endif + +#if 0 + printf("::: '%s'\n", element_action_info[action].suffix); +#endif + + InitPlayerGfxAnimation(player, action, move_dir); + + /* ----------------------------------------------------------------------- */ + /* draw things in the field the player is leaving, if needed */ + /* ----------------------------------------------------------------------- */ + +#if 1 + if (player->is_moving) +#else if (player_is_moving) +#endif { - if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element)) + if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element)) { - DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]); + DrawLevelElement(last_jx, last_jy, Back[last_jx][last_jy]); - if (last_element == EL_DYNAMITE_ACTIVE) + 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) + 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); - if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) - { - 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); - } + if (player->is_pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) + DrawLevelElement(next_jx, next_jy, EL_EMPTY); } if (!IN_SCR_FIELD(sx, sy)) @@ -598,101 +716,78 @@ void DrawPlayer(struct PlayerInfo *player) if (setup.direct_draw) SetDrawtoField(DRAW_BUFFERED); - /* draw things behind the player, if needed */ + /* ----------------------------------------------------------------------- */ + /* draw things behind the player, if needed */ + /* ----------------------------------------------------------------------- */ - if (Store[jx][jy]) - DrawLevelElement(jx, jy, Store[jx][jy]); - else if (!IS_ACTIVE_BOMB(element)) - DrawLevelField(jx, jy); - else + if (Back[jx][jy]) + DrawLevelElement(jx, jy, Back[jx][jy]); + else if (IS_ACTIVE_BOMB(element)) DrawLevelElement(jx, jy, EL_EMPTY); - - /* draw player himself */ - - if (game.emulation == EMU_SUPAPLEX) + else { - static int last_dir = MV_LEFT; - int action = (player->programmed_action ? player->programmed_action : - player->action); - boolean action_moving = - (player_is_moving || - ((action & (MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)) && - !(action & ~(MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN)))); - - graphic = IMG_SP_MURPHY; - - if (player->Pushing) + if (player_is_moving && GfxElement[jx][jy] != EL_UNDEFINED) { - if (player->MovDir == MV_LEFT) - graphic = IMG_SP_MURPHY_PUSHING_LEFT; - else if (player->MovDir == MV_RIGHT) - graphic = IMG_SP_MURPHY_PUSHING_RIGHT; - else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT) - graphic = IMG_SP_MURPHY_PUSHING_LEFT; - else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT) - graphic = IMG_SP_MURPHY_PUSHING_RIGHT; + 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); + } } - else if (player->snapped) + else { - if (player->MovDir == MV_LEFT) - graphic = IMG_SP_MURPHY_SNAPPING_LEFT; - else if (player->MovDir == MV_RIGHT) - graphic = IMG_SP_MURPHY_SNAPPING_RIGHT; - else if (player->MovDir == MV_UP) - graphic = IMG_SP_MURPHY_SNAPPING_UP; - else if (player->MovDir == MV_DOWN) - graphic = IMG_SP_MURPHY_SNAPPING_DOWN; + GfxElement[jx][jy] = EL_UNDEFINED; + + DrawLevelField(jx, jy); } - else if (action_moving) + } + + /* ----------------------------------------------------------------------- */ + /* 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; + + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) + last_horizontal_dir = move_dir; + + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, move_dir); + + if (graphic == IMG_SP_MURPHY) /* undefined => use special graphic */ { - if (player->MovDir == MV_LEFT) - graphic = IMG_SP_MURPHY_MOVING_LEFT; - else if (player->MovDir == MV_RIGHT) - graphic = IMG_SP_MURPHY_MOVING_RIGHT; - else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_LEFT) - graphic = IMG_SP_MURPHY_MOVING_LEFT; - else if (player->MovDir & (MV_UP | MV_DOWN) && last_dir == MV_RIGHT) - graphic = IMG_SP_MURPHY_MOVING_RIGHT; - else - graphic = IMG_SP_MURPHY_MOVING_LEFT; + int direction = (player->is_snapping ? move_dir : last_horizontal_dir); - frame = getGraphicAnimationFrame(graphic, -1); + graphic = el_act_dir2img(EL_SP_MURPHY, player->GfxAction, direction); } - - if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT) - last_dir = player->MovDir; } else - { - if (player->MovDir == MV_LEFT) - graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_LEFT : - player->is_moving ? IMG_PLAYER1_MOVING_LEFT : - IMG_PLAYER1_LEFT); - else if (player->MovDir == MV_RIGHT) - graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_RIGHT : - player->is_moving ? IMG_PLAYER1_MOVING_RIGHT : - IMG_PLAYER1_RIGHT); - else if (player->MovDir == MV_UP) - graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_UP : - player->is_moving ? IMG_PLAYER1_MOVING_UP : - IMG_PLAYER1_UP); - else /* MV_DOWN || MV_NO_MOVING */ - graphic = (player->Pushing ? IMG_PLAYER1_PUSHING_DOWN : - player->is_moving ? IMG_PLAYER1_MOVING_DOWN : - IMG_PLAYER1_DOWN); - - graphic = PLAYER_NR_GFX(graphic, player->index_nr); + graphic = el_act_dir2img(player->element_nr, player->GfxAction, move_dir); -#if 0 - frame = player->Frame; -#else - frame = getGraphicAnimationFrame(graphic, player->Frame); #endif - } + + frame = getGraphicAnimationFrame(graphic, player->Frame); if (player->GfxPos) { - if (player->MovDir == MV_LEFT || player->MovDir == MV_RIGHT) + if (move_dir == MV_LEFT || move_dir == MV_RIGHT) sxx = player->GfxPos; else syy = player->GfxPos; @@ -701,11 +796,6 @@ void DrawPlayer(struct PlayerInfo *player) if (!setup.soft_scrolling && ScreenMovPos) sxx = syy = 0; -#if 0 - if (player->Frame) - printf("-> %d\n", player->Frame); -#endif - DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); if (SHIELD_ON(player)) @@ -717,85 +807,53 @@ void DrawPlayer(struct PlayerInfo *player) DrawGraphicShiftedThruMask(sx, sy, sxx, syy, graphic, frame, NO_CUTTING); } + /* ----------------------------------------------------------------------- */ + /* draw things the player is pushing, if needed */ + /* ----------------------------------------------------------------------- */ + #if 0 - if (player->Pushing && player->GfxPos) + 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->Pushing && player_is_moving) + if (player->is_pushing && player_is_moving) #endif { int px = SCREENX(next_jx), py = SCREENY(next_jy); - if ((sxx || syy) && - (element == EL_SOKOBAN_FIELD_EMPTY || - Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)) + if (Back[next_jx][next_jy]) + DrawLevelElement(next_jx, next_jy, Back[next_jx][next_jy]); + + if ((sxx || syy) && element == EL_SOKOBAN_OBJECT) DrawGraphicShiftedThruMask(px, py, sxx, syy, IMG_SOKOBAN_OBJECT, 0, NO_CUTTING); else { - int element = Feld[next_jx][next_jy]; - int graphic = el2img(element); -#if 1 - int frame = 0; -#endif - - if ((sxx || syy) && IS_PUSHABLE(element)) - { - graphic = el_act_dir2img(element, ACTION_MOVING, player->MovDir); + int element = MovingOrBlocked2Element(next_jx, next_jy); + int graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir); #if 1 - frame = getGraphicAnimationFrame(graphic, player->GfxPos); - - frame = getGraphicAnimationFrame(graphic, player->Frame); -#endif - -#if 0 - printf("-> %d [%d]\n", player->Frame, player->GfxPos); -#endif - -#if 0 - /* !!! FIX !!! */ - if (player->MovDir == MV_LEFT) - frame = 3 - frame; -#endif - -#if 0 - frame = (player->GfxPos / (TILEX / 4)); - - if (player->MovDir == MV_RIGHT) - frame = (frame + 4) % 4; + 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); } } - /* draw things in front of player (active dynamite or dynabombs) */ + /* ----------------------------------------------------------------------- */ + /* draw things in front of player (active dynamite or dynabombs) */ + /* ----------------------------------------------------------------------- */ if (IS_ACTIVE_BOMB(element)) { graphic = el2img(element); - -#if 0 - if (element == EL_DYNAMITE_ACTIVE) - { - if ((frame = (96 - MovDelay[jx][jy]) / 12) > 6) - frame = 6; - } - else - { - if ((frame = ((96 - MovDelay[jx][jy]) / 6) % 8) > 3) - frame = 7 - frame; - } -#else - -#if 0 - frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[jx][jy]); -#else frame = getGraphicAnimationFrame(graphic, GfxFrame[jx][jy]); -#endif - -#endif if (game.emulation == EMU_SUPAPLEX) DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); @@ -805,10 +863,7 @@ void DrawPlayer(struct PlayerInfo *player) if (player_is_moving && last_element == EL_EXPLOSION) { - int stored = Store[last_jx][last_jy]; - int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION : - stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON : - IMG_SP_EXPLOSION); + int 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); @@ -817,14 +872,21 @@ void DrawPlayer(struct PlayerInfo *player) DrawGraphicThruMask(SCREENX(last_jx), SCREENY(last_jy), graphic, frame); } - /* draw elements that stay over the player */ + /* ----------------------------------------------------------------------- */ + /* draw elements the player is just walking/passing through/under */ + /* ----------------------------------------------------------------------- */ + /* handle the field the player is leaving ... */ - if (player_is_moving && IS_OVER_PLAYER(last_element)) + if (player_is_moving && IS_ACCESSIBLE_INSIDE(last_element)) DrawLevelField(last_jx, last_jy); + else if (player_is_moving && IS_ACCESSIBLE_UNDER(last_element)) + DrawLevelFieldThruMask(last_jx, last_jy); /* ... and the field the player is entering */ - if (IS_OVER_PLAYER(element)) + if (IS_ACCESSIBLE_INSIDE(element)) DrawLevelField(jx, jy); + else if (IS_ACCESSIBLE_UNDER(element)) + DrawLevelFieldThruMask(jx, jy); if (setup.direct_draw) { @@ -843,15 +905,29 @@ void DrawPlayer(struct PlayerInfo *player) void getGraphicSource(int graphic, int frame, Bitmap **bitmap, int *x, int *y) { - Bitmap *src_bitmap = graphic_info[graphic].bitmap; - int offset_x = graphic_info[graphic].offset_x; - int offset_y = graphic_info[graphic].offset_y; - int src_x = graphic_info[graphic].src_x + frame * offset_x; - int src_y = graphic_info[graphic].src_y + frame * offset_y; + struct GraphicInfo *g = &graphic_info[graphic]; - *bitmap = src_bitmap; - *x = src_x; - *y = src_y; + *bitmap = g->bitmap; + + if (g->offset_y == 0) /* frames are ordered horizontally */ + { + int max_width = g->anim_frames_per_line * g->width; + + *x = (g->src_x + frame * g->offset_x) % max_width; + *y = g->src_y + (g->src_x + frame * g->offset_x) / max_width * g->height; + } + else if (g->offset_x == 0) /* frames are ordered vertically */ + { + int max_height = g->anim_frames_per_line * g->height; + + *x = g->src_x + (g->src_y + frame * g->offset_y) / max_height * g->width; + *y = (g->src_y + frame * g->offset_y) % max_height; + } + else /* frames are ordered diagonally */ + { + *x = g->src_x + frame * g->offset_x; + *y = g->src_y + frame * g->offset_y; + } } void DrawGraphic(int x, int y, int graphic, int frame) @@ -869,36 +945,13 @@ void DrawGraphic(int x, int y, int graphic, int frame) MarkTileDirty(x, y); } -#if 0 -void DrawOldGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic) -{ - Bitmap *src_bitmap; - int src_x, src_y; - - getOldGraphicSource(graphic, &src_bitmap, &src_x, &src_y); - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); -} -#endif - void DrawGraphicExt(DrawBuffer *dst_bitmap, int x, int y, int graphic, int frame) { -#if 1 Bitmap *src_bitmap; int src_x, src_y; getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); -#else - Bitmap *src_bitmap = graphic_info[graphic].bitmap; - int src_x = graphic_info[graphic].src_x; - int src_y = graphic_info[graphic].src_y; - int offset_x = graphic_info[graphic].offset_x; - int offset_y = graphic_info[graphic].offset_y; - - src_x += frame * offset_x; - src_y += frame * offset_y; -#endif - BlitBitmap(src_bitmap, dst_bitmap, src_x, src_y, TILEX, TILEY, x, y); } @@ -953,32 +1006,13 @@ void DrawMiniGraphic(int x, int y, int graphic) void getMiniGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { - Bitmap *src_bitmap = graphic_info[graphic].bitmap; + struct GraphicInfo *g = &graphic_info[graphic]; int mini_startx = 0; - int mini_starty = src_bitmap->height * 2 / 3; - int src_x = mini_startx + graphic_info[graphic].src_x / 2; - int src_y = mini_starty + graphic_info[graphic].src_y / 2; - -#if 0 - /* !!! not needed anymore, because of automatically created mini graphics */ - if (src_x + MINI_TILEX > src_bitmap->width || - src_y + MINI_TILEY > src_bitmap->height) - { - /* graphic of desired size seems not to be contained in this image; - dirty workaround: get it from the middle of the normal sized image */ + int mini_starty = g->bitmap->height * 2 / 3; - printf("::: using dirty workaround for %d (%d, %d)\n", - graphic, src_bitmap->width, src_bitmap->height); - - getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); - src_x += (TILEX / 2 - MINI_TILEX / 2); - src_y += (TILEY / 2 - MINI_TILEY / 2); - } -#endif - - *bitmap = src_bitmap; - *x = src_x; - *y = src_y; + *bitmap = g->bitmap; + *x = mini_startx + g->src_x / 2; + *y = mini_starty + g->src_y / 2; } void DrawMiniGraphicExt(DrawBuffer *d, int x, int y, int graphic) @@ -995,11 +1029,7 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, { Bitmap *src_bitmap; GC drawing_gc; - int src_x; - int src_y; - int offset_x; - int offset_y; - + int src_x, src_y; int width = TILEX, height = TILEY; int cx = 0, cy = 0; int dest_x, dest_y; @@ -1074,16 +1104,20 @@ void DrawGraphicShifted(int x,int y, int dx,int dy, int graphic, int frame, MarkTileDirty(x, y + SIGN(dy)); } +#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; - drawing_gc = src_bitmap->stored_clip_gc; - src_x += frame * offset_x; src_y += frame * offset_y; +#endif + + drawing_gc = src_bitmap->stored_clip_gc; src_x += cx; src_y += cy; @@ -1130,7 +1164,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 */ @@ -1139,49 +1173,28 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, frame = getGraphicAnimationFrame(graphic, -1); } - if (element == EL_WALL_GROWING) + if (element == EL_EXPANDABLE_WALL) { boolean left_stopped = FALSE, right_stopped = FALSE; - if (!IN_LEV_FIELD(lx - 1, ly) || IS_MAUER(Feld[lx - 1][ly])) + if (!IN_LEV_FIELD(lx - 1, ly) || IS_WALL(Feld[lx - 1][ly])) left_stopped = TRUE; - if (!IN_LEV_FIELD(lx + 1, ly) || IS_MAUER(Feld[lx + 1][ly])) + if (!IN_LEV_FIELD(lx + 1, ly) || IS_WALL(Feld[lx + 1][ly])) right_stopped = TRUE; if (left_stopped && right_stopped) graphic = IMG_WALL; else if (left_stopped) { - graphic = IMG_WALL_GROWING_ACTIVE_RIGHT; + graphic = IMG_EXPANDABLE_WALL_GROWING_RIGHT; frame = graphic_info[graphic].anim_frames - 1; } else if (right_stopped) { - graphic = IMG_WALL_GROWING_ACTIVE_LEFT; + graphic = IMG_EXPANDABLE_WALL_GROWING_LEFT; frame = graphic_info[graphic].anim_frames - 1; } } -#if 0 - else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING) - { - graphic = (element == EL_BD_AMOEBA ? IMG_BD_AMOEBA_PART1 : - element == EL_AMOEBA_WET ? IMG_AMOEBA_WET_PART1 : - element == EL_AMOEBA_DRY ? IMG_AMOEBA_DRY_PART1 : - element == EL_AMOEBA_FULL ? IMG_AMOEBA_FULL_PART1 : - IMG_AMOEBA_DEAD_PART1); - - graphic += (x + 2 * y + 4) % 4; - } -#endif - -#if 0 - if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING) - { - if (Feld[lx][ly] == EL_AMOEBA_DRIPPING) - printf("---> %d -> %d / %d [%d]\n", - element, graphic, frame, GfxRandom[lx][ly]); - } -#endif if (dx || dy) DrawGraphicShifted(x, y, dx, dy, graphic, frame, cut_mode, mask_mode); @@ -1211,18 +1224,6 @@ void DrawLevelElementShifted(int x, int y, int dx, int dy, int element, DrawLevelElementExt(x, y, dx, dy, element, cut_mode, NO_MASKING); } -#if 0 -void DrawOldScreenElementThruMask(int x, int y, int element) -{ - DrawOldScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); -} - -void DrawScreenElementThruMask(int x, int y, int element) -{ - DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); -} -#endif - void DrawLevelElementThruMask(int x, int y, int element) { DrawLevelElementExt(x, y, 0, 0, element, NO_CUTTING, USE_MASKING); @@ -1233,14 +1234,18 @@ void DrawLevelFieldThruMask(int x, int y) DrawLevelElementExt(x, y, 0, 0, Feld[x][y], NO_CUTTING, USE_MASKING); } -void DrawCrumbledSand(int x, int y) +static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) { Bitmap *src_bitmap; int src_x, src_y; - int i, width, height, cx,cy; - int lx = LEVELX(x), ly = LEVELY(y); - int element, graphic; - int snip = 4; + 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 }, @@ -1249,111 +1254,177 @@ void DrawCrumbledSand(int x, int y) { 0, +1 } }; - if (!IN_LEV_FIELD(lx, ly)) +#if 0 + if (x == 0 && y == 7) + printf("::: %d, %d [%d]\n", GfxElement[x][y], Feld[x][y], + crumbled_border_size); +#endif + + if (!IN_LEV_FIELD(x, y)) return; - element = Feld[lx][ly]; + element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ? + GfxElement[x][y] : Feld[x][y]); - if (element == EL_SAND || - element == EL_LANDMINE || - element == EL_TRAP || - element == EL_TRAP_ACTIVE) + /* crumble field itself */ + if (GFX_CRUMBLED(element) && !IS_MOVING(x, y)) { - if (!IN_SCR_FIELD(x, y)) + if (!IN_SCR_FIELD(sx, sy)) return; - graphic = IMG_SAND_CRUMBLED; - - src_bitmap = graphic_info[graphic].bitmap; - src_x = graphic_info[graphic].src_x; - src_y = graphic_info[graphic].src_y; + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) { - int lxx, lyy; + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; - lxx = lx + xy[i][0]; - lyy = ly + xy[i][1]; - if (!IN_LEV_FIELD(lxx, lyy)) - element = EL_STEELWALL; - else - element = Feld[lxx][lyy]; + element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); - if (element == EL_SAND || - element == EL_LANDMINE || - element == EL_TRAP || - element == EL_TRAP_ACTIVE) + /* check if neighbour field is of same type */ + if (GFX_CRUMBLED(element) && !IS_MOVING(xx, yy)) continue; +#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 + if (i == 1 || i == 2) { - width = snip; + width = crumbled_border_size; height = TILEY; - cx = (i == 2 ? TILEX - snip : 0); + cx = (i == 2 ? TILEX - crumbled_border_size : 0); cy = 0; } else { width = TILEX; - height = snip; + height = crumbled_border_size; cx = 0; - cy = (i == 3 ? TILEY - snip : 0); + cy = (i == 3 ? TILEY - crumbled_border_size : 0); } BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + x * TILEX + cx, FY + y * TILEY + cy); + width, height, FX + sx * TILEX + cx, FY + sy * TILEY + cy); } - MarkTileDirty(x, y); + MarkTileDirty(sx, sy); } - else + else /* crumble neighbour fields */ { - graphic = IMG_SAND_CRUMBLED; - - src_bitmap = graphic_info[graphic].bitmap; - src_x = graphic_info[graphic].src_x; - src_y = graphic_info[graphic].src_y; +#if 0 + getGraphicSource(graphic, frame, &src_bitmap, &src_x, &src_y); +#endif - for(i=0; i<4; i++) + for (i = 0; i < 4; i++) { - int xx, yy, lxx, lyy; - - xx = x + xy[i][0]; - yy = y + xy[i][1]; - lxx = lx + xy[i][0]; - lyy = ly + xy[i][1]; - - if (!IN_LEV_FIELD(lxx, lyy) || - (Feld[lxx][lyy] != EL_SAND && - Feld[lxx][lyy] != EL_LANDMINE && - Feld[lxx][lyy] != EL_TRAP && - Feld[lxx][lyy] != EL_TRAP_ACTIVE) || - !IN_SCR_FIELD(xx, yy)) + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; + + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !GFX_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) continue; +#if 1 + 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); +#endif + if (i == 1 || i == 2) { - width = snip; + width = crumbled_border_size; height = TILEY; - cx = (i == 1 ? TILEX - snip : 0); + cx = (i == 1 ? TILEX - crumbled_border_size : 0); cy = 0; } else { width = TILEX; - height = snip; + height = crumbled_border_size; cx = 0; - cy = (i==0 ? TILEY-snip : 0); + cy = (i == 0 ? TILEY - crumbled_border_size : 0); } BlitBitmap(src_bitmap, drawto_field, src_x + cx, src_y + cy, - width, height, FX + xx * TILEX + cx, FY + yy * TILEY + cy); + width, height, FX + sxx * TILEX + cx, FY + syy * TILEY + cy); - MarkTileDirty(xx, yy); + MarkTileDirty(sxx, syy); } } } +void DrawLevelFieldCrumbledSand(int x, int y) +{ +#if 1 + int graphic; + + if (!IN_LEV_FIELD(x, y)) + return; + + graphic = el_act2crm(Feld[x][y], ACTION_DEFAULT); + + DrawLevelFieldCrumbledSandExt(x, y, graphic, 0); +#else + DrawLevelFieldCrumbledSandExt(x, y, IMG_SAND_CRUMBLED, 0); +#endif +} + +void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, + int step_frame) +{ +#if 1 + int graphic1 = el_act_dir2img(GfxElement[x][y], ACTION_DIGGING, direction); + int graphic2 = el_act_dir2crm(GfxElement[x][y], ACTION_DIGGING, direction); +#else + int graphic1 = el_act_dir2img(EL_SAND, ACTION_DIGGING, direction); + int graphic2 = el_act_dir2img(EL_SAND_CRUMBLED, ACTION_DIGGING, direction); +#endif + int frame1 = getGraphicAnimationFrame(graphic1, step_frame); + int frame2 = getGraphicAnimationFrame(graphic2, step_frame); + int sx = SCREENX(x), sy = SCREENY(y); + + DrawGraphic(sx, sy, graphic1, frame1); + DrawLevelFieldCrumbledSandExt(x, y, graphic2, frame2); +} + +void DrawLevelFieldCrumbledSandNeighbours(int x, int y) +{ + int sx = SCREENX(x), sy = SCREENY(y); + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + int i; + + for (i = 0; i < 4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; + + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !GFX_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; + + DrawLevelField(xx, yy); + } +} + static int getBorderElement(int x, int y) { int border[7][2] = @@ -1367,12 +1438,12 @@ static int getBorderElement(int x, int y) { 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 steel_position = (x == -1 && y == -1 ? 0 : + x == lev_fieldx && y == -1 ? 1 : + x == -1 && y == lev_fieldy ? 2 : + x == lev_fieldx && y == lev_fieldy ? 3 : + x == -1 || x == lev_fieldx ? 4 : + y == -1 || y == lev_fieldy ? 5 : 6); return border[steel_position][steel_type]; } @@ -1380,7 +1451,7 @@ static int getBorderElement(int x, int y) void DrawScreenElement(int x, int y, int element) { DrawScreenElementExt(x, y, 0, 0, element, NO_CUTTING, NO_MASKING); - DrawCrumbledSand(x, y); + DrawLevelFieldCrumbledSand(LEVELX(x), LEVELY(y)); } void DrawLevelElement(int x, int y, int element) @@ -1416,7 +1487,7 @@ void DrawScreenField(int x, int y) if (element == EL_QUICKSAND_EMPTYING || element == EL_MAGIC_WALL_EMPTYING || element == EL_BD_MAGIC_WALL_EMPTYING || - element == EL_AMOEBA_DRIPPING) + element == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; else if (element == EL_QUICKSAND_FILLING || element == EL_MAGIC_WALL_FILLING || @@ -1458,7 +1529,7 @@ void DrawScreenField(int x, int y) if (element_old == EL_QUICKSAND_EMPTYING || element_old == EL_MAGIC_WALL_EMPTYING || element_old == EL_BD_MAGIC_WALL_EMPTYING || - element_old == EL_AMOEBA_DRIPPING) + element_old == EL_AMOEBA_DROPPING) cut_mode = CUT_ABOVE; DrawScreenElement(x, y, EL_EMPTY); @@ -1521,6 +1592,140 @@ void DrawMiniElementOrWall(int sx, int sy, int scroll_x, int scroll_y) DrawMiniGraphic(sx, sy, el2edimg(getBorderElement(x, y))); } +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 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); + + if (src_bitmap == NULL || width < font_width || height < font_height) + { + ClearRectangle(drawto, dst_x, dst_y, font_width, font_height); + 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); +} + +void AnimateEnvelope(int envelope_nr, int anim_mode, int action) +{ + int graphic = IMG_BACKGROUND_ENVELOPE_1 + envelope_nr; + boolean draw_masked = graphic_info[graphic].draw_masked; + int mask_mode = (draw_masked ? BLIT_MASKED : BLIT_ON_BACKGROUND); + boolean ffwd_delay = (tape.playing && tape.fast_forward); + unsigned long anim_delay = 0; + int anim_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + 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; + + SetDrawtoField(DRAW_BUFFERED); + + BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); + + SetDrawtoField(DRAW_BACKBUFFER); + + 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 + 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 / 2); + } +} + +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); + int wait_delay_value = (ffwd_delay ? 500 : 1000); + 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); + + game.envelope_active = TRUE; /* needed for RedrawPlayfield() events */ + + PlaySoundStereo(sound_opening, SOUND_MIDDLE); + + if (anim_mode == ANIM_DEFAULT) + AnimateEnvelope(envelope_nr, ANIM_DEFAULT, ACTION_OPENING); + + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_OPENING); + + if (tape.playing) + Delay(wait_delay_value); + else + WaitForEventToContinue(); + + PlaySoundStereo(sound_closing, SOUND_MIDDLE); + + if (anim_mode != ANIM_NONE) + AnimateEnvelope(envelope_nr, main_anim_mode, ACTION_CLOSING); + + 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 getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) { Bitmap *src_bitmap = graphic_info[graphic].bitmap; @@ -1529,17 +1734,6 @@ void getMicroGraphicSource(int graphic, Bitmap **bitmap, int *x, int *y) int src_x = mini_startx + graphic_info[graphic].src_x / 8; int src_y = mini_starty + graphic_info[graphic].src_y / 8; - if (src_x + MICRO_TILEX > src_bitmap->width || - src_y + MICRO_TILEY > src_bitmap->height) - { - /* graphic of desired size seems not to be contained in this image; - dirty workaround: get it from the middle of the normal sized image */ - - getGraphicSource(graphic, 0, &src_bitmap, &src_x, &src_y); - src_x += (TILEX / 2 - MICRO_TILEX / 2); - src_y += (TILEY / 2 - MICRO_TILEY / 2); - } - *bitmap = src_bitmap; *x = src_x; *y = src_y; @@ -1563,8 +1757,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; @@ -1574,8 +1768,8 @@ void DrawMiniLevel(int size_x, int size_y, int scroll_x, int scroll_y) { int x,y; - for(x=0; x= 0 && lx < lev_fieldx && ly >= 0 && ly < lev_fieldy) DrawMicroElement(xpos + x * MICRO_TILEX, ypos + y * MICRO_TILEY, - Ur[lx][ly]); + 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, @@ -1621,13 +1815,18 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) #define MICROLABEL_IMPORTED_FROM 4 #define MICROLABEL_LEVEL_IMPORT_INFO 5 -#define MAX_MICROLABEL_SIZE (SXSIZE / FONT4_XSIZE) - static void DrawMicroLevelLabelExt(int mode) { - char label_text[MAX_MICROLABEL_SIZE + 1]; + char label_text[MAX_OUTPUT_LINESIZE + 1]; + int max_len_label_text; + int font_nr = FONT_TEXT_2; + + if (mode == MICROLABEL_CREATED_BY || mode == MICROLABEL_IMPORTED_FROM) + font_nr = FONT_TEXT_3; + + max_len_label_text = SXSIZE / getFontWidth(font_nr); - DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, FONT4_YSIZE); + DrawBackground(SX, MICROLABEL_YPOS, SXSIZE, getFontHeight(font_nr)); strncpy(label_text, (mode == MICROLABEL_LEVEL_NAME ? level.name : mode == MICROLABEL_CREATED_BY ? "created by" : @@ -1635,15 +1834,15 @@ static void DrawMicroLevelLabelExt(int mode) mode == MICROLABEL_IMPORTED_FROM ? "imported from" : mode == MICROLABEL_LEVEL_IMPORT_INFO ? leveldir_current->imported_from : ""), - MAX_MICROLABEL_SIZE); - label_text[MAX_MICROLABEL_SIZE] = '\0'; + max_len_label_text); + label_text[max_len_label_text] = '\0'; if (strlen(label_text) > 0) { - int lxpos = SX + (SXSIZE - strlen(label_text) * FONT4_XSIZE) / 2; + int lxpos = SX + (SXSIZE - getTextWidth(label_text, font_nr)) / 2; int lypos = MICROLABEL_YPOS; - DrawText(lxpos, lypos, label_text, FS_SMALL, FC_SPECIAL2); + DrawText(lxpos, lypos, label_text, font_nr); } redraw_mask |= REDRAW_MICROLEVEL; @@ -1655,6 +1854,10 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) static unsigned long label_delay = 0; static int from_x, from_y, scroll_direction; static int label_state, label_counter; + int last_game_status = game_status; /* save current game status */ + + /* force PREVIEW font on preview level */ + game_status = GAME_MODE_PSEUDO_PREVIEW; if (restart) { @@ -1670,6 +1873,17 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) DelayReached(&scroll_delay, 0); DelayReached(&label_delay, 0); + if (leveldir_current->name) + { + int text_width = getTextWidth(leveldir_current->name, FONT_TEXT_1); + int lxpos = SX + (SXSIZE - text_width) / 2; + int lypos = SY + 352; + + DrawText(lxpos, lypos, leveldir_current->name, FONT_TEXT_1); + } + + game_status = last_game_status; /* restore current game status */ + return; } @@ -1738,38 +1952,101 @@ void DrawMicroLevel(int xpos, int ypos, boolean restart) MICROLABEL_LEVEL_IMPORT_INFO : MICROLABEL_EMPTY); DrawMicroLevelLabelExt(label_state); } + + game_status = last_game_status; /* restore current game status */ } -int REQ_in_range(int x, int y) +void WaitForEventToContinue() { - if (y > DY+249 && y < DY+278) + boolean still_wait = TRUE; + + /* simulate releasing mouse button over last gadget, if still pressed */ + if (button_status) + HandleGadgets(-1, -1, 0); + + button_status = MB_RELEASED; + + while (still_wait) { - if (x > DX+1 && x < DX+48) - return 1; - else if (x > DX+51 && x < DX+98) - return 2; + if (PendingEvent()) + { + Event event; + + NextEvent(&event); + + switch (event.type) + { + case EVENT_BUTTONPRESS: + case EVENT_KEYPRESS: + still_wait = FALSE; + break; + + case EVENT_KEYRELEASE: + ClearPlayerAction(); + break; + + default: + HandleOtherEvents(&event); + break; + } + } + else if (AnyJoystickButton() == JOY_BUTTON_NEW_PRESSED) + { + still_wait = FALSE; + } + + DoAnimation(); + + /* don't eat all CPU time */ + Delay(10); } - return 0; } #define MAX_REQUEST_LINES 13 -#define MAX_REQUEST_LINE_LEN 7 +#define MAX_REQUEST_LINE_FONT1_LEN 7 +#define MAX_REQUEST_LINE_FONT2_LEN 10 boolean Request(char *text, unsigned int req_state) { int mx, my, ty, result = -1; unsigned int old_door_state; + int last_game_status = game_status; /* save current game status */ + int max_request_line_len = MAX_REQUEST_LINE_FONT1_LEN; + int font_nr = FONT_TEXT_2; + int max_word_len = 0; + char *text_ptr; + + for (text_ptr = text; *text_ptr; text_ptr++) + { + max_word_len = (*text_ptr != ' ' ? max_word_len + 1 : 0); + + if (max_word_len > MAX_REQUEST_LINE_FONT1_LEN) + { + max_request_line_len = MAX_REQUEST_LINE_FONT2_LEN; + font_nr = FONT_LEVEL_NUMBER; + + break; + } + } + +#if 1 + SetMouseCursor(CURSOR_DEFAULT); +#endif #if defined(PLATFORM_UNIX) /* pause network game while waiting for request to answer */ if (options.network && - game_status == PLAYING && + game_status == GAME_MODE_PLAYING && req_state & REQUEST_WAIT_FOR) SendToServer_PausePlaying(); #endif old_door_state = GetDoorState(); + /* simulate releasing mouse button over last gadget, if still pressed */ + if (button_status) + HandleGadgets(-1, -1, 0); + UnmapAllGadgets(); CloseDoor(DOOR_CLOSE_1); @@ -1784,16 +2061,19 @@ boolean Request(char *text, unsigned int req_state) /* clear door drawing field */ DrawBackground(DX, DY, DXSIZE, DYSIZE); + /* force DOOR font on preview level */ + 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]; + char text_line[max_request_line_len + 1]; int tx, tl, tc; 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 == ' ') @@ -1810,12 +2090,15 @@ boolean Request(char *text, unsigned int req_state) strncpy(text_line, text, tl); text_line[tl] = 0; - DrawText(DX + 50 - (tl * 14)/2, DY + 8 + ty * 16, - text_line, FS_SMALL, FC_YELLOW); + DrawText(DX + (DXSIZE - tl * getFontWidth(font_nr)) / 2, + DY + 8 + ty * (getFontHeight(font_nr) + 2), + text_line, font_nr); text += tl + (tc == ' ' ? 1 : 0); } + game_status = last_game_status; /* restore current game status */ + if (req_state & REQ_ASK) { MapGadget(tool_gadget[TOOL_CTRL_ID_YES]); @@ -1851,7 +2134,7 @@ boolean Request(char *text, unsigned int req_state) return FALSE; } - if (game_status != MAINMENU) + if (game_status != GAME_MODE_MAIN) InitAnimation(); button_status = MB_RELEASED; @@ -1860,7 +2143,11 @@ boolean Request(char *text, unsigned int req_state) SetDrawBackgroundMask(REDRAW_FIELD | REDRAW_DOOR_1); - while(result < 0) +#if 0 + SetMouseCursor(CURSOR_DEFAULT); +#endif + + while (result < 0) { if (PendingEvent()) { @@ -1975,7 +2262,7 @@ boolean Request(char *text, unsigned int req_state) Delay(10); } - if (game_status != MAINMENU) + if (game_status != GAME_MODE_MAIN) StopAnimation(); UnmapToolButtons(); @@ -2000,7 +2287,7 @@ boolean Request(char *text, unsigned int req_state) #if defined(PLATFORM_UNIX) /* continue network game after request */ if (options.network && - game_status == PLAYING && + game_status == GAME_MODE_PLAYING && req_state & REQUEST_WAIT_FOR) SendToServer_ContinuePlaying(); #endif @@ -2053,9 +2340,9 @@ unsigned int MoveDoor(unsigned int door_state) { static int door1 = DOOR_OPEN_1; static int door2 = DOOR_CLOSE_2; - static unsigned long door_delay = 0; - int x, start, stepsize = 2; - unsigned long door_delay_value = stepsize * 5; + unsigned long door_delay = 0; + unsigned long door_delay_value; + int stepsize = 1; if (door_state == DOOR_GET_STATE) return(door1 | door2); @@ -2079,13 +2366,16 @@ 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; + stepsize = 20; /* must be choosen to always draw last frame */ door_delay_value = 0; - StopSound(SND_MENU_DOOR_OPENING); - StopSound(SND_MENU_DOOR_CLOSING); + StopSound(SND_DOOR_OPENING); + StopSound(SND_DOOR_CLOSING); } if (global.autoplay_leveldir) @@ -2096,112 +2386,200 @@ unsigned int MoveDoor(unsigned int door_state) if (door_state & DOOR_ACTION) { + boolean door_1_done = !(door_state & DOOR_ACTION_1); + boolean door_2_done = !(door_state & DOOR_ACTION_2); + int start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0); + int end = (door_state & DOOR_ACTION_1 && + door_1.anim_mode == ANIM_VERTICAL ? DYSIZE : DXSIZE); + int x; + if (!(door_state & DOOR_NO_DELAY)) { /* opening door sound has priority over simultaneously closing door */ if (door_state & (DOOR_OPEN_1 | DOOR_OPEN_2)) - PlaySoundStereo(SND_MENU_DOOR_OPENING, SOUND_MAX_RIGHT); + PlaySoundStereo(SND_DOOR_OPENING, SOUND_MIDDLE); else if (door_state & (DOOR_CLOSE_1 | DOOR_CLOSE_2)) - PlaySoundStereo(SND_MENU_DOOR_CLOSING, SOUND_MAX_RIGHT); + PlaySoundStereo(SND_DOOR_CLOSING, SOUND_MIDDLE); } - start = ((door_state & DOOR_NO_DELAY) ? DXSIZE : 0); - - for(x=start; x<=DXSIZE; 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; - if (!(door_state & DOOR_NO_DELAY)) - WaitUntilDelayReached(&door_delay, door_delay_value); - if (door_state & DOOR_ACTION_1) { - int i = (door_state & DOOR_OPEN_1 ? DXSIZE-x : x); - int j = (DXSIZE - i) / 3; - - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i/2, - DXSIZE,DYSIZE - i/2, DX, DY); - - ClearRectangle(drawto, DX, DY + DYSIZE - i/2, DXSIZE,i/2); - - SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1, i, 77, - DX + DXSIZE - i, DY + j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 140, i, 63, - DX + DXSIZE - i, DY + 140 + j); - SetClipOrigin(bitmap, gc, DX - DXSIZE + i, DY - (DOOR_GFX_PAGEY1 + j)); - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + j, i, 77 - j, - DX, DY); - BlitBitmapMasked(bitmap, drawto, - DXSIZE-i, DOOR_GFX_PAGEY1 + 140, i, 63, - DX, DY + 140 - j); - - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + 77, i, 63, - DX, DY + 77 - j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE - i, DOOR_GFX_PAGEY1 + 203, i, 77, - DX, DY + 203 - j); - SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 77, i, 63, - DX + DXSIZE - i, DY + 77 + j); - BlitBitmapMasked(bitmap, drawto, - DXSIZE, DOOR_GFX_PAGEY1 + 203, i, 77 - j, - DX + DXSIZE - i, DY + 203 + j); + int a = MIN(x * door_1.step_offset, end); + int i = (door_state & DOOR_OPEN_1 ? end - a : a); + + if (x <= a) + { + BlitBitmap(bitmap_db_door, drawto, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1 + i / 2, + DXSIZE,DYSIZE - i / 2, DX, DY); + + ClearRectangle(drawto, DX, DY + DYSIZE - i / 2, DXSIZE, i / 2); + } + + if (door_1.anim_mode == ANIM_HORIZONTAL && x <= DXSIZE) + { + int src1_x = DXSIZE, src1_y = DOOR_GFX_PAGEY1; + int dst1_x = DX + DXSIZE - i, dst1_y = DY; + int src2_x = DXSIZE - i, src2_y = DOOR_GFX_PAGEY1; + int dst2_x = DX, dst2_y = DY; + int width = i, height = DYSIZE; + + SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); + BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, + dst1_x, dst1_y); + + SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); + BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, + dst2_x, dst2_y); + } + else if (door_1.anim_mode == ANIM_VERTICAL && x <= DYSIZE) + { + int src1_x = DXSIZE, src1_y = DOOR_GFX_PAGEY1; + int dst1_x = DX, dst1_y = DY + DYSIZE - i; + int src2_x = 0, src2_y = DOOR_GFX_PAGEY1 + DYSIZE - i; + int dst2_x = DX, dst2_y = DY; + int width = DXSIZE, height = i; + + SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); + BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, + dst1_x, dst1_y); + + SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); + BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, + dst2_x, dst2_y); + } + else if (x <= DXSIZE) /* ANIM_DEFAULT */ + { + int j = (door_1.anim_mode == ANIM_DEFAULT ? (DXSIZE - i) / 3 : 0); + + SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); + BlitBitmapMasked(bitmap, drawto, + DXSIZE, DOOR_GFX_PAGEY1, i, 77, + DX + DXSIZE - i, DY + j); + BlitBitmapMasked(bitmap, drawto, + DXSIZE, DOOR_GFX_PAGEY1 + 140, i, 63, + DX + DXSIZE - i, DY + 140 + j); + SetClipOrigin(bitmap, gc, DX - DXSIZE + i, + DY - (DOOR_GFX_PAGEY1 + j)); + BlitBitmapMasked(bitmap, drawto, + DXSIZE - i, DOOR_GFX_PAGEY1 + j, i, 77 - j, + DX, DY); + BlitBitmapMasked(bitmap, drawto, + DXSIZE-i, DOOR_GFX_PAGEY1 + 140, i, 63, + DX, DY + 140 - j); + + BlitBitmapMasked(bitmap, drawto, + DXSIZE - i, DOOR_GFX_PAGEY1 + 77, i, 63, + DX, DY + 77 - j); + BlitBitmapMasked(bitmap, drawto, + DXSIZE - i, DOOR_GFX_PAGEY1 + 203, i, 77, + DX, DY + 203 - j); + SetClipOrigin(bitmap, gc, DX - i, (DY + j) - DOOR_GFX_PAGEY1); + BlitBitmapMasked(bitmap, drawto, + DXSIZE, DOOR_GFX_PAGEY1 + 77, i, 63, + DX + DXSIZE - i, DY + 77 + j); + BlitBitmapMasked(bitmap, drawto, + DXSIZE, DOOR_GFX_PAGEY1 + 203, i, 77 - j, + DX + DXSIZE - i, DY + 203 + j); + } redraw_mask |= REDRAW_DOOR_1; + door_1_done = (a == end); } if (door_state & DOOR_ACTION_2) { - int i = (door_state & DOOR_OPEN_2 ? VXSIZE - x : x); - int j = (VXSIZE - i) / 3; - - BlitBitmap(bitmap_db_door, drawto, - DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i/2, - VXSIZE, VYSIZE - i/2, VX, VY); - - ClearRectangle(drawto, VX, VY + VYSIZE-i/2, VXSIZE, i/2); - - SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); - BlitBitmapMasked(bitmap, drawto, - VXSIZE, DOOR_GFX_PAGEY2, i, VYSIZE / 2, - VX + VXSIZE-i, VY+j); - SetClipOrigin(bitmap, gc, - VX - VXSIZE + i, VY - (DOOR_GFX_PAGEY2 + j)); - BlitBitmapMasked(bitmap, drawto, - VXSIZE - i, DOOR_GFX_PAGEY2 + j, i, VYSIZE / 2 - j, - VX, VY); - - BlitBitmapMasked(bitmap, drawto, - VXSIZE - i, DOOR_GFX_PAGEY2 + VYSIZE / 2, - i, VYSIZE / 2, VX, VY + VYSIZE / 2 - j); - SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); - BlitBitmapMasked(bitmap, drawto, - VXSIZE, DOOR_GFX_PAGEY2 + VYSIZE / 2, - i, VYSIZE / 2 - j, - VX + VXSIZE - i, VY + VYSIZE / 2 + j); + int a = MIN(x * door_2.step_offset, VXSIZE); + int i = (door_state & DOOR_OPEN_2 ? VXSIZE - a : a); + + if (x <= VYSIZE) + { + BlitBitmap(bitmap_db_door, drawto, + DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY2 + i / 2, + VXSIZE, VYSIZE - i / 2, VX, VY); + + ClearRectangle(drawto, VX, VY + VYSIZE - i / 2, VXSIZE, i / 2); + } + + if (door_2.anim_mode == ANIM_HORIZONTAL && x <= VXSIZE) + { + int src1_x = VXSIZE, src1_y = DOOR_GFX_PAGEY2; + int dst1_x = VX + VXSIZE - i, dst1_y = VY; + int src2_x = VXSIZE - i, src2_y = DOOR_GFX_PAGEY2; + int dst2_x = VX, dst2_y = VY; + int width = i, height = VYSIZE; + + SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); + BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, + dst1_x, dst1_y); + + SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); + BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, + dst2_x, dst2_y); + } + else if (door_2.anim_mode == ANIM_VERTICAL && x <= VYSIZE) + { + int src1_x = VXSIZE, src1_y = DOOR_GFX_PAGEY2; + int dst1_x = VX, dst1_y = VY + VYSIZE - i; + int src2_x = 0, src2_y = DOOR_GFX_PAGEY2 + VYSIZE - i; + int dst2_x = VX, dst2_y = VY; + int width = VXSIZE, height = i; + + SetClipOrigin(bitmap, gc, dst1_x - src1_x, dst1_y - src1_y); + BlitBitmapMasked(bitmap, drawto, src1_x, src1_y, width, height, + dst1_x, dst1_y); + + SetClipOrigin(bitmap, gc, dst2_x - src2_x, dst2_y - src2_y); + BlitBitmapMasked(bitmap, drawto, src2_x, src2_y, width, height, + dst2_x, dst2_y); + } + else if (x <= VXSIZE) /* ANIM_DEFAULT */ + { + int j = (door_2.anim_mode == ANIM_DEFAULT ? (VXSIZE - i) / 3 : 0); + + SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); + BlitBitmapMasked(bitmap, drawto, + VXSIZE, DOOR_GFX_PAGEY2, i, VYSIZE / 2, + VX + VXSIZE - i, VY + j); + SetClipOrigin(bitmap, gc, + VX - VXSIZE + i, VY - (DOOR_GFX_PAGEY2 + j)); + BlitBitmapMasked(bitmap, drawto, + VXSIZE - i, DOOR_GFX_PAGEY2 + j, i, VYSIZE / 2 - j, + VX, VY); + + BlitBitmapMasked(bitmap, drawto, + VXSIZE - i, DOOR_GFX_PAGEY2 + VYSIZE / 2, + i, VYSIZE / 2, VX, VY + VYSIZE / 2 - j); + SetClipOrigin(bitmap, gc, VX - i, (VY + j) - DOOR_GFX_PAGEY2); + BlitBitmapMasked(bitmap, drawto, + VXSIZE, DOOR_GFX_PAGEY2 + VYSIZE / 2, + i, VYSIZE / 2 - j, + VX + VXSIZE - i, VY + VYSIZE / 2 + j); + } redraw_mask |= REDRAW_DOOR_2; + door_2_done = (a == VXSIZE); } BackToFront(); - if (game_status == MAINMENU) + if (game_status == GAME_MODE_MAIN) DoAnimation(); + + if (!(door_state & DOOR_NO_DELAY)) + WaitUntilDelayReached(&door_delay, door_delay_value); } } if (setup.quick_doors) { - StopSound(SND_MENU_DOOR_OPENING); - StopSound(SND_MENU_DOOR_CLOSING); + StopSound(SND_DOOR_OPENING); + StopSound(SND_DOOR_CLOSING); } if (door_state & DOOR_ACTION_1) @@ -2235,21 +2613,6 @@ void UndrawSpecialEditorDoor() redraw_mask |= REDRAW_ALL; } -#ifndef TARGET_SDL -int ReadPixel(DrawBuffer *bitmap, int x, int y) -{ - XImage *pixel_image; - unsigned long pixel_value; - - pixel_image = XGetImage(display, bitmap->drawable, - x, y, 1, 1, AllPlanes, ZPixmap); - pixel_value = XGetPixel(pixel_image, 0, 0); - - XDestroyImage(pixel_image); - - return pixel_value; -} -#endif /* ---------- new tool button stuff ---------------------------------------- */ @@ -2356,7 +2719,7 @@ void CreateToolButtons() { int i; - for (i=0; i