/* forward declaration for internal use */
static void CloseAllOpenTimegates(void);
static void CheckGravityMovement(struct PlayerInfo *);
-static void KillHeroUnlessShield(struct PlayerInfo *);
+static void KillHeroUnlessProtected(int, int);
static void MapGameButtons();
static void HandleGameButtons(struct GadgetInfo *);
{
switch (Feld[x][y])
{
- case EL_SPIELFIGUR:
case EL_SP_MURPHY:
+ if (init_game)
+ {
+ if (stored_player[0].present)
+ {
+ Feld[x][y] = EL_SP_MURPHY_CLONE;
+ break;
+ }
+ }
+ /* no break! */
+ case EL_SPIELFIGUR:
if (init_game)
Feld[x][y] = EL_SPIELER1;
/* no break! */
if (Feld[x][y] == EL_BLOCKED &&
(Store[oldx][oldy] == EL_MORAST_LEER ||
- Store[oldx][oldy] == EL_SIEB_LEER ||
- Store[oldx][oldy] == EL_SIEB2_LEER ||
+ Store[oldx][oldy] == EL_MAGIC_WALL_EMPTY ||
+ Store[oldx][oldy] == EL_MAGIC_WALL_BD_EMPTY ||
Store[oldx][oldy] == EL_AMOEBE_NASS))
{
Feld[oldx][oldy] = Store[oldx][oldy];
if (element == EL_EXPLODING)
element = Store2[x][y];
- if (IS_PLAYER(ex, ey) && !SHIELD_ON(PLAYERINFO(ex, ey)))
+ if (IS_PLAYER(ex, ey) && !PLAYER_PROTECTED(ex, ey))
{
switch(StorePlayer[ex][ey])
{
Store[x][y] = EL_EDELSTEIN_ROT;
else if (element == EL_ERZ_EDEL_LILA)
Store[x][y] = EL_EDELSTEIN_LILA;
+ else if (element == EL_WALL_PEARL)
+ Store[x][y] = EL_PEARL;
+ else if (element == EL_WALL_CRYSTAL)
+ Store[x][y] = EL_CRYSTAL;
else if (!IS_PFORTE(Store[x][y]))
Store[x][y] = EL_LEERRAUM;
int element = Store2[x][y];
if (IS_PLAYER(x, y))
- KillHeroUnlessShield(PLAYERINFO(x, y));
+ KillHeroUnlessProtected(x, y);
else if (IS_EXPLOSIVE(element))
{
Feld[x][y] = Store2[x][y];
return;
}
- if ((element == EL_BOMBE || element == EL_SP_DISK_ORANGE) &&
+ if ((element == EL_BOMBE ||
+ element == EL_SP_DISK_ORANGE ||
+ element == EL_DX_SUPABOMB) &&
(lastline || object_hit)) /* element is bomb */
{
Bang(x, y);
return;
}
+ else if (element == EL_PEARL)
+ {
+ Feld[x][y] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
if (element == EL_TROPFEN && (lastline || object_hit)) /* acid drop */
{
if (object_hit && IS_PLAYER(x, y+1))
- KillHeroUnlessShield(PLAYERINFO(x, y+1));
+ KillHeroUnlessProtected(x, y+1);
else if (object_hit && smashed == EL_PINGUIN)
Bang(x, y+1);
else
if (!lastline && object_hit) /* check which object was hit */
{
if (CAN_CHANGE(element) &&
- (smashed == EL_SIEB_INAKTIV || smashed == EL_SIEB2_INAKTIV))
+ (smashed == EL_MAGIC_WALL_OFF || smashed == EL_MAGIC_WALL_BD_OFF))
{
int x, y;
int activated_magic_wall =
- (smashed == EL_SIEB_INAKTIV ? EL_SIEB_LEER : EL_SIEB2_LEER);
+ (smashed == EL_MAGIC_WALL_OFF ? EL_MAGIC_WALL_EMPTY :
+ EL_MAGIC_WALL_BD_EMPTY);
/* activate magic wall / mill */
if (IS_PLAYER(x, y+1))
{
- KillHeroUnlessShield(PLAYERINFO(x, y+1));
+ KillHeroUnlessProtected(x, y+1);
return;
}
else if (smashed == EL_PINGUIN)
return;
}
}
- else if (element == EL_FELSBROCKEN || element == EL_SP_ZONK)
+ else if (element == EL_FELSBROCKEN ||
+ element == EL_SP_ZONK ||
+ element == EL_BD_ROCK)
{
if (IS_ENEMY(smashed) ||
smashed == EL_BOMBE || smashed == EL_SP_DISK_ORANGE ||
+ smashed == EL_DX_SUPABOMB ||
smashed == EL_SONDE || smashed == EL_SCHWEIN ||
smashed == EL_DRACHE || smashed == EL_MOLE)
{
RaiseScoreElement(EL_KOKOSNUSS);
return;
}
+ else if (smashed == EL_PEARL)
+ {
+ Feld[x][y+1] = EL_PEARL_BREAKING;
+ PlaySoundLevel(x, y, SND_KNACK);
+ return;
+ }
else if (smashed == EL_DIAMANT)
{
Feld[x][y+1] = EL_LEERRAUM;
/* play sound of magic wall / mill */
if (!lastline &&
- (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
+ Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
PlaySoundLevel(x, y, SND_QUIRK);
return;
sound = SND_KLUMPF;
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
sound = SND_KLOPF;
break;
case EL_SP_ZONK:
MovDir[x][y] = game.balloon_dir;
MovDelay[x][y] = 0;
}
+ else if (element == EL_SPRING_MOVING)
+ {
+ if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) ||
+ (IN_LEV_FIELD(x, y+1) && IS_FREE(x, y+1)))
+ {
+ Feld[x][y] = EL_SPRING;
+ MovDir[x][y] = MV_NO_MOVING;
+ }
+ MovDelay[x][y] = 0;
+ }
else if (element == EL_ROBOT || element == EL_SONDE || element == EL_PINGUIN)
{
int attr_x = -1, attr_y = -1;
Feld[x][y+1] = EL_MORAST_VOLL;
}
}
- else if (element == EL_FELSBROCKEN && Feld[x][y+1] == EL_MORAST_LEER)
+ else if ((element == EL_FELSBROCKEN || element == EL_BD_ROCK) &&
+ Feld[x][y+1] == EL_MORAST_LEER)
{
InitMovingField(x, y, MV_DOWN);
Store[x][y] = EL_MORAST_VOLL;
}
- else if (element == EL_SIEB_VOLL)
+ else if (element == EL_MAGIC_WALL_FULL)
{
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
Feld[x][y] = EL_CHANGED(Store2[x][y]);
- Store[x][y] = EL_SIEB_LEER;
+ Store[x][y] = EL_MAGIC_WALL_EMPTY;
}
- else if (Feld[x][y+1] == EL_SIEB_LEER)
+ else if (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY)
{
if (!MovDelay[x][y])
MovDelay[x][y] = TILEY/4 + 1;
return;
}
- Feld[x][y] = EL_SIEB_LEER;
- Feld[x][y+1] = EL_SIEB_VOLL;
+ Feld[x][y] = EL_MAGIC_WALL_EMPTY;
+ Feld[x][y+1] = EL_MAGIC_WALL_FULL;
Store2[x][y+1] = EL_CHANGED(Store2[x][y]);
Store2[x][y] = 0;
}
}
- else if (element == EL_SIEB2_VOLL)
+ else if (element == EL_MAGIC_WALL_BD_FULL)
{
if (IS_FREE(x, y+1))
{
InitMovingField(x, y, MV_DOWN);
Feld[x][y] = EL_CHANGED2(Store2[x][y]);
- Store[x][y] = EL_SIEB2_LEER;
+ Store[x][y] = EL_MAGIC_WALL_BD_EMPTY;
}
- else if (Feld[x][y+1] == EL_SIEB2_LEER)
+ else if (Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY)
{
if (!MovDelay[x][y])
MovDelay[x][y] = TILEY/4 + 1;
return;
}
- Feld[x][y] = EL_SIEB2_LEER;
- Feld[x][y+1] = EL_SIEB2_VOLL;
+ Feld[x][y] = EL_MAGIC_WALL_BD_EMPTY;
+ Feld[x][y+1] = EL_MAGIC_WALL_BD_FULL;
Store2[x][y+1] = EL_CHANGED2(Store2[x][y]);
Store2[x][y] = 0;
}
}
else if (CAN_CHANGE(element) &&
- (Feld[x][y+1] == EL_SIEB_LEER || Feld[x][y+1] == EL_SIEB2_LEER))
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ||
+ Feld[x][y+1] == EL_MAGIC_WALL_BD_EMPTY))
{
InitMovingField(x, y, MV_DOWN);
Store[x][y] =
- (Feld[x][y+1] == EL_SIEB_LEER ? EL_SIEB_VOLL : EL_SIEB2_VOLL);
+ (Feld[x][y+1] == EL_MAGIC_WALL_EMPTY ? EL_MAGIC_WALL_FULL :
+ EL_MAGIC_WALL_BD_FULL);
Store2[x][y+1] = element;
}
else if (CAN_SMASH(element) && Feld[x][y+1] == EL_SALZSAEURE)
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1])
#else
else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1] &&
- !IS_FALLING(x, y+1) && !JustStopped[x][y+1])
+ !IS_FALLING(x, y+1) && !JustStopped[x][y+1] &&
+ element != EL_DX_SUPABOMB)
#endif
{
boolean left = (x>0 && IS_FREE(x-1, y) &&
if (left || right)
{
- if (left && right && game.emulation != EMU_BOULDERDASH)
+ if (left && right &&
+ (game.emulation != EMU_BOULDERDASH &&
+ element != EL_BD_ROCK && element != EL_EDELSTEIN_BD))
left = !(right = RND(2));
InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT);
{
int newx, newy;
- if ((element == EL_SONDE || element == EL_BALLOON)
+ if ((element == EL_SONDE || element == EL_BALLOON ||
+ element == EL_SPRING_MOVING)
&& JustBeingPushed(x, y))
return;
Moving2Blocked(x, y, &newx, &newy); /* get next screen position */
if (IS_ENEMY(element) && IS_PLAYER(newx, newy) &&
- !SHIELD_ON(PLAYERINFO(newx, newy)))
+ !PLAYER_PROTECTED(newx, newy))
{
#if 1
else if (CAN_FALL(element) && horiz_move &&
y < lev_fieldy-1 && IS_BELT(Feld[x][y+1]))
step /= 2;
+ else if (element == EL_SPRING_MOVING)
+ step*=2;
#if OLD_GAME_BEHAVIOUR
else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element))
Store[x][y] = 0;
Feld[x][y] = EL_MORAST_LEER;
}
- else if (Store[x][y] == EL_SIEB_VOLL)
+ else if (Store[x][y] == EL_MAGIC_WALL_FULL)
{
Store[x][y] = 0;
element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_SIEB_VOLL : EL_SIEB_TOT);
+ (game.magic_wall_active ? EL_MAGIC_WALL_FULL : EL_MAGIC_WALL_DEAD);
}
- else if (Store[x][y] == EL_SIEB_LEER)
+ else if (Store[x][y] == EL_MAGIC_WALL_EMPTY)
{
Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_SIEB_LEER : EL_SIEB_TOT);
+ Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_EMPTY :
+ EL_MAGIC_WALL_DEAD);
}
- else if (Store[x][y] == EL_SIEB2_VOLL)
+ else if (Store[x][y] == EL_MAGIC_WALL_BD_FULL)
{
Store[x][y] = 0;
element = Feld[newx][newy] =
- (game.magic_wall_active ? EL_SIEB2_VOLL : EL_SIEB2_TOT);
+ (game.magic_wall_active ? EL_MAGIC_WALL_BD_FULL :
+ EL_MAGIC_WALL_BD_DEAD);
}
- else if (Store[x][y] == EL_SIEB2_LEER)
+ else if (Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
{
Store[x][y] = Store2[x][y] = 0;
- Feld[x][y] = (game.magic_wall_active ? EL_SIEB2_LEER : EL_SIEB2_TOT);
+ Feld[x][y] = (game.magic_wall_active ? EL_MAGIC_WALL_BD_EMPTY :
+ EL_MAGIC_WALL_BD_DEAD);
}
else if (Store[x][y] == EL_SALZSAEURE)
{
if (done)
PlaySoundLevel(ax, ay,
- (new_element == EL_FELSBROCKEN ? SND_KLOPF : SND_PLING));
+ (new_element == EL_BD_ROCK ? SND_KLOPF : SND_PLING));
}
void AmoebeWaechst(int x, int y)
if (element == EL_AMOEBE_BD && AmoebaCnt2[new_group_nr] >= 200)
{
- AmoebeUmwandelnBD(newax, neway, EL_FELSBROCKEN);
+ AmoebeUmwandelnBD(newax, neway, EL_BD_ROCK);
return;
}
}
{
MovDelay[x][y]--;
if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
- DrawGraphic(SCREENX(x), SCREENY(y), GFX_CRACKINGNUT+3-MovDelay[x][y]/2);
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_CRACKINGNUT + 3 - MovDelay[x][y]/2);
if (!MovDelay[x][y])
{
}
}
+void BreakingPearl(int x, int y)
+{
+ if (!MovDelay[x][y]) /* next animation frame */
+ MovDelay[x][y] = 9;
+
+ if (MovDelay[x][y]) /* wait some time before next frame */
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ DrawGraphic(SCREENX(x), SCREENY(y),
+ GFX_PEARL_BREAKING + 4 - MovDelay[x][y]/2);
+
+ if (!MovDelay[x][y])
+ {
+ Feld[x][y] = EL_LEERRAUM;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
void SiebAktivieren(int x, int y, int typ)
{
- int graphic = (typ == 1 ? GFX_SIEB_VOLL : GFX_SIEB2_VOLL) + 3;
+ int graphic = (typ == 1 ? GFX_MAGIC_WALL_FULL : GFX_MAGIC_WALL_BD_FULL) + 3;
DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE);
}
if (element == EL_SP_BUG)
{
- if (!MovDelay[x][y]) /* start activating buggy base */
+ if (!MovDelay[x][y]) /* wait some time before activating base */
MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
if (!MovDelay[x][y]) /* start activating buggy base */
MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND);
- if (MovDelay[x][y]) /* wait some time before activating base */
+ if (MovDelay[x][y])
{
MovDelay[x][y]--;
if (MovDelay[x][y])
}
}
+static void CheckTrap(int x, int y)
+{
+ int element = Feld[x][y];
+
+ if (element == EL_TRAP_INACTIVE)
+ {
+ if (!MovDelay[x][y]) /* wait some time before activating trap */
+ MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND);
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+ if (MovDelay[x][y])
+ return;
+
+ Feld[x][y] = EL_TRAP_ACTIVE;
+ }
+ }
+ else if (element == EL_TRAP_ACTIVE)
+ {
+ int delay = 4;
+ int num_frames = 8;
+
+ if (!MovDelay[x][y]) /* start activating trap */
+ MovDelay[x][y] = num_frames * delay;
+
+ if (MovDelay[x][y])
+ {
+ MovDelay[x][y]--;
+
+ if (MovDelay[x][y])
+ {
+ if (!(MovDelay[x][y] % delay))
+ {
+ int phase = MovDelay[x][y]/delay;
+
+ if (phase >= num_frames/2)
+ phase = num_frames - phase;
+
+ if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
+ {
+ DrawGraphic(SCREENX(x),SCREENY(y), GFX_TRAP_INACTIVE + phase - 1);
+ ErdreichAnbroeckeln(SCREENX(x), SCREENY(y));
+ }
+ }
+
+ return;
+ }
+
+ Feld[x][y] = EL_TRAP_INACTIVE;
+ DrawLevelField(x, y);
+ }
+ }
+}
+
static void DrawBeltAnimation(int x, int y, int element)
{
int belt_nr = getBeltNrFromElement(element);
{
int el = Feld[jx+dx][jy];
int push_delay = (IS_SB_ELEMENT(el) || el == EL_SONDE ? 2 :
- el == EL_BALLOON ? 0 : 10);
+ (el == EL_BALLOON || el == EL_SPRING) ? 0 : 10);
if (tape.delay_played + push_delay >= tape.pos[tape.counter].delay)
{
Blurb(x, y);
else if (element == EL_CRACKINGNUT)
NussKnacken(x, y);
+ else if (element == EL_PEARL_BREAKING)
+ BreakingPearl(x, y);
else if (element == EL_AUSGANG_ZU)
AusgangstuerPruefen(x, y);
else if (element == EL_AUSGANG_ACT)
CheckForDragon(x, y);
else if (element == EL_SP_BUG || element == EL_SP_BUG_ACTIVE)
CheckBuggyBase(x, y);
+ else if (element == EL_TRAP_INACTIVE || element == EL_TRAP_ACTIVE)
+ CheckTrap(x, y);
else if (element == EL_SP_TERMINAL)
DrawGraphicAnimation(x, y, GFX2_SP_TERMINAL, 7, 12, ANIM_NORMAL);
else if (element == EL_SP_TERMINAL_ACTIVE)
boolean sieb = FALSE;
int jx = local_player->jx, jy = local_player->jy;
- if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL ||
- Store[x][y] == EL_SIEB_LEER)
+ if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL ||
+ Store[x][y] == EL_MAGIC_WALL_EMPTY)
{
SiebAktivieren(x, y, 1);
sieb = TRUE;
}
- else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL ||
- Store[x][y] == EL_SIEB2_LEER)
+ else if (element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_FULL ||
+ Store[x][y] == EL_MAGIC_WALL_BD_EMPTY)
{
SiebAktivieren(x, y, 2);
sieb = TRUE;
{
element = Feld[x][y];
- if (element == EL_SIEB_LEER || element == EL_SIEB_VOLL)
+ if (element == EL_MAGIC_WALL_EMPTY || element == EL_MAGIC_WALL_FULL)
{
- Feld[x][y] = EL_SIEB_TOT;
+ Feld[x][y] = EL_MAGIC_WALL_DEAD;
DrawLevelField(x, y);
}
- else if (element == EL_SIEB2_LEER || element == EL_SIEB2_VOLL)
+ else if (element == EL_MAGIC_WALL_BD_EMPTY ||
+ element == EL_MAGIC_WALL_BD_FULL)
{
- Feld[x][y] = EL_SIEB2_TOT;
+ Feld[x][y] = EL_MAGIC_WALL_BD_DEAD;
DrawLevelField(x, y);
}
}
BuryHero(player);
}
else
- {
-#if 1
TestIfBadThingHitsHero(new_jx, new_jy);
-#else
- if (player->shield_time_left == 0)
- KillHero(player);
-#endif
- }
return MF_MOVING;
}
if (player->shield_active_time_left > 0)
Bang(killx, killy);
- else if (player->shield_passive_time_left == 0)
+ else if (!PLAYER_PROTECTED(goodx, goody))
KillHero(player);
}
else
if (player->shield_active_time_left > 0)
Bang(badx, bady);
- else if (player->shield_passive_time_left == 0)
+ else if (!PLAYER_PROTECTED(killx, killy))
KillHero(player);
}
else
BuryHero(player);
}
-static void KillHeroUnlessShield(struct PlayerInfo *player)
+static void KillHeroUnlessProtected(int x, int y)
{
- if (!SHIELD_ON(player))
- KillHero(player);
+ if (!PLAYER_PROTECTED(x, y))
+ KillHero(PLAYERINFO(x, y));
}
void BuryHero(struct PlayerInfo *player)
if (IS_MOVING(x, y) || IS_PLAYER(x, y))
return MF_NO_ACTION;
+ if (IS_TUBE(Feld[jx][jy]))
+ {
+ int i = 0;
+ int tube_leave_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_UP, MV_LEFT | MV_UP },
+ { EL_TUBE_LEFT_DOWN, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_UP, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_DOWN, MV_RIGHT | MV_DOWN },
+ { -1, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }
+ };
+
+ while (tube_leave_directions[i][0] != Feld[jx][jy])
+ {
+ i++;
+ if (tube_leave_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_leave_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
+
element = Feld[x][y];
switch (element)
case EL_ERDREICH:
case EL_SAND_INVISIBLE:
+ case EL_TRAP_INACTIVE:
Feld[x][y] = EL_LEERRAUM;
PlaySoundLevel(x, y, SND_SCHLURF);
break;
case EL_EDELSTEIN_LILA:
case EL_DIAMANT:
case EL_SP_INFOTRON:
+ case EL_PEARL:
+ case EL_CRYSTAL:
RemoveField(x, y);
- local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 : 1);
+ local_player->gems_still_needed -= (element == EL_DIAMANT ? 3 :
+ element == EL_PEARL ? 5 :
+ element == EL_CRYSTAL ? 8 : 1);
if (local_player->gems_still_needed < 0)
local_player->gems_still_needed = 0;
RaiseScoreElement(element);
break;
case EL_FELSBROCKEN:
+ case EL_BD_ROCK:
case EL_BOMBE:
+ case EL_DX_SUPABOMB:
case EL_KOKOSNUSS:
case EL_ZEIT_LEER:
case EL_SP_ZONK:
case EL_SP_DISK_ORANGE:
+ case EL_SPRING:
if (dy || mode == DF_SNAP)
return MF_NO_ACTION;
if (player->push_delay == 0)
player->push_delay = FrameCounter;
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
- !tape.playing)
+ !tape.playing && element != EL_SPRING)
return MF_NO_ACTION;
RemoveField(x, y);
Feld[x+dx][y+dy] = element;
- player->push_delay_value = 2+RND(8);
+ if (element == EL_SPRING)
+ {
+ Feld[x+dx][y+dy] = EL_SPRING_MOVING;
+ MovDir[x+dx][y+dy] = move_direction;
+ }
+
+ player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8));
DrawLevelField(x+dx, y+dy);
- if (element == EL_FELSBROCKEN)
+ if (element == EL_FELSBROCKEN || element == EL_BD_ROCK)
PlaySoundLevel(x+dx, y+dy, SND_PUSCH);
else if (element == EL_KOKOSNUSS)
PlaySoundLevel(x+dx, y+dy, SND_KNURK);
DOUBLE_PLAYER_SPEED(player);
PlaySoundLevel(x, y, SND_GATE);
+ break;
+ case EL_TUBE_CROSS:
+ case EL_TUBE_VERTICAL:
+ case EL_TUBE_HORIZONTAL:
+ case EL_TUBE_VERT_LEFT:
+ case EL_TUBE_VERT_RIGHT:
+ case EL_TUBE_HORIZ_UP:
+ case EL_TUBE_HORIZ_DOWN:
+ case EL_TUBE_LEFT_UP:
+ case EL_TUBE_LEFT_DOWN:
+ case EL_TUBE_RIGHT_UP:
+ case EL_TUBE_RIGHT_DOWN:
+ {
+ int i = 0;
+ int tube_enter_directions[][2] =
+ {
+ { EL_TUBE_CROSS, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERTICAL, MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT },
+ { EL_TUBE_VERT_LEFT, MV_RIGHT | MV_UP | MV_DOWN },
+ { EL_TUBE_VERT_RIGHT, MV_LEFT | MV_UP | MV_DOWN },
+ { EL_TUBE_HORIZ_UP, MV_LEFT | MV_RIGHT | MV_DOWN },
+ { EL_TUBE_HORIZ_DOWN, MV_LEFT | MV_RIGHT | MV_UP },
+ { EL_TUBE_LEFT_UP, MV_RIGHT | MV_DOWN },
+ { EL_TUBE_LEFT_DOWN, MV_RIGHT | MV_UP },
+ { EL_TUBE_RIGHT_UP, MV_LEFT | MV_DOWN },
+ { EL_TUBE_RIGHT_DOWN, MV_LEFT | MV_UP },
+ { -1, MV_NO_MOVING }
+ };
+
+ while (tube_enter_directions[i][0] != element)
+ {
+ i++;
+ if (tube_enter_directions[i][0] == -1) /* should not happen */
+ break;
+ }
+
+ if (!(tube_enter_directions[i][1] & move_direction))
+ return MF_NO_ACTION; /* tube has no opening in this direction */
+ }
break;
case EL_AUSGANG_ZU:
projects / rocksndiamonds.git / blobdiff