void DrawPlayer(struct PlayerInfo *player)
{
+#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);
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;
+ 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
if (!player->active || !IN_SCR_FIELD(SCREENX(last_jx), SCREENY(last_jy)))
return;
/* draw things in the field the player is leaving, if needed */
/* ----------------------------------------------------------------------- */
+#if 1
+ if (player->is_moving)
+#else
if (player_is_moving)
+#endif
{
if (Back[last_jx][last_jy] && IS_DRAWABLE(last_element))
{
if (player->Pushing && IN_SCR_FIELD(SCREENX(next_jx), SCREENY(next_jy)))
{
+#if 1
+#if 1
+ DrawLevelElement(next_jx, next_jy, EL_EMPTY);
+#else
if (player->GfxPos)
{
if (Feld[next_jx][next_jy] == EL_SOKOBAN_FIELD_FULL)
}
else
DrawLevelField(next_jx, next_jy);
+#endif
+#endif
}
}
/* draw things the player is pushing, if needed */
/* ----------------------------------------------------------------------- */
+#if 0
+ printf("::: %d, %d [%d, %d] [%d]\n",
+ player->Pushing, player_is_moving, player->GfxAction,
+ player->is_moving, player_is_moving);
+#endif
+
+#if 1
+ if (player->Pushing && player->is_moving)
+#else
if (player->Pushing && player_is_moving)
+#endif
{
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 0
+#if 1
+ int element = MovingOrBlocked2Element(next_jx, next_jy);
+#else
+#if 1
int element = Feld[jx][jy];
#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_MOVING, move_dir);
+ graphic = el_act_dir2img(element, ACTION_PUSHING, move_dir);
frame = getGraphicAnimationFrame(graphic, player->Frame);
}
+#if 0
+ printf("::: pushing %d: %d ...\n", sxx, frame);
+#endif
+
DrawGraphicShifted(px, py, sxx, syy, graphic, frame,
NO_CUTTING, NO_MASKING);
+#endif
}
}
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);
}
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);
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);
if (!IN_LEV_FIELD(x, y))
return;
- element = (GfxElement[x][y] != EL_UNDEFINED ? GfxElement[x][y] : Feld[x][y]);
+ element = (GfxElement[x][y] != EL_UNDEFINED && Feld[x][y] != EL_EXPLOSION ?
+ GfxElement[x][y] : Feld[x][y]);
/* crumble field itself */
if (CAN_BE_CRUMBLED(element) && !IS_MOVING(x, y))
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))
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,
+ CAN_BE_CRUMBLED(element), IS_MOVING(x, y));
+#endif
+
if (i == 1 || i == 2)
{
width = snip;
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] =
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;
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,
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);