X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=cfbc85cc632c1c376fcd34dfd13a1b342747d03d;hb=f2e11ad5ab49e5d051e3d3f054330b802905e4bb;hp=369e0488f9c81eebd52549ea9b348267d1f036bb;hpb=87faaa07872dcc20b7a36a720529d284fc4447fd;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 369e0488..cfbc85cc 100644 --- a/src/tools.c +++ b/src/tools.c @@ -600,6 +600,9 @@ void DrawPlayer(struct PlayerInfo *player) if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy))) { +#if 1 + DrawLevelElement(next_jx, next_jy, EL_EMPTY); +#else if (player->GfxPos) { if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL) @@ -609,6 +612,7 @@ void DrawPlayer(struct PlayerInfo *player) } else DrawLevelField(next_jx, next_jy); +#endif } } @@ -700,14 +704,28 @@ void DrawPlayer(struct PlayerInfo *player) { int px = SCREENX(next_jx), py = SCREENY(next_jy); + 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 = Feld[jx][jy]; +#else int element = Feld[next_jx][next_jy]; +#endif + int graphic = el2img(element); int frame = 0; @@ -739,10 +757,14 @@ 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); @@ -824,36 +846,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); } @@ -1097,27 +1096,6 @@ void DrawScreenElementExt(int x, int y, int dx, int dy, int element, frame = graphic_info[graphic].anim_frames - 1; } } -#if 0 - else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DROPPING) - { - 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_DROPPING) - { - if (Feld[lx][ly] == EL_AMOEBA_DROPPING) - 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); @@ -1147,18 +1125,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); @@ -1203,7 +1169,7 @@ static void DrawLevelFieldCrumbledSandExt(int x, int y, int graphic, int frame) int xx = x + xy[i][0]; int yy = y + xy[i][1]; - element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : EL_STEELWALL); + element = (IN_LEV_FIELD(xx, yy) ? Feld[xx][yy] : BorderElement); /* check if neighbour field is of same type */ if (CAN_BE_CRUMBLED(element) && !IS_MOVING(xx, yy)) @@ -1288,6 +1254,35 @@ void DrawLevelFieldCrumbledSandDigging(int x, int y, int direction, 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) || + !CAN_BE_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; + + DrawLevelField(xx, yy); + } +} + static int getBorderElement(int x, int y) { int border[7][2] = @@ -1463,19 +1458,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 0 - 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); - } -#endif - *bitmap = src_bitmap; *x = src_x; *y = src_y; @@ -1539,7 +1521,7 @@ static void DrawMicroLevelExt(int xpos, int ypos, int from_x, int from_y) if (lx >= 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, @@ -1730,6 +1712,10 @@ boolean Request(char *text, unsigned int req_state) 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);