X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=974765111a020583fdfddb12566c784b84a37c0a;hb=a3bc2ca4c0acf21291d20b5affed89f149b85862;hp=761aa4a88580bced42c7eb77704e92fe722f5870;hpb=818bda3a0148d769381987629ebb8908bdad4826;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 761aa4a8..97476511 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,11 +704,20 @@ 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