changing_element[element].base_element = element;
changing_element[element].next_element = change->successor;
- changing_element[i].change_delay = 0;
+ changing_element[element].change_delay = 0;
if (HAS_CHANGE_EVENT(element, CE_DELAY_FIXED))
changing_element[element].change_delay +=
- change->delay_fixed * FRAMES_PER_SECOND;
+ change->delay_fixed * change->delay_frames;
if (HAS_CHANGE_EVENT(element, CE_DELAY_RANDOM));
/* random frame delay added at runtime for each element individually */
if (phase == delay)
DrawLevelFieldCrumbledSand(x, y);
- if (IS_WALKABLE_OVER(Back[x][y]))
+ if (IS_WALKABLE_OVER(Back[x][y]) && Back[x][y] != EL_EMPTY)
{
DrawLevelElement(x, y, Back[x][y]);
DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame);
{
int element = Feld[x][y];
- if (IS_MOVING(x, y)) /* never change moving elements */
+ if (IS_MOVING(x, y)) /* never change a running system :-) */
return;
if (MovDelay[x][y] == 0) /* initialize element change */
{
int i = element - EL_CUSTOM_START;
int max_random_delay = level.custom_element[i].change.delay_random;
+ int delay_frames = level.custom_element[i].change.delay_frames;
- MovDelay[x][y] += RND(max_random_delay * FRAMES_PER_SECOND);
+ MovDelay[x][y] += RND(max_random_delay * delay_frames);
}
ResetGfxAnimation(x, y);
ResetGfxAnimation(x, y);
ResetRandomAnimationValue(x, y);
+#if 1
+ InitField(x, y, FALSE);
+ if (CAN_MOVE(element))
+ InitMovDir(x, y);
+#endif
DrawLevelField(x, y);
if (changing_element[element].post_change_function)
element = Feld[x][y];
graphic = el2img(element);
+#if 0
+ if (element == -1)
+ {
+ printf("::: %d,%d: %d [%d]\n", x, y, element, FrameCounter);
+
+ element = graphic = 0;
+ }
+#endif
+
if (graphic_info[graphic].anim_global_sync)
GfxFrame[x][y] = FrameCounter;
#endif
else if (element == EL_EXPLOSION)
; /* drawing of correct explosion animation is handled separately */
- else if (IS_ANIMATED(graphic))
+ else if (IS_ANIMATED(graphic) && !IS_AUTO_CHANGING(element))
DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
#if 1
- if (IS_AUTO_CHANGING(element))
+ /* this may take place after moving, therefore element may have changed */
+ if (IS_AUTO_CHANGING(Feld[x][y]))
ChangeElement(x, y);
#endif
#if 1
if (mode != DF_SNAP)
{
- GfxElement[x][y] = element;
+ GfxElement[x][y] =
+ (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element));
player->is_digging = TRUE;
}
#endif