if (Store[last_jx][last_jy] && IS_DRAWABLE(last_element))
{
DrawLevelElement(last_jx, last_jy, Store[last_jx][last_jy]);
- DrawLevelFieldThruMask(last_jx, last_jy);
+ if (last_element == EL_DYNAMITE_ACTIVE)
+ DrawDynamite(last_jx, last_jy);
+ else
+ DrawLevelFieldThruMask(last_jx, last_jy);
}
else if (last_element == EL_DYNAMITE_ACTIVE)
DrawDynamite(last_jx, last_jy);
DrawLevelElement(jx, jy, Store[jx][jy]);
else if (!IS_ACTIVE_BOMB(element))
DrawLevelField(jx, jy);
+ else
+ DrawLevelElement(jx, jy, EL_LEERRAUM);
/* draw player himself */
else if ((element == EL_FELSBROCKEN ||
element == EL_SP_ZONK ||
element == EL_BD_ROCK ||
- IS_GEM(element)) && !cut_mode)
+ element == EL_SP_INFOTRON ||
+ IS_GEM(element))
+ && !cut_mode)
{
if (uy >= lev_fieldy-1 || !IS_BELT(Feld[ux][uy+1]))
{
{
graphic += 3 + getGraphicAnimationPhase(4, 4, ANIM_REVERSE);
}
- else if (IS_AMOEBOID(element))
+ else if (IS_AMOEBOID(element) || element == EL_AMOEBA_DRIPPING)
{
graphic = (element == EL_AMOEBE_TOT ? GFX_AMOEBE_TOT : GFX_AMOEBE_LEBT);
graphic += (x + 2 * y + 4) % 4;
if (element == EL_QUICKSAND_EMPTYING ||
element == EL_MAGIC_WALL_EMPTYING ||
element == EL_MAGIC_WALL_BD_EMPTYING ||
- content == EL_AMOEBE_NASS)
+ element == EL_AMOEBA_DRIPPING)
cut_mode = CUT_ABOVE;
else if (element == EL_QUICKSAND_FILLING ||
element == EL_MAGIC_WALL_FILLING ||
cut_mode = CUT_BELOW;
if (cut_mode == CUT_ABOVE)
- {
- if (element == EL_QUICKSAND_EMPTYING ||
- element == EL_MAGIC_WALL_EMPTYING ||
- element == EL_MAGIC_WALL_BD_EMPTYING)
- DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
- else
- DrawScreenElementShifted(x, y, 0, 0, content, NO_CUTTING);
- }
+ DrawScreenElementShifted(x, y, 0, 0, element, NO_CUTTING);
else
DrawScreenElement(x, y, EL_LEERRAUM);
if (horiz_move)
DrawScreenElementShifted(x, y, MovPos[ux][uy], 0, element, NO_CUTTING);
+ else if (cut_mode == NO_CUTTING)
+ DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
else
- {
- if (element == EL_QUICKSAND_EMPTYING ||
- element == EL_MAGIC_WALL_EMPTYING ||
- element == EL_MAGIC_WALL_BD_EMPTYING ||
- element == EL_QUICKSAND_FILLING ||
- element == EL_MAGIC_WALL_FILLING ||
- element == EL_MAGIC_WALL_BD_FILLING)
- DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
- else
- DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], element, cut_mode);
- }
+ DrawScreenElementShifted(x, y, 0, MovPos[ux][uy], content, cut_mode);
if (content == EL_SALZSAEURE)
DrawLevelElementThruMask(ux, uy + 1, EL_SALZSAEURE);
if (element_old == EL_QUICKSAND_EMPTYING ||
element_old == EL_MAGIC_WALL_EMPTYING ||
element_old == EL_MAGIC_WALL_BD_EMPTYING ||
- content_old == EL_AMOEBE_NASS)
+ element_old == EL_AMOEBA_DRIPPING)
cut_mode = CUT_ABOVE;
DrawScreenElement(x, y, EL_LEERRAUM);
if (horiz_move)
DrawScreenElementShifted(sx, sy, MovPos[oldx][oldy], 0, element_old,
NO_CUTTING);
+ else if (cut_mode == NO_CUTTING)
+ DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
+ cut_mode);
else
- {
- if (element_old == EL_QUICKSAND_EMPTYING ||
- element_old == EL_MAGIC_WALL_EMPTYING ||
- element_old == EL_MAGIC_WALL_BD_EMPTYING)
- DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
- cut_mode);
- else
- DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], element_old,
- cut_mode);
- }
+ DrawScreenElementShifted(sx, sy, 0, MovPos[oldx][oldy], content_old,
+ cut_mode);
}
else if (IS_DRAWABLE(element))
DrawScreenElement(x, y, element);
request_gadget_id = gi->custom_id;
}
+int get_next_element(int element)
+{
+ switch(element)
+ {
+ case EL_QUICKSAND_FILLING: return EL_MORAST_VOLL;
+ case EL_QUICKSAND_EMPTYING: return EL_MORAST_LEER;
+ case EL_MAGIC_WALL_FILLING: return EL_MAGIC_WALL_FULL;
+ case EL_MAGIC_WALL_EMPTYING: return EL_MAGIC_WALL_EMPTY;
+ case EL_MAGIC_WALL_BD_FILLING: return EL_MAGIC_WALL_BD_FULL;
+ case EL_MAGIC_WALL_BD_EMPTYING: return EL_MAGIC_WALL_BD_EMPTY;
+ case EL_AMOEBA_DRIPPING: return EL_AMOEBE_NASS;
+
+ default: return element;
+ }
+}
+
int el2gfx(int element)
{
switch(element)
case EL_AMOEBE_VOLL: return GFX_AMOEBE_VOLL;
case EL_AMOEBE_BD: return GFX_AMOEBE_BD;
case EL_AMOEBA2DIAM: return GFX_AMOEBA2DIAM;
+ case EL_AMOEBA_DRIPPING: return GFX_AMOEBE_NASS;
case EL_KOKOSNUSS: return GFX_KOKOSNUSS;
case EL_LIFE: return GFX_LIFE;
case EL_LIFE_ASYNC: return GFX_LIFE_ASYNC;