#define DF_DIG 1
#define DF_SNAP 2
-/* for MoveFigure() */
+/* for MovePlayer() */
#define MF_NO_ACTION 0
#define MF_MOVING 1
#define MF_ACTION 2
-/* for ScrollFigure() */
+/* for ScrollPlayer() */
#define SCROLL_INIT 0
#define SCROLL_GO_ON 1
RND(element_info[e].push_delay_random))
#define GET_NEW_MOVE_DELAY(e) ( (element_info[e].move_delay_fixed) + \
RND(element_info[e].move_delay_random))
+#define GET_MAX_MOVE_DELAY(e) ( (element_info[e].move_delay_fixed) + \
+ (element_info[e].move_delay_random))
#define ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, condition) \
(IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \
/* forward declaration for internal use */
+static boolean MovePlayerOneStep(struct PlayerInfo *, int, int, int, int);
+static boolean MovePlayer(struct PlayerInfo *, int, int);
+static void ScrollPlayer(struct PlayerInfo *, int);
+static void ScrollScreen(struct PlayerInfo *, int);
+
static void InitBeltMovement(void);
static void CloseAllOpenTimegates(void);
static void CheckGravityMovement(struct PlayerInfo *);
static boolean CheckElementSideChange(int, int, int, int, int, int);
static boolean CheckElementChange(int, int, int, int);
-static void PlaySoundLevel(int, int, int);
-static void PlaySoundLevelNearest(int, int, int);
-static void PlaySoundLevelAction(int, int, int);
-static void PlaySoundLevelElementAction(int, int, int, int);
-static void PlaySoundLevelActionIfLoop(int, int, int);
-static void StopSoundLevelActionIfLoop(int, int, int);
+static void PlayLevelSound(int, int, int);
+static void PlayLevelSoundNearest(int, int, int);
+static void PlayLevelSoundAction(int, int, int);
+static void PlayLevelSoundElementAction(int, int, int, int);
+static void PlayLevelSoundElementActionIfLoop(int, int, int, int);
+static void PlayLevelSoundActionIfLoop(int, int, int);
+static void StopLevelSoundActionIfLoop(int, int, int);
+static void PlayLevelMusic();
static void MapGameButtons();
static void HandleGameButtons(struct GadgetInfo *);
case EL_PIG:
case EL_DRAGON:
- MovDir[x][y] = 1 << RND(4);
+ GfxDir[x][y] = MovDir[x][y] = 1 << RND(4);
break;
#if 0
/* dynamically adjust player properties according to game engine version */
game.initial_move_delay =
- (game.engine_version <= VERSION_IDENT(2,0,1) ? INITIAL_MOVE_DELAY_ON :
+ (game.engine_version <= VERSION_IDENT(2,0,1,0) ? INITIAL_MOVE_DELAY_ON :
INITIAL_MOVE_DELAY_OFF);
/* dynamically adjust player properties according to level information */
game.initial_move_delay_value =
(level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED);
+ /* ---------- initialize player's initial push delay --------------------- */
+
+ /* dynamically adjust player properties according to game engine version */
+ game.initial_push_delay_value =
+ (game.engine_version < VERSION_IDENT(3,0,7,1) ? 5 : -1);
+
/* ---------- initialize changing elements ------------------------------- */
/* initialize changing elements information */
{
if (!IS_CUSTOM_ELEMENT(i))
{
- element_info[i].push_delay_fixed = 2;
- element_info[i].push_delay_random = 8;
+ element_info[i].push_delay_fixed = game.default_push_delay_fixed;
+ element_info[i].push_delay_random = game.default_push_delay_random;
}
}
player->MovDir = MV_NO_MOVING;
player->MovPos = 0;
- player->Pushing = FALSE;
- player->Switching = FALSE;
player->GfxPos = 0;
player->GfxDir = MV_NO_MOVING;
player->GfxAction = ACTION_DEFAULT;
player->Frame = 0;
player->StepFrame = 0;
- player->switch_x = -1;
- player->switch_y = -1;
-
player->use_murphy_graphic = FALSE;
- player->use_disk_red_graphic = FALSE;
player->actual_frame_counter = 0;
player->last_move_dir = MV_NO_MOVING;
- player->is_moving = FALSE;
player->is_waiting = FALSE;
+ player->is_moving = FALSE;
player->is_digging = FALSE;
+ player->is_snapping = FALSE;
player->is_collecting = FALSE;
+ player->is_pushing = FALSE;
+ player->is_switching = FALSE;
+
+ player->is_bored = FALSE;
+ player->is_sleeping = FALSE;
+
+ player->frame_counter_bored = -1;
+ player->frame_counter_sleeping = -1;
+
+ player->switch_x = -1;
+ player->switch_y = -1;
player->show_envelope = 0;
player->move_delay_value = game.initial_move_delay_value;
player->push_delay = 0;
- player->push_delay_value = 5;
-
- player->snapped = FALSE;
+ player->push_delay_value = game.initial_push_delay_value;
player->last_jx = player->last_jy = 0;
player->jx = player->jy = 0;
ChangePage[x][y] = -1;
Store[x][y] = Store2[x][y] = StorePlayer[x][y] = Back[x][y] = 0;
AmoebaNr[x][y] = 0;
- JustStopped[x][y] = 0;
+ WasJustMoving[x][y] = 0;
+ WasJustFalling[x][y] = 0;
Stop[x][y] = FALSE;
Pushed[x][y] = FALSE;
ExplodeField[x][y] = EX_NO_EXPLOSION;
GfxFrame[x][y] = 0;
- GfxAction[x][y] = ACTION_DEFAULT;
GfxRandom[x][y] = INIT_GFX_RANDOM();
GfxElement[x][y] = EL_UNDEFINED;
+ GfxAction[x][y] = ACTION_DEFAULT;
+ GfxDir[x][y] = MV_NO_MOVING;
}
}
OpenDoor(DOOR_OPEN_ALL);
PlaySoundStereo(SND_GAME_STARTING, SOUND_MIDDLE);
+
if (setup.sound_music)
- PlayMusic(level_nr);
+ PlayLevelMusic();
KeyboardAutoRepeatOffUnlessAutoplay();
printf("Player %d %sactive.\n",
i + 1, (stored_player[i].active ? "" : "not "));
}
+
+#if 0
+ printf("::: starting game [%d]\n", FrameCounter);
+#endif
}
void InitMovDir(int x, int y)
}
break;
}
+
+ GfxDir[x][y] = MovDir[x][y];
}
void InitAmoebaNr(int x, int y)
Feld[ExitX][ExitY] = (element == EL_EXIT_OPEN ? EL_EXIT_CLOSING :
EL_SP_EXIT_CLOSING);
- PlaySoundLevelElementAction(ExitX, ExitY, element, ACTION_CLOSING);
+ PlayLevelSoundElementAction(ExitX, ExitY, element, ACTION_CLOSING);
}
/* Hero disappears */
{
GfxFrame[x][y] = 0;
GfxAction[x][y] = ACTION_DEFAULT;
+ GfxDir[x][y] = MovDir[x][y];
}
void InitMovingField(int x, int y, int direction)
int newx = x + dx;
int newy = y + dy;
- if (!JustStopped[x][y] || direction != MovDir[x][y])
+ if (!WasJustMoving[x][y] || direction != MovDir[x][y])
ResetGfxAnimation(x, y);
MovDir[newx][newy] = MovDir[x][y] = direction;
+ GfxDir[x][y] = direction;
if (Feld[newx][newy] == EL_EMPTY)
Feld[newx][newy] = EL_BLOCKED;
GfxAction[x][y] = ACTION_MOVING;
GfxFrame[newx][newy] = GfxFrame[x][y];
- GfxAction[newx][newy] = GfxAction[x][y];
GfxRandom[newx][newy] = GfxRandom[x][y];
+ GfxAction[newx][newy] = GfxAction[x][y];
+ GfxDir[newx][newy] = GfxDir[x][y];
}
void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y)
GfxElement[x][y] = EL_UNDEFINED;
GfxAction[x][y] = ACTION_DEFAULT;
+ GfxDir[x][y] = MV_NO_MOVING;
}
void RemoveMovingField(int x, int y)
if (MovDelay[x][y] != 0)
{
DrawDynamite(x, y);
- PlaySoundLevelActionIfLoop(x, y, ACTION_ACTIVE);
+ PlayLevelSoundActionIfLoop(x, y, ACTION_ACTIVE);
return;
}
}
#if 1
- StopSoundLevelActionIfLoop(x, y, ACTION_ACTIVE);
+ StopLevelSoundActionIfLoop(x, y, ACTION_ACTIVE);
#else
if (Feld[x][y] == EL_DYNAMITE_ACTIVE ||
Feld[x][y] == EL_SP_DISK_RED_ACTIVE)
struct PlayerInfo *player = &stored_player[element - EL_PLAYER_1];
#if 1
- RemoveField(x, y);
+ RemoveField(x, y); /* temporarily remove newly placed player */
DrawLevelField(x, y);
#endif
{
while (player->MovPos)
{
- ScrollFigure(player, SCROLL_GO_ON);
+ ScrollPlayer(player, SCROLL_GO_ON);
ScrollScreen(NULL, SCROLL_GO_ON);
FrameCounter++;
- DrawAllPlayers();
+ DrawPlayer(player);
BackToFront();
Delay(GAME_FRAME_DELAY);
}
- player->is_moving = FALSE;
-
-#if 0
- RemoveField(player->jx, player->jy);
-#endif
+ DrawPlayer(player); /* needed here only to cleanup last field */
+ DrawLevelField(player->jx, player->jy); /* remove player graphic */
- DrawLevelField(player->jx, player->jy);
+ player->is_moving = FALSE;
}
Feld[x][y] = element;
#if 0
/* --- This is only really needed (and now handled) in "Impact()". --- */
/* do not explode moving elements that left the explode field in time */
- if (game.engine_version >= RELEASE_IDENT(2,2,0,7) &&
+ if (game.engine_version >= VERSION_IDENT(2,2,0,7) &&
center_element == EL_EMPTY && (mode == EX_NORMAL || mode == EX_CENTER))
return;
#endif
if (mode == EX_NORMAL || mode == EX_CENTER)
- PlaySoundLevelAction(ex, ey, ACTION_EXPLODING);
+ PlayLevelSoundAction(ex, ey, ACTION_EXPLODING);
/* remove things displayed in background while burning dynamite */
if (Back[ex][ey] != EL_EMPTY && !IS_INDESTRUCTIBLE(Back[ex][ey]))
#else
if ((IS_INDESTRUCTIBLE(element) &&
- (game.engine_version < VERSION_IDENT(2,2,0) ||
+ (game.engine_version < VERSION_IDENT(2,2,0,0) ||
(!IS_WALKABLE_OVER(element) && !IS_WALKABLE_UNDER(element)))) ||
element == EL_FLAMES)
continue;
RemoveField(x, y);
#else
MovDir[x][y] = MovPos[x][y] = 0;
+ GfxDir[x][y] = MovDir[x][y];
AmoebaNr[x][y] = 0;
#endif
#endif
Back[x][y] = 0;
MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = 0;
+ GfxDir[x][y] = MV_NO_MOVING;
ChangeDelay[x][y] = 0;
ChangePage[x][y] = -1;
#if 0
#if 1
- PlaySoundLevelAction(x, y, ACTION_EXPLODING);
+ PlayLevelSoundAction(x, y, ACTION_EXPLODING);
#else
if (game.emulation == EMU_SUPAPLEX)
- PlaySoundLevel(x, y, SND_SP_ELEMENT_EXPLODING);
+ PlayLevelSound(x, y, SND_SP_ELEMENT_EXPLODING);
else
- PlaySoundLevel(x, y, SND_ELEMENT_EXPLODING);
+ PlayLevelSound(x, y, SND_ELEMENT_EXPLODING);
#endif
#endif
if (element != EL_ACID_SPLASH_LEFT &&
element != EL_ACID_SPLASH_RIGHT)
{
- PlaySoundLevel(x, y, SND_ACID_SPLASHING);
+ PlayLevelSound(x, y, SND_ACID_SPLASHING);
if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) &&
(!IN_LEV_FIELD(x-1, y-1) ||
{
Feld[xx][yy] = EL_SWITCHGATE_CLOSING;
#if 1
- PlaySoundLevelAction(xx, yy, ACTION_CLOSING);
+ PlayLevelSoundAction(xx, yy, ACTION_CLOSING);
#else
- PlaySoundLevel(xx, yy, SND_SWITCHGATE_CLOSING);
+ PlayLevelSound(xx, yy, SND_SWITCHGATE_CLOSING);
#endif
}
else if (element == EL_SWITCHGATE_CLOSED ||
{
Feld[xx][yy] = EL_SWITCHGATE_OPENING;
#if 1
- PlaySoundLevelAction(xx, yy, ACTION_OPENING);
+ PlayLevelSoundAction(xx, yy, ACTION_OPENING);
#else
- PlaySoundLevel(xx, yy, SND_SWITCHGATE_OPENING);
+ PlayLevelSound(xx, yy, SND_SWITCHGATE_OPENING);
#endif
}
}
element == EL_TIMEGATE_CLOSING)
{
Feld[xx][yy] = EL_TIMEGATE_OPENING;
- PlaySoundLevel(xx, yy, SND_TIMEGATE_OPENING);
+ PlayLevelSound(xx, yy, SND_TIMEGATE_OPENING);
}
/*
MovPos[x][y + 1] <= TILEY / 2));
/* do not smash moving elements that left the smashed field in time */
- if (game.engine_version >= RELEASE_IDENT(2,2,0,7) && IS_MOVING(x, y + 1) &&
+ if (game.engine_version >= VERSION_IDENT(2,2,0,7) && IS_MOVING(x, y + 1) &&
ABS(MovPos[x][y + 1] + getElementMoveStepsize(x, y + 1)) >= TILEX)
object_hit = FALSE;
else if (impact && element == EL_PEARL)
{
Feld[x][y] = EL_PEARL_BREAKING;
- PlaySoundLevel(x, y, SND_PEARL_BREAKING);
+ PlayLevelSound(x, y, SND_PEARL_BREAKING);
return;
}
else if (impact && CheckElementChange(x, y, element, CE_IMPACT))
{
- PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT);
+ PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
return;
}
game.magic_wall_time_left = level.time_magic_wall * FRAMES_PER_SECOND;
game.magic_wall_active = TRUE;
- PlaySoundLevel(x, y, (smashed == EL_MAGIC_WALL ?
+ PlayLevelSound(x, y, (smashed == EL_MAGIC_WALL ?
SND_MAGIC_WALL_ACTIVATING :
SND_BD_MAGIC_WALL_ACTIVATING));
}
else if (smashed == EL_NUT)
{
Feld[x][y + 1] = EL_NUT_BREAKING;
- PlaySoundLevel(x, y, SND_NUT_BREAKING);
+ PlayLevelSound(x, y, SND_NUT_BREAKING);
RaiseScoreElement(EL_NUT);
return;
}
else if (smashed == EL_PEARL)
{
Feld[x][y + 1] = EL_PEARL_BREAKING;
- PlaySoundLevel(x, y, SND_PEARL_BREAKING);
+ PlayLevelSound(x, y, SND_PEARL_BREAKING);
return;
}
else if (smashed == EL_DIAMOND)
{
Feld[x][y + 1] = EL_DIAMOND_BREAKING;
- PlaySoundLevel(x, y, SND_DIAMOND_BREAKING);
+ PlayLevelSound(x, y, SND_DIAMOND_BREAKING);
return;
}
else if (IS_BELT_SWITCH(smashed))
Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE))
{
if (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE)
- PlaySoundLevel(x, y, SND_MAGIC_WALL_FILLING);
+ PlayLevelSound(x, y, SND_MAGIC_WALL_FILLING);
else if (Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)
- PlaySoundLevel(x, y, SND_BD_MAGIC_WALL_FILLING);
+ PlayLevelSound(x, y, SND_BD_MAGIC_WALL_FILLING);
return;
}
/* play sound of object that hits the ground */
if (lastline || object_hit)
- PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT);
+ PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT);
}
-void TurnRound(int x, int y)
+inline static void TurnRoundExt(int x, int y)
{
static struct
{
int rnd_value = 24;
int rnd = RND(rnd_value);
+#if 0
+ if (FrameCounter < 1 && x == 0 && y == 29)
+ printf(":2: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
+
if (can_move_on && rnd > rnd_value / 8)
MovDir[x][y] = old_move_dir;
else if (can_turn_left && can_turn_right)
xx = x + move_xy[MovDir[x][y]].x;
yy = y + move_xy[MovDir[x][y]].y;
+#if 0
+ if (FrameCounter < 1 && x == 0 && y == 29)
+ printf(":3: %d/%d: %d (%d/%d: %d) [%d]\n", x, y, MovDir[x][y],
+ xx, yy, Feld[xx][yy],
+ FrameCounter);
+#endif
+
+#if 1
+ if (!IN_LEV_FIELD_AND_IS_FREE(xx, yy))
+ MovDir[x][y] = old_move_dir;
+#else
if (!IS_FREE(xx, yy))
MovDir[x][y] = old_move_dir;
+#endif
+
+#if 0
+ if (FrameCounter < 1 && x == 0 && y == 29)
+ printf(":4: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
MovDelay[x][y] = 0;
}
}
}
+static void TurnRound(int x, int y)
+{
+ int direction = MovDir[x][y];
+
+#if 0
+ GfxDir[x][y] = MovDir[x][y];
+#endif
+
+ TurnRoundExt(x, y);
+
+#if 1
+ GfxDir[x][y] = MovDir[x][y];
+#endif
+
+ if (direction != MovDir[x][y])
+ GfxFrame[x][y] = 0;
+
+#if 1
+ if (MovDelay[x][y])
+ GfxAction[x][y] = ACTION_TURNING_FROM_LEFT + MV_DIR_BIT(direction);
+#else
+ if (MovDelay[x][y])
+ GfxAction[x][y] = ACTION_WAITING;
+#endif
+}
+
static boolean JustBeingPushed(int x, int y)
{
int i;
{
struct PlayerInfo *player = &stored_player[i];
- if (player->active && player->Pushing && player->MovPos)
+ if (player->active && player->is_pushing && player->MovPos)
{
int next_jx = player->jx + (player->jx - player->last_jx);
int next_jy = player->jy + (player->jy - player->last_jy);
void StartMoving(int x, int y)
{
- boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0));
+ boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0,0));
boolean started_moving = FALSE; /* some elements can fall _and_ move */
int element = Feld[x][y];
if (Stop[x][y])
return;
+#if 1
+ if (MovDelay[x][y] == 0)
+ GfxAction[x][y] = ACTION_DEFAULT;
+#else
/* !!! this should be handled more generic (not only for mole) !!! */
if (element != EL_MOLE && GfxAction[x][y] != ACTION_DIGGING)
GfxAction[x][y] = ACTION_DEFAULT;
+#endif
if (CAN_FALL(element) && y < lev_fieldy - 1)
{
Feld[x][y] = EL_QUICKSAND_EMPTYING;
Store[x][y] = EL_ROCK;
#if 1
- PlaySoundLevelAction(x, y, ACTION_EMPTYING);
+ PlayLevelSoundAction(x, y, ACTION_EMPTYING);
#else
- PlaySoundLevel(x, y, SND_QUICKSAND_EMPTYING);
+ PlayLevelSound(x, y, SND_QUICKSAND_EMPTYING);
#endif
}
else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY)
Store[x][y + 1] = Store[x][y];
Store[x][y] = 0;
#if 1
- PlaySoundLevelAction(x, y, ACTION_FILLING);
+ PlayLevelSoundAction(x, y, ACTION_FILLING);
#else
- PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
+ PlayLevelSound(x, y, SND_QUICKSAND_FILLING);
#endif
}
}
Feld[x][y] = EL_QUICKSAND_FILLING;
Store[x][y] = element;
#if 1
- PlaySoundLevelAction(x, y, ACTION_FILLING);
+ PlayLevelSoundAction(x, y, ACTION_FILLING);
#else
- PlaySoundLevel(x, y, SND_QUICKSAND_FILLING);
+ PlayLevelSound(x, y, SND_QUICKSAND_FILLING);
#endif
}
else if (element == EL_MAGIC_WALL_FULL)
#endif
}
#if 1
-
-#if 0
- /* TEST: bug where player gets not killed by falling rock ... */
- else if (CAN_SMASH(element) &&
- (Feld[x][y + 1] == EL_BLOCKED ||
- IS_PLAYER(x, y + 1)) &&
- JustStopped[x][y] && !Pushed[x][y + 1])
+ else if ((game.engine_version < VERSION_IDENT(2,2,0,7) &&
+ CAN_SMASH(element) && WasJustMoving[x][y] && !Pushed[x][y + 1] &&
+ (Feld[x][y + 1] == EL_BLOCKED)) ||
+ (game.engine_version >= VERSION_IDENT(3,0,7,0) &&
+ CAN_SMASH(element) && WasJustFalling[x][y] &&
+ (Feld[x][y + 1] == EL_BLOCKED || IS_PLAYER(x, y + 1))))
#else
#if 1
- else if (game.engine_version < RELEASE_IDENT(2,2,0,7) &&
+ else if (game.engine_version < VERSION_IDENT(2,2,0,7) &&
CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
- JustStopped[x][y] && !Pushed[x][y + 1])
+ WasJustMoving[x][y] && !Pushed[x][y + 1])
#else
else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED &&
- JustStopped[x][y])
+ WasJustMoving[x][y])
#endif
#endif
{
- /* calling "Impact()" here is not only completely unneccessary
- (because it already gets called from "ContinueMoving()" in
- all relevant situations), but also completely bullshit, because
- "JustStopped" also indicates a finished *horizontal* movement;
- we must keep this trash for backwards compatibility with older
- tapes */
+ /* this is needed for a special case not covered by calling "Impact()"
+ from "ContinueMoving()": if an element moves to a tile directly below
+ another element which was just falling on that tile (which was empty
+ in the previous frame), the falling element above would just stop
+ instead of smashing the element below (in previous version, the above
+ element was just checked for "moving" instead of "falling", resulting
+ in incorrect smashes caused by horizontal movement of the above
+ element; also, the case of the player being the element to smash was
+ simply not covered here... :-/ ) */
Impact(x, y);
}
-#endif
else if (IS_FREE(x, y + 1) && element == EL_SPRING && use_spring_bug)
{
if (MovDir[x][y] == MV_NO_MOVING)
}
else if (IS_FREE(x, y + 1) || Feld[x][y + 1] == EL_DIAMOND_BREAKING)
{
- if (JustStopped[x][y]) /* prevent animation from being restarted */
+ if (WasJustFalling[x][y]) /* prevent animation from being restarted */
MovDir[x][y] = MV_DOWN;
InitMovingField(x, y, MV_DOWN);
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) && !WasJustMoving[x][y + 1] &&
element != EL_DX_SUPABOMB)
#endif
#else
else if (((IS_SLIPPERY(Feld[x][y + 1]) && !IS_PLAYER(x, y + 1)) ||
(IS_EM_SLIPPERY_WALL(Feld[x][y + 1]) && IS_GEM(element))) &&
- !IS_FALLING(x, y + 1) && !JustStopped[x][y + 1] &&
+ !IS_FALLING(x, y + 1) && !WasJustMoving[x][y + 1] &&
element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE)
#endif
{
#endif
#endif
+#if 0
+ if (FrameCounter < 1 && x == 0 && y == 29)
+ printf(":1: %d/%d: %d [%d]\n", x, y, MovDir[x][y], FrameCounter);
+#endif
+
if (!MovDelay[x][y]) /* start new movement phase */
{
/* all objects that can change their move direction after each step
{
TurnRound(x, y);
+#if 0
+ if (FrameCounter < 1 && x == 0 && y == 29)
+ printf(":9: %d: %d [%d]\n", y, MovDir[x][y], FrameCounter);
+#endif
+
if (MovDelay[x][y] && (element == EL_BUG ||
element == EL_SPACESHIP ||
element == EL_SP_SNIKSNAK ||
/* !!! PLACE THIS SOMEWHERE AFTER "TurnRound()" !!! */
ResetGfxAnimation(x, y);
#endif
+
+#if 0
+ if (GfxAction[x][y] != ACTION_WAITING)
+ printf("::: %d: %d != ACTION_WAITING\n", element, GfxAction[x][y]);
+
GfxAction[x][y] = ACTION_WAITING;
+#endif
}
if (element == EL_ROBOT ||
#else
DrawLevelElementAnimationIfNeeded(x, y, element);
#endif
- PlaySoundLevelAction(x, y, ACTION_WAITING);
+ PlayLevelSoundAction(x, y, ACTION_WAITING);
}
else if (element == EL_SP_ELECTRON)
DrawLevelElementAnimationIfNeeded(x, y, element);
dir == MV_RIGHT ? IMG_FLAMES_1_RIGHT :
dir == MV_UP ? IMG_FLAMES_1_UP :
dir == MV_DOWN ? IMG_FLAMES_1_DOWN : IMG_EMPTY);
- int frame = getGraphicAnimationFrame(graphic, -1);
+ int frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]);
+
+#if 0
+ printf("::: %d, %d\n", GfxAction[x][y], GfxFrame[x][y]);
+#endif
- for (i=1; i<=3; i++)
+ GfxAction[x][y] = ACTION_ATTACKING;
+
+ if (IS_PLAYER(x, y))
+ DrawPlayerField(x, y);
+ else
+ DrawLevelField(x, y);
+
+ PlayLevelSoundActionIfLoop(x, y, ACTION_ATTACKING);
+
+ for (i=1; i <= 3; i++)
{
- int xx = x + i*dx, yy = y + i*dy;
- int sx = SCREENX(xx), sy = SCREENY(yy);
+ int xx = x + i * dx;
+ int yy = y + i * dy;
+ int sx = SCREENX(xx);
+ int sy = SCREENY(yy);
int flame_graphic = graphic + (i - 1);
if (!IN_LEV_FIELD(xx, yy) || IS_DRAGONFIRE_PROOF(Feld[xx][yy]))
Feld[xx][yy] = EL_FLAMES;
if (IN_SCR_FIELD(sx, sy))
+ {
+ DrawLevelFieldCrumbledSand(xx, yy);
DrawGraphic(sx, sy, flame_graphic, frame);
+ }
}
else
{
if (MovDelay[x][y]) /* element still has to wait some time */
{
- PlaySoundLevelAction(x, y, ACTION_WAITING);
+ PlayLevelSoundAction(x, y, ACTION_WAITING);
return;
}
+#if 0
/* special case of "moving" animation of waiting elements (FIX THIS !!!);
for all other elements GfxAction will be set by InitMovingField() */
if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY)
GfxAction[x][y] = ACTION_MOVING;
+#endif
}
/* now make next step */
Feld[x][y] = EL_EMPTY;
DrawLevelField(x, y);
- PlaySoundLevel(newx, newy, SND_PENGUIN_PASSING);
+ PlayLevelSound(newx, newy, SND_PENGUIN_PASSING);
if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy)))
DrawGraphicThruMask(SCREENX(newx),SCREENY(newy), el2img(element), 0);
if (DigField(local_player, newx, newy, 0, 0, DF_DIG) == MF_MOVING)
DrawLevelField(newx, newy);
else
- MovDir[x][y] = MV_NO_MOVING;
+ GfxDir[x][y] = MovDir[x][y] = MV_NO_MOVING;
}
else if (!IS_FREE(newx, newy))
{
DrawLevelField(newx, newy);
}
- PlaySoundLevel(x, y, SND_PIG_DIGGING);
+ PlayLevelSound(x, y, SND_PIG_DIGGING);
}
else if (!IS_FREE(newx, newy))
{
DrawPlayerField(x, y);
else
DrawLevelField(x, y);
+
return;
}
else
{
boolean wanna_flame = !RND(10);
int dx = newx - x, dy = newy - y;
- int newx1 = newx+1*dx, newy1 = newy+1*dy;
- int newx2 = newx+2*dx, newy2 = newy+2*dy;
+ int newx1 = newx + 1 * dx, newy1 = newy + 1 * dy;
+ int newx2 = newx + 2 * dx, newy2 = newy + 2 * dy;
int element1 = (IN_LEV_FIELD(newx1, newy1) ?
MovingOrBlocked2Element(newx1, newy1) : EL_STEELWALL);
int element2 = (IN_LEV_FIELD(newx2, newy2) ?
else
DrawLevelField(x, y);
- PlaySoundLevel(x, y, SND_DRAGON_ATTACKING);
+ PlayLevelSound(x, y, SND_DRAGON_ATTACKING);
MovDelay[x][y] = 50;
+
Feld[newx][newy] = EL_FLAMES;
if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_EMPTY)
Feld[newx1][newy1] = EL_FLAMES;
DrawLevelField(newx, newy);
}
- PlaySoundLevel(x, y, SND_YAMYAM_DIGGING);
+ PlayLevelSound(x, y, SND_YAMYAM_DIGGING);
}
else if (element == EL_DARK_YAMYAM && IN_LEV_FIELD(newx, newy) &&
IS_FOOD_DARK_YAMYAM(Feld[newx][newy]))
DrawLevelField(newx, newy);
}
- PlaySoundLevel(x, y, SND_DARK_YAMYAM_DIGGING);
+ PlayLevelSound(x, y, SND_DARK_YAMYAM_DIGGING);
}
else if ((element == EL_PACMAN || element == EL_MOLE)
&& IN_LEV_FIELD(newx, newy) && IS_AMOEBOID(Feld[newx][newy]))
if (element == EL_MOLE)
{
Feld[newx][newy] = EL_AMOEBA_SHRINKING;
- PlaySoundLevel(x, y, SND_MOLE_DIGGING);
+ PlayLevelSound(x, y, SND_MOLE_DIGGING);
ResetGfxAnimation(x, y);
GfxAction[x][y] = ACTION_DIGGING;
{
Feld[newx][newy] = EL_EMPTY;
DrawLevelField(newx, newy);
- PlaySoundLevel(x, y, SND_PACMAN_DIGGING);
+ PlayLevelSound(x, y, SND_PACMAN_DIGGING);
}
}
else if (element == EL_MOLE && IN_LEV_FIELD(newx, newy) &&
TestIfBadThingTouchesHero(x, y);
#if 0
- PlaySoundLevelAction(x, y, ACTION_WAITING);
+ PlayLevelSoundAction(x, y, ACTION_WAITING);
#endif
return;
InitMovingField(x, y, MovDir[x][y]);
- PlaySoundLevelAction(x, y, ACTION_MOVING);
+ PlayLevelSoundAction(x, y, ACTION_MOVING);
}
if (MovDir[x][y])
if (pushed) /* special case: moving object pushed by player */
MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos));
- if (ABS(MovPos[x][y]) >= TILEX) /* object reached its destination */
+ if (ABS(MovPos[x][y]) < TILEX)
{
- Feld[x][y] = EL_EMPTY;
- Feld[newx][newy] = element;
- MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */
+ DrawLevelField(x, y);
- if (element == EL_MOLE)
- {
- Feld[x][y] = EL_SAND;
+ return; /* element is still moving */
+ }
- DrawLevelFieldCrumbledSandNeighbours(x, y);
- }
- else if (element == EL_QUICKSAND_FILLING)
- {
- element = Feld[newx][newy] = get_next_element(element);
- Store[newx][newy] = Store[x][y];
- }
- else if (element == EL_QUICKSAND_EMPTYING)
- {
- Feld[x][y] = get_next_element(element);
- element = Feld[newx][newy] = Store[x][y];
- }
- else if (element == EL_MAGIC_WALL_FILLING)
- {
- element = Feld[newx][newy] = get_next_element(element);
- if (!game.magic_wall_active)
- element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD;
- Store[newx][newy] = Store[x][y];
- }
- else if (element == EL_MAGIC_WALL_EMPTYING)
- {
- Feld[x][y] = get_next_element(element);
- if (!game.magic_wall_active)
- Feld[x][y] = EL_MAGIC_WALL_DEAD;
- element = Feld[newx][newy] = Store[x][y];
- }
- else if (element == EL_BD_MAGIC_WALL_FILLING)
- {
- element = Feld[newx][newy] = get_next_element(element);
- if (!game.magic_wall_active)
- element = Feld[newx][newy] = EL_BD_MAGIC_WALL_DEAD;
- Store[newx][newy] = Store[x][y];
- }
- else if (element == EL_BD_MAGIC_WALL_EMPTYING)
- {
- Feld[x][y] = get_next_element(element);
- if (!game.magic_wall_active)
- Feld[x][y] = EL_BD_MAGIC_WALL_DEAD;
- element = Feld[newx][newy] = Store[x][y];
- }
- else if (element == EL_AMOEBA_DROPPING)
- {
- Feld[x][y] = get_next_element(element);
- element = Feld[newx][newy] = Store[x][y];
- }
- else if (element == EL_SOKOBAN_OBJECT)
- {
- if (Back[x][y])
- Feld[x][y] = Back[x][y];
+ /* element reached destination field */
- if (Back[newx][newy])
- Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL;
+ Feld[x][y] = EL_EMPTY;
+ Feld[newx][newy] = element;
+ MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */
- Back[x][y] = Back[newx][newy] = 0;
- }
- else if (Store[x][y] == EL_ACID)
- {
- element = Feld[newx][newy] = EL_ACID;
- }
+ if (element == EL_MOLE)
+ {
+ Feld[x][y] = EL_SAND;
+
+ DrawLevelFieldCrumbledSandNeighbours(x, y);
+ }
+ else if (element == EL_QUICKSAND_FILLING)
+ {
+ element = Feld[newx][newy] = get_next_element(element);
+ Store[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_QUICKSAND_EMPTYING)
+ {
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_MAGIC_WALL_FILLING)
+ {
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD;
+ Store[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_MAGIC_WALL_EMPTYING)
+ {
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_MAGIC_WALL_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_BD_MAGIC_WALL_FILLING)
+ {
+ element = Feld[newx][newy] = get_next_element(element);
+ if (!game.magic_wall_active)
+ element = Feld[newx][newy] = EL_BD_MAGIC_WALL_DEAD;
+ Store[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_BD_MAGIC_WALL_EMPTYING)
+ {
+ Feld[x][y] = get_next_element(element);
+ if (!game.magic_wall_active)
+ Feld[x][y] = EL_BD_MAGIC_WALL_DEAD;
+ element = Feld[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_AMOEBA_DROPPING)
+ {
+ Feld[x][y] = get_next_element(element);
+ element = Feld[newx][newy] = Store[x][y];
+ }
+ else if (element == EL_SOKOBAN_OBJECT)
+ {
+ if (Back[x][y])
+ Feld[x][y] = Back[x][y];
- Store[x][y] = 0;
- MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
- MovDelay[newx][newy] = 0;
+ if (Back[newx][newy])
+ Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL;
- /* copy element change control values to new field */
- ChangeDelay[newx][newy] = ChangeDelay[x][y];
- ChangePage[newx][newy] = ChangePage[x][y];
- Changed[newx][newy] = Changed[x][y];
- ChangeEvent[newx][newy] = ChangeEvent[x][y];
+ Back[x][y] = Back[newx][newy] = 0;
+ }
+ else if (Store[x][y] == EL_ACID)
+ {
+ element = Feld[newx][newy] = EL_ACID;
+ }
- ChangeDelay[x][y] = 0;
- ChangePage[x][y] = -1;
- Changed[x][y] = CE_BITMASK_DEFAULT;
- ChangeEvent[x][y] = CE_BITMASK_DEFAULT;
+ Store[x][y] = 0;
+ MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0;
+ MovDelay[newx][newy] = 0;
- /* copy animation control values to new field */
- GfxFrame[newx][newy] = GfxFrame[x][y];
- GfxAction[newx][newy] = GfxAction[x][y]; /* keep action one frame */
- GfxRandom[newx][newy] = GfxRandom[x][y]; /* keep same random value */
+ /* copy element change control values to new field */
+ ChangeDelay[newx][newy] = ChangeDelay[x][y];
+ ChangePage[newx][newy] = ChangePage[x][y];
+ Changed[newx][newy] = Changed[x][y];
+ ChangeEvent[newx][newy] = ChangeEvent[x][y];
- Pushed[x][y] = Pushed[newx][newy] = FALSE;
+ ChangeDelay[x][y] = 0;
+ ChangePage[x][y] = -1;
+ Changed[x][y] = CE_BITMASK_DEFAULT;
+ ChangeEvent[x][y] = CE_BITMASK_DEFAULT;
+
+ /* copy animation control values to new field */
+ GfxFrame[newx][newy] = GfxFrame[x][y];
+ GfxRandom[newx][newy] = GfxRandom[x][y]; /* keep same random value */
+ GfxAction[newx][newy] = GfxAction[x][y]; /* keep action one frame */
+ GfxDir[newx][newy] = GfxDir[x][y]; /* keep element direction */
+
+ Pushed[x][y] = Pushed[newx][newy] = FALSE;
- ResetGfxAnimation(x, y); /* reset animation values for old field */
+ ResetGfxAnimation(x, y); /* reset animation values for old field */
#if 0
- /* 2.1.1 (does not work correctly for spring) */
- if (!CAN_MOVE(element))
- MovDir[newx][newy] = 0;
+ /* 2.1.1 (does not work correctly for spring) */
+ if (!CAN_MOVE(element))
+ MovDir[newx][newy] = 0;
#else
#if 0
- /* (does not work for falling objects that slide horizontally) */
- if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)
- MovDir[newx][newy] = 0;
+ /* (does not work for falling objects that slide horizontally) */
+ if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)
+ MovDir[newx][newy] = 0;
#else
- /*
- if (!CAN_MOVE(element) ||
- (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN))
- MovDir[newx][newy] = 0;
- */
+ /*
+ if (!CAN_MOVE(element) ||
+ (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN))
+ MovDir[newx][newy] = 0;
+ */
+
+ if (!CAN_MOVE(element) ||
+ (CAN_FALL(element) && direction == MV_DOWN))
+ GfxDir[x][y] = MovDir[newx][newy] = 0;
- if (!CAN_MOVE(element) ||
- (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN))
- MovDir[newx][newy] = 0;
#endif
#endif
- DrawLevelField(x, y);
- DrawLevelField(newx, newy);
+ DrawLevelField(x, y);
+ DrawLevelField(newx, newy);
- Stop[newx][newy] = TRUE; /* ignore this element until the next frame */
+ Stop[newx][newy] = TRUE; /* ignore this element until the next frame */
- /* prevent pushed element from moving on in pushed direction */
- if (pushed && CAN_MOVE(element) &&
- element_info[element].move_pattern & MV_ANY_DIRECTION &&
- !(element_info[element].move_pattern & MovDir[newx][newy]))
- TurnRound(newx, newy);
+ /* prevent pushed element from moving on in pushed direction */
+ if (pushed && CAN_MOVE(element) &&
+ element_info[element].move_pattern & MV_ANY_DIRECTION &&
+ !(element_info[element].move_pattern & direction))
+ TurnRound(newx, newy);
- if (!pushed) /* special case: moving object pushed by player */
- JustStopped[newx][newy] = 3;
+ if (!pushed) /* special case: moving object pushed by player */
+ {
+ WasJustMoving[newx][newy] = 3;
- if (DONT_TOUCH(element)) /* object may be nasty to player or others */
- {
- TestIfBadThingTouchesHero(newx, newy);
- TestIfBadThingTouchesFriend(newx, newy);
+ if (CAN_FALL(element) && direction == MV_DOWN)
+ WasJustFalling[newx][newy] = 3;
+ }
+
+ if (DONT_TOUCH(element)) /* object may be nasty to player or others */
+ {
+ TestIfBadThingTouchesHero(newx, newy);
+ TestIfBadThingTouchesFriend(newx, newy);
+
+ if (!IS_CUSTOM_ELEMENT(element))
TestIfBadThingTouchesOtherBadThing(newx, newy);
- }
- else if (element == EL_PENGUIN)
- TestIfFriendTouchesBadThing(newx, newy);
+ }
+ else if (element == EL_PENGUIN)
+ TestIfFriendTouchesBadThing(newx, newy);
- if (CAN_FALL(element) && direction == MV_DOWN &&
- (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1)))
- Impact(x, newy);
+ if (CAN_FALL(element) && direction == MV_DOWN &&
+ (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1)))
+ Impact(x, newy);
#if 1
- TestIfElementTouchesCustomElement(x, y); /* for empty space */
+ TestIfElementTouchesCustomElement(x, y); /* for empty space */
#endif
#if 0
- if (ChangePage[newx][newy] != -1) /* delayed change */
- ChangeElement(newx, newy, ChangePage[newx][newy]);
+ if (ChangePage[newx][newy] != -1) /* delayed change */
+ ChangeElement(newx, newy, ChangePage[newx][newy]);
#endif
- if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty))
- CheckElementSideChange(newx, newy, Feld[newx][newy], direction,
- CE_COLLISION, -1);
+ if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty))
+ CheckElementSideChange(newx, newy, Feld[newx][newy], direction,
+ CE_COLLISION, -1);
- TestIfPlayerTouchesCustomElement(newx, newy);
- TestIfElementTouchesCustomElement(newx, newy);
- }
- else /* still moving on */
- {
- DrawLevelField(x, y);
- }
+ TestIfPlayerTouchesCustomElement(newx, newy);
+ TestIfElementTouchesCustomElement(newx, newy);
}
int AmoebeNachbarNr(int ax, int ay)
}
}
}
- PlaySoundLevel(ax, ay, (IS_GEM(level.amoeba_content) ?
+ PlayLevelSound(ax, ay, (IS_GEM(level.amoeba_content) ?
SND_AMOEBA_TURNING_TO_GEM :
SND_AMOEBA_TURNING_TO_ROCK));
Bang(ax, ay);
if (Feld[x][y] == EL_AMOEBA_TO_DIAMOND)
{
- PlaySoundLevel(x, y, (IS_GEM(level.amoeba_content) ?
+ PlayLevelSound(x, y, (IS_GEM(level.amoeba_content) ?
SND_AMOEBA_TURNING_TO_GEM :
SND_AMOEBA_TURNING_TO_ROCK));
Bang(x, y);
}
if (done)
- PlaySoundLevel(ax, ay, (new_element == EL_BD_ROCK ?
+ PlayLevelSound(ax, ay, (new_element == EL_BD_ROCK ?
SND_BD_AMOEBA_TURNING_TO_ROCK :
SND_BD_AMOEBA_TURNING_TO_GEM));
}
if (DelayReached(&sound_delay, sound_delay_value))
{
#if 1
- PlaySoundLevelElementAction(x, y, Store[x][y], ACTION_GROWING);
+ PlayLevelSoundElementAction(x, y, Store[x][y], ACTION_GROWING);
#else
if (Store[x][y] == EL_BD_AMOEBA)
- PlaySoundLevel(x, y, SND_BD_AMOEBA_GROWING);
+ PlayLevelSound(x, y, SND_BD_AMOEBA_GROWING);
else
- PlaySoundLevel(x, y, SND_AMOEBA_GROWING);
+ PlayLevelSound(x, y, SND_AMOEBA_GROWING);
#endif
sound_delay_value = 30;
}
{
Feld[newax][neway] = EL_AMOEBA_DROP; /* drop left/right of amoeba */
#if 1
- PlaySoundLevelAction(newax, neway, ACTION_GROWING);
+ PlayLevelSoundAction(newax, neway, ACTION_GROWING);
#else
- PlaySoundLevel(newax, neway, SND_AMOEBA_GROWING);
+ PlayLevelSound(newax, neway, SND_AMOEBA_GROWING);
#endif
}
else
}
if (changed)
- PlaySoundLevel(ax, ay, element == EL_BIOMAZE ? SND_BIOMAZE_GROWING :
+ PlayLevelSound(ax, ay, element == EL_BIOMAZE ? SND_BIOMAZE_GROWING :
SND_GAME_OF_LIFE_GROWING);
}
static void RunRobotWheel(int x, int y)
{
- PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE);
+ PlayLevelSound(x, y, SND_ROBOT_WHEEL_ACTIVE);
}
static void StopRobotWheel(int x, int y)
static void RunTimegateWheel(int x, int y)
{
- PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
+ PlayLevelSound(x, y, SND_TIMEGATE_SWITCH_ACTIVE);
}
void CheckExit(int x, int y)
Feld[x][y] = EL_EXIT_OPENING;
- PlaySoundLevelNearest(x, y, SND_CLASS_EXIT_OPENING);
+ PlayLevelSoundNearest(x, y, SND_CLASS_EXIT_OPENING);
}
void CheckExitSP(int x, int y)
Feld[x][y] = EL_SP_EXIT_OPENING;
- PlaySoundLevelNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
+ PlayLevelSoundNearest(x, y, SND_CLASS_SP_EXIT_OPENING);
}
static void CloseAllOpenTimegates()
{
Feld[x][y] = EL_TIMEGATE_CLOSING;
#if 1
- PlaySoundLevelAction(x, y, ACTION_CLOSING);
+ PlayLevelSoundAction(x, y, ACTION_CLOSING);
#else
- PlaySoundLevel(x, y, SND_TIMEGATE_CLOSING);
+ PlayLevelSound(x, y, SND_TIMEGATE_CLOSING);
#endif
}
}
if (IN_SCR_FIELD(SCREENX(x), SCREENY(y)))
{
- int graphic = el_dir2img(Feld[x][y], MovDir[x][y]);
+ int graphic = el_dir2img(Feld[x][y], GfxDir[x][y]);
int frame = getGraphicAnimationFrame(graphic, 17 - MovDelay[x][y]);
DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame);
Feld[x][y] = Store[x][y];
Store[x][y] = 0;
- MovDir[x][y] = MV_NO_MOVING;
+ GfxDir[x][y] = MovDir[x][y] = MV_NO_MOVING;
DrawLevelField(x, y);
}
}
{
Feld[ax][ay-1] = EL_EXPANDABLE_WALL_GROWING;
Store[ax][ay-1] = element;
- MovDir[ax][ay-1] = MV_UP;
+ GfxDir[ax][ay-1] = MovDir[ax][ay-1] = MV_UP;
if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1)))
DrawGraphic(SCREENX(ax), SCREENY(ay - 1),
IMG_EXPANDABLE_WALL_GROWING_UP, 0);
{
Feld[ax][ay+1] = EL_EXPANDABLE_WALL_GROWING;
Store[ax][ay+1] = element;
- MovDir[ax][ay+1] = MV_DOWN;
+ GfxDir[ax][ay+1] = MovDir[ax][ay+1] = MV_DOWN;
if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1)))
DrawGraphic(SCREENX(ax), SCREENY(ay + 1),
IMG_EXPANDABLE_WALL_GROWING_DOWN, 0);
{
Feld[ax-1][ay] = EL_EXPANDABLE_WALL_GROWING;
Store[ax-1][ay] = element;
- MovDir[ax-1][ay] = MV_LEFT;
+ GfxDir[ax-1][ay] = MovDir[ax-1][ay] = MV_LEFT;
if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay)))
DrawGraphic(SCREENX(ax - 1), SCREENY(ay),
IMG_EXPANDABLE_WALL_GROWING_LEFT, 0);
{
Feld[ax+1][ay] = EL_EXPANDABLE_WALL_GROWING;
Store[ax+1][ay] = element;
- MovDir[ax+1][ay] = MV_RIGHT;
+ GfxDir[ax+1][ay] = MovDir[ax+1][ay] = MV_RIGHT;
if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay)))
DrawGraphic(SCREENX(ax + 1), SCREENY(ay),
IMG_EXPANDABLE_WALL_GROWING_RIGHT, 0);
if (new_wall)
#if 1
- PlaySoundLevelAction(ax, ay, ACTION_GROWING);
+ PlayLevelSoundAction(ax, ay, ACTION_GROWING);
#else
- PlaySoundLevel(ax, ay, SND_EXPANDABLE_WALL_GROWING);
+ PlayLevelSound(ax, ay, SND_EXPANDABLE_WALL_GROWING);
#endif
}
if (IS_PLAYER(xx, yy))
{
- PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE);
+ PlayLevelSound(x, y, SND_SP_BUGGY_BASE_ACTIVE);
break;
}
static void ActivateTrap(int x, int y)
{
- PlaySoundLevel(x, y, SND_TRAP_ACTIVATING);
+ PlayLevelSound(x, y, SND_TRAP_ACTIVATING);
}
static void ChangeActiveTrap(int x, int y)
}
if (something_has_changed)
- PlaySoundLevelElementAction(x, y, element, ACTION_CHANGING);
+ PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING);
}
}
else
{
ChangeElementNowExt(x, y, change->target_element);
- PlaySoundLevelElementAction(x, y, element, ACTION_CHANGING);
+ PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING);
}
return TRUE;
if (ChangeDelay[x][y] != 0) /* continue element change */
{
- int graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+ int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
if (IS_ANIMATED(graphic))
DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
struct ElementChangeInfo *change = &element_info[element].change_page[j];
if (change->can_change &&
+#if 1
+ change->events & CH_EVENT_BIT(trigger_event) &&
+#endif
change->sides & trigger_side &&
change->trigger_element == trigger_element)
{
+#if 0
+ if (!(change->events & CH_EVENT_BIT(trigger_event)))
+ printf("::: !!! %d triggers %d: using wrong page %d [event %d]\n",
+ trigger_element-EL_CUSTOM_START+1, i+1, j, trigger_event);
+#endif
+
change_element = TRUE;
page = j;
return CheckElementSideChange(x, y, element, CH_SIDE_ANY, trigger_event, -1);
}
-static void PlayerActions(struct PlayerInfo *player, byte player_action)
+static void SetPlayerWaiting(struct PlayerInfo *player, boolean is_waiting)
+{
+ boolean was_waiting = player->is_waiting;
+
+ if (is_waiting)
+ {
+ int jx = player->jx, jy = player->jy;
+ int element = player->element_nr;
+ int action;
+
+ if (!was_waiting) /* not waiting -> waiting */
+ {
+ player->is_waiting = TRUE;
+ player->is_bored = FALSE;
+ player->is_sleeping = FALSE;
+
+ player->frame_counter_bored =
+ (FrameCounter +
+ game.player_boring_delay_fixed +
+ SimpleRND(game.player_boring_delay_random));
+ player->frame_counter_sleeping =
+ (FrameCounter +
+ game.player_sleeping_delay_fixed +
+ SimpleRND(game.player_sleeping_delay_random));
+
+ InitPlayerGfxAnimation(player, ACTION_WAITING, player->MovDir);
+ }
+
+ if (FrameCounter >= player->frame_counter_bored)
+ player->is_bored = TRUE;
+ if (FrameCounter >= player->frame_counter_sleeping)
+ player->is_sleeping = TRUE;
+
+ action = (player->is_sleeping ? ACTION_SLEEPING :
+ player->is_bored ? ACTION_BORING : ACTION_WAITING);
+
+ if (!was_waiting)
+ PlayLevelSoundElementAction(jx, jy, element, action);
+ else
+ PlayLevelSoundElementActionIfLoop(jx, jy, element, action);
+ }
+ else if (was_waiting) /* waiting -> not waiting */
+ {
+ player->is_waiting = FALSE;
+ player->is_bored = FALSE;
+ player->is_sleeping = FALSE;
+
+ player->frame_counter_bored = -1;
+ player->frame_counter_sleeping = -1;
+ }
+}
+
+#if 1
+static byte PlayerActions(struct PlayerInfo *player, byte player_action)
{
+#if 0
static byte stored_player_action[MAX_PLAYERS];
static int num_stored_actions = 0;
+#endif
boolean moved = FALSE, snapped = FALSE, dropped = FALSE;
int left = player_action & JOY_LEFT;
int right = player_action & JOY_RIGHT;
int dx = (left ? -1 : right ? 1 : 0);
int dy = (up ? -1 : down ? 1 : 0);
+#if 0
stored_player_action[player->index_nr] = 0;
num_stored_actions++;
+#endif
+
+#if 0
+ printf("::: player %d [%d]\n", player->index_nr, FrameCounter);
+#endif
if (!player->active || tape.pausing)
- return;
+ return 0;
if (player_action)
{
+#if 0
+ printf("::: player %d acts [%d]\n", player->index_nr, FrameCounter);
+#endif
+
if (button1)
snapped = SnapField(player, dx, dy);
else
if (button2)
dropped = DropElement(player);
- moved = MoveFigure(player, dx, dy);
+ moved = MovePlayer(player, dx, dy);
}
if (tape.single_step && tape.recording && !tape.pausing)
}
}
+ SetPlayerWaiting(player, FALSE);
+
+#if 1
+ return player_action;
+#else
stored_player_action[player->index_nr] = player_action;
+#endif
}
else
{
+#if 0
+ printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter);
+#endif
+
/* no actions for this player (no input at player's configured device) */
DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
CheckGravityMovement(player);
if (player->MovPos == 0)
- InitPlayerGfxAnimation(player, ACTION_DEFAULT, player->MovDir);
+ SetPlayerWaiting(player, TRUE);
if (player->MovPos == 0) /* needed for tape.playing */
player->is_moving = FALSE;
+
+ return 0;
}
+#if 0
if (tape.recording && num_stored_actions >= MAX_PLAYERS)
{
+ printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter);
+
TapeRecordAction(stored_player_action);
num_stored_actions = 0;
}
+#endif
}
-void GameActions()
-{
- static unsigned long action_delay = 0;
- unsigned long action_delay_value;
- int magic_wall_x = 0, magic_wall_y = 0;
- int i, x, y, element, graphic;
- byte *recorded_player_action;
- byte summarized_player_action = 0;
-
- if (game_status != GAME_MODE_PLAYING)
- return;
+#else
- action_delay_value =
- (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
+static void PlayerActions(struct PlayerInfo *player, byte player_action)
+{
+ static byte stored_player_action[MAX_PLAYERS];
+ static int num_stored_actions = 0;
+ boolean moved = FALSE, snapped = FALSE, dropped = FALSE;
+ int left = player_action & JOY_LEFT;
+ int right = player_action & JOY_RIGHT;
+ int up = player_action & JOY_UP;
+ int down = player_action & JOY_DOWN;
+ int button1 = player_action & JOY_BUTTON_1;
+ int button2 = player_action & JOY_BUTTON_2;
+ int dx = (left ? -1 : right ? 1 : 0);
+ int dy = (up ? -1 : down ? 1 : 0);
- if (tape.playing && tape.index_search && !tape.pausing)
- action_delay_value = 0;
+ stored_player_action[player->index_nr] = 0;
+ num_stored_actions++;
- /* ---------- main game synchronization point ---------- */
+ printf("::: player %d [%d]\n", player->index_nr, FrameCounter);
- WaitUntilDelayReached(&action_delay, action_delay_value);
+ if (!player->active || tape.pausing)
+ return;
- if (network_playing && !network_player_action_received)
+ if (player_action)
{
- /*
+ printf("::: player %d acts [%d]\n", player->index_nr, FrameCounter);
+
+ if (button1)
+ snapped = SnapField(player, dx, dy);
+ else
+ {
+ if (button2)
+ dropped = DropElement(player);
+
+ moved = MovePlayer(player, dx, dy);
+ }
+
+ if (tape.single_step && tape.recording && !tape.pausing)
+ {
+ if (button1 || (dropped && !moved))
+ {
+ TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
+ SnapField(player, 0, 0); /* stop snapping */
+ }
+ }
+
+ stored_player_action[player->index_nr] = player_action;
+ }
+ else
+ {
+ printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter);
+
+ /* no actions for this player (no input at player's configured device) */
+
+ DigField(player, 0, 0, 0, 0, DF_NO_PUSH);
+ SnapField(player, 0, 0);
+ CheckGravityMovement(player);
+
+ if (player->MovPos == 0)
+ InitPlayerGfxAnimation(player, ACTION_DEFAULT, player->MovDir);
+
+ if (player->MovPos == 0) /* needed for tape.playing */
+ player->is_moving = FALSE;
+ }
+
+ if (tape.recording && num_stored_actions >= MAX_PLAYERS)
+ {
+ printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter);
+
+ TapeRecordAction(stored_player_action);
+ num_stored_actions = 0;
+ }
+}
+#endif
+
+void GameActions()
+{
+ static unsigned long action_delay = 0;
+ unsigned long action_delay_value;
+ int magic_wall_x = 0, magic_wall_y = 0;
+ int i, x, y, element, graphic;
+ byte *recorded_player_action;
+ byte summarized_player_action = 0;
+#if 1
+ byte tape_action[MAX_PLAYERS];
+#endif
+
+ if (game_status != GAME_MODE_PLAYING)
+ return;
+
+ action_delay_value =
+ (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay);
+
+ if (tape.playing && tape.index_search && !tape.pausing)
+ action_delay_value = 0;
+
+ /* ---------- main game synchronization point ---------- */
+
+ WaitUntilDelayReached(&action_delay, action_delay_value);
+
+ if (network_playing && !network_player_action_received)
+ {
+ /*
#ifdef DEBUG
printf("DEBUG: try to get network player actions in time\n");
#endif
if (tape.pausing)
return;
+#if 0
+ printf("::: getting new tape action [%d]\n", FrameCounter);
+#endif
+
recorded_player_action = (tape.playing ? TapePlayAction() : NULL);
for (i=0; i<MAX_PLAYERS; i++)
if (!options.network && !setup.team_mode)
local_player->effective_action = summarized_player_action;
- for (i=0; i<MAX_PLAYERS; i++)
+ for (i=0; i < MAX_PLAYERS; i++)
{
int actual_player_action = stored_player[i].effective_action;
if (recorded_player_action)
actual_player_action = recorded_player_action[i];
- PlayerActions(&stored_player[i], actual_player_action);
- ScrollFigure(&stored_player[i], SCROLL_GO_ON);
+ tape_action[i] = PlayerActions(&stored_player[i], actual_player_action);
+
+ if (tape.recording && tape_action[i] && !tape.player_participates[i])
+ tape.player_participates[i] = TRUE; /* player just appeared from CE */
+
+ ScrollPlayer(&stored_player[i], SCROLL_GO_ON);
}
+#if 1
+ if (tape.recording)
+ TapeRecordAction(tape_action);
+#endif
+
network_player_action_received = FALSE;
ScrollScreen(NULL, SCROLL_GO_ON);
#endif
#if 1
- if (game.engine_version < RELEASE_IDENT(2,2,0,7))
+ if (game.engine_version < VERSION_IDENT(2,2,0,7))
{
for (i=0; i<MAX_PLAYERS; i++)
{
int x = player->jx;
int y = player->jy;
- if (player->active && player->Pushing && player->is_moving &&
+ if (player->active && player->is_pushing && player->is_moving &&
IS_MOVING(x, y))
{
ContinueMoving(x, y);
#endif
Stop[x][y] = FALSE;
- if (JustStopped[x][y] > 0)
- JustStopped[x][y]--;
+ if (WasJustMoving[x][y] > 0)
+ WasJustMoving[x][y]--;
+ if (WasJustFalling[x][y] > 0)
+ WasJustFalling[x][y]--;
GfxFrame[x][y]++;
{
element = Feld[x][y];
#if 1
- graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+ graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
#else
graphic = el2img(element);
#endif
SetRandomAnimationValue(x, y);
#if 1
- PlaySoundLevelActionIfLoop(x, y, GfxAction[x][y]);
+ PlayLevelSoundActionIfLoop(x, y, GfxAction[x][y]);
#endif
if (IS_INACTIVE(element))
#if 1
/* this may take place after moving, so 'element' may have changed */
+#if 0
if (IS_CHANGING(x, y))
+#else
+ if (IS_CHANGING(x, y) &&
+ (game.engine_version < VERSION_IDENT(3,0,7,1) || !Stop[x][y]))
+#endif
{
#if 0
ChangeElement(x, y, ChangePage[x][y] != -1 ? ChangePage[x][y] :
#endif
element = Feld[x][y];
- graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+ graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
}
#endif
StartMoving(x, y);
#if 1
- graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]);
+ graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]);
#if 0
if (element == EL_MOLE)
printf("::: %d, %d, %d [%d]\n",
{
DrawLevelGraphicAnimationIfNeeded(x, y, graphic);
+#if 0
+ if (element == EL_BUG)
+ printf("::: %d, %d\n", graphic, GfxFrame[x][y]);
+#endif
+
#if 0
if (element == EL_MOLE)
printf("::: %d, %d\n", graphic, GfxFrame[x][y]);
#endif
if (IS_BELT_ACTIVE(element))
- PlaySoundLevelAction(x, y, ACTION_ACTIVE);
+ PlayLevelSoundAction(x, y, ACTION_ACTIVE);
if (game.magic_wall_active)
{
if (element == EL_BD_MAGIC_WALL_FULL ||
element == EL_BD_MAGIC_WALL_ACTIVE ||
element == EL_BD_MAGIC_WALL_EMPTYING)
- PlaySoundLevel(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE);
+ PlayLevelSound(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE);
else
- PlaySoundLevel(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE);
+ PlayLevelSound(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE);
}
if (game.magic_wall_time_left > 0)
if (SHIELD_ON(player))
{
if (player->shield_deadly_time_left)
- PlaySoundLevel(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE);
+ PlayLevelSound(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE);
else if (player->shield_normal_time_left)
- PlaySoundLevel(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE);
+ PlayLevelSound(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE);
}
}
}
/*
- MoveFigureOneStep()
+ MovePlayerOneStep()
-----------------------------------------------------------------------------
dx, dy: direction (non-diagonal) to try to move the player to
real_dx, real_dy: direction as read from input device (can be diagonal)
*/
-boolean MoveFigureOneStep(struct PlayerInfo *player,
+boolean MovePlayerOneStep(struct PlayerInfo *player,
int dx, int dy, int real_dx, int real_dy)
{
+#if 0
static int change_sides[4][2] =
{
/* enter side leave side */
dy == +1 ? MV_DOWN : MV_NO_MOVING);
int enter_side = change_sides[MV_DIR_BIT(move_direction)][0];
int leave_side = change_sides[MV_DIR_BIT(move_direction)][1];
+#endif
int jx = player->jx, jy = player->jy;
int new_jx = jx + dx, new_jy = jy + dy;
int element;
player->MovPos =
(dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value);
- ScrollFigure(player, SCROLL_INIT);
+ ScrollPlayer(player, SCROLL_INIT);
#if 0
if (IS_CUSTOM_ELEMENT(Feld[jx][jy]))
return MF_MOVING;
}
-boolean MoveFigure(struct PlayerInfo *player, int dx, int dy)
+boolean MovePlayer(struct PlayerInfo *player, int dx, int dy)
{
int jx = player->jx, jy = player->jy;
int old_jx = jx, old_jy = jy;
while (player->MovPos)
{
- ScrollFigure(player, SCROLL_GO_ON);
+ ScrollPlayer(player, SCROLL_GO_ON);
ScrollScreen(NULL, SCROLL_GO_ON);
FrameCounter++;
DrawAllPlayers();
if (player->last_move_dir & (MV_LEFT | MV_RIGHT))
{
- if (!(moved |= MoveFigureOneStep(player, 0, dy, dx, dy)))
- moved |= MoveFigureOneStep(player, dx, 0, dx, dy);
+ if (!(moved |= MovePlayerOneStep(player, 0, dy, dx, dy)))
+ moved |= MovePlayerOneStep(player, dx, 0, dx, dy);
}
else
{
- if (!(moved |= MoveFigureOneStep(player, dx, 0, dx, dy)))
- moved |= MoveFigureOneStep(player, 0, dy, dx, dy);
+ if (!(moved |= MovePlayerOneStep(player, dx, 0, dx, dy)))
+ moved |= MovePlayerOneStep(player, 0, dy, dx, dy);
}
jx = player->jx;
#if 1
InitPlayerGfxAnimation(player, ACTION_DEFAULT);
#else
- if (!(moved & MF_MOVING) && !player->Pushing)
+ if (!(moved & MF_MOVING) && !player->is_pushing)
player->Frame = 0;
#endif
#endif
player->last_move_dir = player->MovDir;
player->is_moving = TRUE;
#if 1
- player->snapped = FALSE;
+ player->is_snapping = FALSE;
#endif
#if 1
- player->Switching = FALSE;
+ player->is_switching = FALSE;
#endif
player->is_moving = FALSE;
}
- TestIfHeroTouchesBadThing(jx, jy);
- TestIfPlayerTouchesCustomElement(jx, jy);
+ if (game.engine_version < VERSION_IDENT(3,0,7,0))
+ {
+ TestIfHeroTouchesBadThing(jx, jy);
+ TestIfPlayerTouchesCustomElement(jx, jy);
+ }
if (!player->active)
RemoveHero(player);
return moved;
}
-void ScrollFigure(struct PlayerInfo *player, int mode)
+void ScrollPlayer(struct PlayerInfo *player, int mode)
{
int jx = player->jx, jy = player->jy;
int last_jx = player->last_jx, last_jy = player->last_jy;
player->LevelSolved = player->GameOver = TRUE;
}
+ if (game.engine_version >= VERSION_IDENT(3,0,7,0))
+ {
+ TestIfHeroTouchesBadThing(jx, jy);
+ TestIfPlayerTouchesCustomElement(jx, jy);
+#if 1
+ TestIfElementTouchesCustomElement(jx, jy); /* for empty space */
+#endif
+
+ if (!player->active)
+ RemoveHero(player);
+ }
+
if (tape.single_step && tape.recording && !tape.pausing &&
!player->programmed_action)
TapeTogglePause(TAPE_TOGGLE_AUTOMATIC);
void TestIfPlayerTouchesCustomElement(int x, int y)
{
-#if 0
- static boolean check_changing = FALSE;
-#endif
static int xy[4][2] =
{
{ 0, -1 },
{ CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* check right */
{ CH_SIDE_BOTTOM, CH_SIDE_TOP } /* check bottom */
};
+ static int touch_dir[4] =
+ {
+ MV_LEFT | MV_RIGHT,
+ MV_UP | MV_DOWN,
+ MV_UP | MV_DOWN,
+ MV_LEFT | MV_RIGHT
+ };
+ int center_element = Feld[x][y]; /* should always be non-moving! */
int i;
-#if 0
- if (check_changing) /* prevent this function from running into a loop */
- return;
-
- check_changing = TRUE;
-#endif
-
for (i=0; i<4; i++)
{
int xx = x + xy[i][0];
int yy = y + xy[i][1];
int center_side = change_sides[i][0];
int border_side = change_sides[i][1];
+ int border_element;
if (!IN_LEV_FIELD(xx, yy))
continue;
-#if 1
if (IS_PLAYER(x, y))
{
- CheckTriggeredElementSideChange(xx, yy, Feld[xx][yy], border_side,
+ if (game.engine_version < VERSION_IDENT(3,0,7,0))
+ border_element = Feld[xx][yy]; /* may be moving! */
+ else if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy))
+ border_element = Feld[xx][yy];
+ else if (MovDir[xx][yy] & touch_dir[i]) /* elements are touching */
+ border_element = MovingOrBlocked2Element(xx, yy);
+ else
+ continue; /* center and border element do not touch */
+
+ CheckTriggeredElementSideChange(xx, yy, border_element, border_side,
CE_OTHER_GETS_TOUCHED);
- CheckElementSideChange(xx, yy, Feld[xx][yy], border_side,
+ CheckElementSideChange(xx, yy, border_element, border_side,
CE_TOUCHED_BY_PLAYER, -1);
}
else if (IS_PLAYER(xx, yy))
{
- CheckTriggeredElementSideChange(x, y, Feld[x][y], center_side,
+ if (game.engine_version >= VERSION_IDENT(3,0,7,0))
+ {
+ struct PlayerInfo *player = PLAYERINFO(xx, yy);
+
+ if (player->MovPos != 0 && !(player->MovDir & touch_dir[i]))
+ continue; /* center and border element do not touch */
+ }
+
+ CheckTriggeredElementSideChange(x, y, center_element, center_side,
CE_OTHER_GETS_TOUCHED);
- CheckElementSideChange(x, y, Feld[x][y], center_side,
+ CheckElementSideChange(x, y, center_element, center_side,
CE_TOUCHED_BY_PLAYER, -1);
break;
}
-#else
- if (IS_PLAYER(x, y))
- {
- CheckTriggeredElementChange(xx, yy, Feld[xx][yy], CE_OTHER_GETS_TOUCHED);
- CheckElementChange(xx, yy, Feld[xx][yy], CE_TOUCHED_BY_PLAYER);
- }
- else if (IS_PLAYER(xx, yy))
- {
- CheckTriggeredElementChange(x, y, Feld[x][y], CE_OTHER_GETS_TOUCHED);
- CheckElementChange(x, y, Feld[x][y], CE_TOUCHED_BY_PLAYER);
-
- break;
- }
-#endif
}
-
-#if 0
- check_changing = FALSE;
-#endif
}
void TestIfElementTouchesCustomElement(int x, int y)
{
-#if 0
- static boolean check_changing = FALSE;
-#endif
static int xy[4][2] =
{
{ 0, -1 },
};
boolean change_center_element = FALSE;
int center_element_change_page = 0;
-#if 0
- int center_element = MovingOrBlocked2Element(x, y);
-#else
int center_element = Feld[x][y]; /* should always be non-moving! */
-#endif
int i, j;
-#if 0
- if (center_element == EL_CUSTOM_START + 244)
- printf("::: checking element %d at %d,%d... [%d]\n",
- center_element, x, y, Feld[x][y + 1]);
-#endif
-
-#if 0
- if (check_changing) /* prevent this function from running into a loop */
- return;
-
- check_changing = TRUE;
-#endif
-
for (i=0; i<4; i++)
{
int xx = x + xy[i][0];
if (!IN_LEV_FIELD(xx, yy))
continue;
-#if 0
- if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy))
+ if (game.engine_version < VERSION_IDENT(3,0,7,0))
+ border_element = Feld[xx][yy]; /* may be moving! */
+ else if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy))
border_element = Feld[xx][yy];
else if (MovDir[xx][yy] & touch_dir[i]) /* elements are touching */
- {
-#if 0
- printf("::: moving && touching...\n");
-#endif
-
border_element = MovingOrBlocked2Element(xx, yy);
- }
else
- {
-#if 0
- printf("::: moving && NOT touching...\n");
-#endif
-
continue; /* center and border element do not touch */
- }
-#else
-
-#if 0
- border_element = MovingOrBlocked2Element(xx, yy);
-#else
- border_element = Feld[xx][yy]; /* may be moving! */
-#endif
-
-#endif
/* check for change of center element (but change it only once) */
if (IS_CUSTOM_ELEMENT(center_element) &&
change->sides & center_side &&
change->trigger_element == center_element)
{
-#if 0
- printf("::: changing border element %d at %d,%d\n",
- border_element, xx, yy);
-#endif
-
CheckElementSideChange(xx, yy, border_element, CH_SIDE_ANY,
CE_OTHER_IS_TOUCHING, j);
break;
}
if (change_center_element)
- {
-#if 0
- printf("::: changing center element %d at %d,%d\n",
- center_element, x, y);
-#endif
-
CheckElementSideChange(x, y, center_element, CH_SIDE_ANY,
CE_OTHER_IS_TOUCHING, center_element_change_page);
- }
-
-#if 0
- check_changing = FALSE;
-#endif
}
void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir)
{ +1, 0 },
{ 0, +1 }
};
+ static int touch_dir[4] =
+ {
+ MV_LEFT | MV_RIGHT,
+ MV_UP | MV_DOWN,
+ MV_UP | MV_DOWN,
+ MV_LEFT | MV_RIGHT
+ };
static int test_dir[4] =
{
MV_UP,
if (bad_element == EL_ROBOT && player->is_moving)
continue; /* robot does not kill player if he is moving */
+ if (game.engine_version >= VERSION_IDENT(3,0,7,0))
+ {
+ if (player->MovPos != 0 && !(player->MovDir & touch_dir[i]))
+ continue; /* center and border element do not touch */
+ }
+
kill_x = test_x;
kill_y = test_y;
break;
{
struct PlayerInfo *player = PLAYERINFO(kill_x, kill_y);
-#if 0
- int dir = player->MovDir;
- int newx = player->jx + (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0);
- int newy = player->jy + (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0);
-
- if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
- newx != bad_x && newy != bad_y)
- ; /* robot does not kill player if he is moving */
- else
- printf("-> %d\n", player->MovDir);
-
- if (Feld[bad_x][bad_y] == EL_ROBOT && player->is_moving &&
- newx != bad_x && newy != bad_y)
- ; /* robot does not kill player if he is moving */
- else
- ;
-#endif
-
if (player->shield_deadly_time_left > 0)
Bang(bad_x, bad_y);
else if (!PLAYER_PROTECTED(kill_x, kill_y))
return;
#if 1
- PlaySoundLevelElementAction(jx, jy, player->element_nr, ACTION_DYING);
+ PlayLevelSoundElementAction(jx, jy, player->element_nr, ACTION_DYING);
#else
- PlaySoundLevel(jx, jy, SND_CLASS_PLAYER_DYING);
+ PlayLevelSound(jx, jy, SND_CLASS_PLAYER_DYING);
#endif
- PlaySoundLevel(jx, jy, SND_GAME_LOSING);
+ PlayLevelSound(jx, jy, SND_GAME_LOSING);
player->GameOver = TRUE;
RemoveHero(player);
CH_SIDE_BOTTOM, /* moving up */
CH_SIDE_TOP, /* moving down */
};
- boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0));
+ boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0,0));
int jx = player->jx, jy = player->jy;
int dx = x - jx, dy = y - jy;
int nextx = x + dx, nexty = y + dy;
}
if (player->MovPos == 0) /* last pushing move finished */
- player->Pushing = FALSE;
+ player->is_pushing = FALSE;
if (mode == DF_NO_PUSH) /* player just stopped pushing */
{
- player->Switching = FALSE;
+ player->is_switching = FALSE;
player->push_delay = 0;
return MF_NO_ACTION;
if (IS_TUBE(Feld[jx][jy]) || IS_TUBE(Back[jx][jy]))
#else
if (IS_TUBE(Feld[jx][jy]) ||
- (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0)))
+ (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0,0)))
#endif
{
int i = 0;
element = Feld[x][y];
if (mode == DF_SNAP && !IS_SNAPPABLE(element) &&
- game.engine_version >= VERSION_IDENT(2,2,0))
+ game.engine_version >= VERSION_IDENT(2,2,0,0))
return MF_NO_ACTION;
switch (element)
{
-#if 0
- case EL_ROBOT_WHEEL:
- Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE;
- ZX = x;
- ZY = y;
- DrawLevelField(x, y);
- PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING);
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_SP_TERMINAL:
- {
- int xx, yy;
-
- PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVATING);
-
- for (yy=0; yy<lev_fieldy; yy++)
- {
- for (xx=0; xx<lev_fieldx; xx++)
- {
- if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
- Bang(xx, yy);
- else if (Feld[xx][yy] == EL_SP_TERMINAL)
- Feld[xx][yy] = EL_SP_TERMINAL_ACTIVE;
- }
- }
-
- return MF_ACTION;
- }
- break;
-#endif
-
-#if 0
- case EL_CONVEYOR_BELT_1_SWITCH_LEFT:
- case EL_CONVEYOR_BELT_1_SWITCH_MIDDLE:
- case EL_CONVEYOR_BELT_1_SWITCH_RIGHT:
- case EL_CONVEYOR_BELT_2_SWITCH_LEFT:
- case EL_CONVEYOR_BELT_2_SWITCH_MIDDLE:
- case EL_CONVEYOR_BELT_2_SWITCH_RIGHT:
- case EL_CONVEYOR_BELT_3_SWITCH_LEFT:
- case EL_CONVEYOR_BELT_3_SWITCH_MIDDLE:
- case EL_CONVEYOR_BELT_3_SWITCH_RIGHT:
- case EL_CONVEYOR_BELT_4_SWITCH_LEFT:
- case EL_CONVEYOR_BELT_4_SWITCH_MIDDLE:
- case EL_CONVEYOR_BELT_4_SWITCH_RIGHT:
-#if 1
- if (!PLAYER_SWITCHING(player, x, y))
-#else
- if (!player->Switching)
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleBeltSwitch(x, y);
- PlaySoundLevel(x, y, SND_CLASS_CONVEYOR_BELT_SWITCH_ACTIVATING);
- }
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_SWITCHGATE_SWITCH_UP:
- case EL_SWITCHGATE_SWITCH_DOWN:
-#if 1
- if (!PLAYER_SWITCHING(player, x, y))
-#else
- if (!player->Switching)
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleSwitchgateSwitch(x, y);
- PlaySoundLevel(x, y, SND_CLASS_SWITCHGATE_SWITCH_ACTIVATING);
- }
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_LIGHT_SWITCH:
- case EL_LIGHT_SWITCH_ACTIVE:
-#if 1
- if (!PLAYER_SWITCHING(player, x, y))
-#else
- if (!player->Switching)
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleLightSwitch(x, y);
- PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ?
- SND_LIGHT_SWITCH_ACTIVATING :
- SND_LIGHT_SWITCH_DEACTIVATING);
- }
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_TIMEGATE_SWITCH:
- ActivateTimegateSwitch(x, y);
- PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVATING);
-
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_BALLOON_SWITCH_LEFT:
- case EL_BALLOON_SWITCH_RIGHT:
- case EL_BALLOON_SWITCH_UP:
- case EL_BALLOON_SWITCH_DOWN:
- case EL_BALLOON_SWITCH_ANY:
- if (element == EL_BALLOON_SWITCH_ANY)
- game.balloon_dir = move_direction;
- else
- game.balloon_dir = (element == EL_BALLOON_SWITCH_LEFT ? MV_LEFT :
- element == EL_BALLOON_SWITCH_RIGHT ? MV_RIGHT :
- element == EL_BALLOON_SWITCH_UP ? MV_UP :
- element == EL_BALLOON_SWITCH_DOWN ? MV_DOWN :
- MV_NO_MOVING);
- PlaySoundLevel(x, y, SND_CLASS_BALLOON_SWITCH_ACTIVATING);
-
- return MF_ACTION;
- break;
-#endif
-
case EL_SP_PORT_LEFT:
case EL_SP_PORT_RIGHT:
case EL_SP_PORT_UP:
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevel(x, y, SND_CLASS_SP_PORT_PASSING);
+ PlayLevelSound(x, y, SND_CLASS_SP_PORT_PASSING);
break;
case EL_TUBE_ANY:
if (!(tube_enter_directions[i][1] & move_direction))
return MF_NO_ACTION; /* tube has no opening in this direction */
- PlaySoundLevel(x, y, SND_CLASS_TUBE_WALKING);
+ PlayLevelSound(x, y, SND_CLASS_TUBE_WALKING);
}
break;
-#if 0
- case EL_LAMP:
- Feld[x][y] = EL_LAMP_ACTIVE;
- local_player->lights_still_needed--;
- DrawLevelField(x, y);
- PlaySoundLevel(x, y, SND_LAMP_ACTIVATING);
- return MF_ACTION;
- break;
-#endif
-
-#if 0
- case EL_TIME_ORB_FULL:
- Feld[x][y] = EL_TIME_ORB_EMPTY;
- TimeLeft += 10;
- DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2);
- DrawLevelField(x, y);
- PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MIDDLE);
- return MF_ACTION;
- break;
-#endif
-
default:
if (IS_WALKABLE(element))
/* play sound from background or player, whatever is available */
if (element_info[element].sound[sound_action] != SND_UNDEFINED)
- PlaySoundLevelElementAction(x, y, element, sound_action);
+ PlayLevelSoundElementAction(x, y, element, sound_action);
else
- PlaySoundLevelElementAction(x, y, player->element_nr, sound_action);
+ PlayLevelSoundElementAction(x, y, player->element_nr, sound_action);
break;
}
player->programmed_action = move_direction;
DOUBLE_PLAYER_SPEED(player);
- PlaySoundLevelAction(x, y, ACTION_PASSING);
+ PlayLevelSoundAction(x, y, ACTION_PASSING);
break;
}
player->is_digging = TRUE;
}
- PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING);
+ PlayLevelSoundElementAction(x, y, element, ACTION_DIGGING);
CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_DIGGED);
- TestIfElementTouchesCustomElement(x, y); /* for empty space */
+#if 1
+ if (mode == DF_SNAP)
+ TestIfElementTouchesCustomElement(x, y); /* for empty space */
+#endif
break;
}
if (player->inventory_size < MAX_INVENTORY_SIZE)
player->inventory_element[player->inventory_size++] = element;
- player->use_disk_red_graphic = (element == EL_SP_DISK_RED);
-
DrawText(DX_DYNAMITE, DY_DYNAMITE,
int2str(local_player->inventory_size, 3), FONT_TEXT_2);
}
}
RaiseScoreElement(element);
- PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING);
+ PlayLevelSoundElementAction(x, y, element, ACTION_COLLECTING);
CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_COLLECTED);
- TestIfElementTouchesCustomElement(x, y); /* for empty space */
+#if 1
+ if (mode == DF_SNAP)
+ TestIfElementTouchesCustomElement(x, y); /* for empty space */
+#endif
break;
}
!(element == EL_SPRING && use_spring_bug))
return MF_NO_ACTION;
+#if 1
+ if (CAN_MOVE(element) && GET_MAX_MOVE_DELAY(element) == 0 &&
+ ((move_direction & MV_VERTICAL &&
+ ((element_info[element].move_pattern & MV_LEFT &&
+ IN_LEV_FIELD(x - 1, y) && IS_FREE(x - 1, y)) ||
+ (element_info[element].move_pattern & MV_RIGHT &&
+ IN_LEV_FIELD(x + 1, y) && IS_FREE(x + 1, y)))) ||
+ (move_direction & MV_HORIZONTAL &&
+ ((element_info[element].move_pattern & MV_UP &&
+ IN_LEV_FIELD(x, y - 1) && IS_FREE(x, y - 1)) ||
+ (element_info[element].move_pattern & MV_DOWN &&
+ IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1))))))
+ return MF_NO_ACTION;
+#endif
+
#if 1
/* do not push elements already moving away faster than player */
if (CAN_MOVE(element) && MovDir[x][y] == move_direction &&
if (element == EL_SPRING && MovDir[x][y] != MV_NO_MOVING)
return MF_NO_ACTION;
#endif
- if (!player->Pushing &&
- game.engine_version >= RELEASE_IDENT(2,2,0,7))
+
+#if 1
+ if (game.engine_version >= VERSION_IDENT(3,0,7,1))
+ {
+ if (player->push_delay_value == -1)
+ player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+ }
+ else if (game.engine_version >= VERSION_IDENT(2,2,0,7))
+ {
+ if (!player->is_pushing)
+ player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+ }
+
+ /*
+ if (game.engine_version >= VERSION_IDENT(2,2,0,7) &&
+ (game.engine_version < VERSION_IDENT(3,0,7,1) ||
+ !player_is_pushing))
player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+ */
+#else
+ if (!player->is_pushing &&
+ game.engine_version >= VERSION_IDENT(2,2,0,7))
+ player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+#endif
- player->Pushing = TRUE;
+#if 0
+ printf("::: push delay: %ld [%d, %d] [%d]\n",
+ player->push_delay_value, FrameCounter, game.engine_version,
+ player->is_pushing);
+#endif
+
+ player->is_pushing = TRUE;
if (!(IN_LEV_FIELD(nextx, nexty) &&
(IS_FREE(nextx, nexty) ||
if (!FrameReached(&player->push_delay, player->push_delay_value) &&
!(tape.playing && tape.file_version < FILE_VERSION_2_0) &&
element != EL_SPRING && element != EL_BALLOON)
+ {
+ /* make sure that there is no move delay before next try to push */
+ if (game.engine_version >= VERSION_IDENT(3,0,7,1))
+ player->move_delay = INITIAL_MOVE_DELAY_OFF;
+
return MF_NO_ACTION;
+ }
+
+#if 0
+ printf("::: NOW PUSHING... [%d]\n", FrameCounter);
+#endif
if (IS_SB_ELEMENT(element))
{
Feld[x][y] = EL_SOKOBAN_OBJECT;
if (Back[x][y] == Back[nextx][nexty])
- PlaySoundLevelAction(x, y, ACTION_PUSHING);
+ PlayLevelSoundAction(x, y, ACTION_PUSHING);
else if (Back[x][y] != 0)
- PlaySoundLevelElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
+ PlayLevelSoundElementAction(x, y, EL_SOKOBAN_FIELD_FULL,
ACTION_EMPTYING);
else
- PlaySoundLevelElementAction(nextx, nexty, EL_SOKOBAN_FIELD_EMPTY,
+ PlayLevelSoundElementAction(nextx, nexty, EL_SOKOBAN_FIELD_EMPTY,
ACTION_FILLING);
if (local_player->sokobanfields_still_needed == 0 &&
game.emulation == EMU_SOKOBAN)
{
player->LevelSolved = player->GameOver = TRUE;
- PlaySoundLevel(x, y, SND_GAME_SOKOBAN_SOLVING);
+ PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING);
}
}
else
- PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING);
+ PlayLevelSoundElementAction(x, y, element, ACTION_PUSHING);
InitMovingField(x, y, move_direction);
GfxAction[x][y] = ACTION_PUSHING;
Pushed[x][y] = TRUE;
Pushed[nextx][nexty] = TRUE;
- if (game.engine_version < RELEASE_IDENT(2,2,0,7))
+ if (game.engine_version < VERSION_IDENT(2,2,0,7))
player->push_delay_value = GET_NEW_PUSH_DELAY(element);
+ else
+ player->push_delay_value = -1; /* get new value later */
-#if 1
CheckTriggeredElementSideChange(x, y, element, dig_side,
CE_OTHER_GETS_PUSHED);
CheckElementSideChange(x, y, element, dig_side,
CE_PUSHED_BY_PLAYER, -1);
-#else
- CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_PUSHED);
- CheckElementChange(x, y, element, CE_PUSHED_BY_PLAYER);
-#endif
break;
}
if (PLAYER_SWITCHING(player, x, y))
return MF_ACTION;
-#if 1
- PlaySoundLevelElementAction(x, y, element, ACTION_ACTIVATING);
-#endif
+ player->is_switching = TRUE;
+ player->switch_x = x;
+ player->switch_y = y;
+
+ PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVATING);
if (element == EL_ROBOT_WHEEL)
{
ZY = y;
DrawLevelField(x, y);
-
-#if 0
- PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING);
-#endif
}
else if (element == EL_SP_TERMINAL)
{
int xx, yy;
-#if 0
- PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVATING);
-#endif
-
- for (yy=0; yy<lev_fieldy; yy++)
+ for (yy=0; yy < lev_fieldy; yy++) for (xx=0; xx < lev_fieldx; xx++)
{
- for (xx=0; xx<lev_fieldx; xx++)
- {
- if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
- Bang(xx, yy);
- else if (Feld[xx][yy] == EL_SP_TERMINAL)
- Feld[xx][yy] = EL_SP_TERMINAL_ACTIVE;
- }
+ if (Feld[xx][yy] == EL_SP_DISK_YELLOW)
+ Bang(xx, yy);
+ else if (Feld[xx][yy] == EL_SP_TERMINAL)
+ Feld[xx][yy] = EL_SP_TERMINAL_ACTIVE;
}
}
else if (IS_BELT_SWITCH(element))
{
-#if 0
- if (!PLAYER_SWITCHING(player, x, y))
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleBeltSwitch(x, y);
-
-#if 0
- PlaySoundLevel(x, y, SND_CLASS_CONVEYOR_BELT_SWITCH_ACTIVATING);
-#endif
- }
+ ToggleBeltSwitch(x, y);
}
else if (element == EL_SWITCHGATE_SWITCH_UP ||
element == EL_SWITCHGATE_SWITCH_DOWN)
{
-#if 0
- if (!PLAYER_SWITCHING(player, x, y))
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleSwitchgateSwitch(x, y);
-
-#if 0
- PlaySoundLevel(x, y, SND_CLASS_SWITCHGATE_SWITCH_ACTIVATING);
-#endif
- }
+ ToggleSwitchgateSwitch(x, y);
}
else if (element == EL_LIGHT_SWITCH ||
element == EL_LIGHT_SWITCH_ACTIVE)
{
-#if 0
- if (!PLAYER_SWITCHING(player, x, y))
-#endif
- {
- player->Switching = TRUE;
- player->switch_x = x;
- player->switch_y = y;
-
- ToggleLightSwitch(x, y);
+ ToggleLightSwitch(x, y);
#if 0
- PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ?
- SND_LIGHT_SWITCH_ACTIVATING :
- SND_LIGHT_SWITCH_DEACTIVATING);
+ PlayLevelSound(x, y, element == EL_LIGHT_SWITCH ?
+ SND_LIGHT_SWITCH_ACTIVATING :
+ SND_LIGHT_SWITCH_DEACTIVATING);
#endif
- }
}
else if (element == EL_TIMEGATE_SWITCH)
{
ActivateTimegateSwitch(x, y);
-
-#if 0
- PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVATING);
-#endif
}
else if (element == EL_BALLOON_SWITCH_LEFT ||
element == EL_BALLOON_SWITCH_RIGHT ||
element == EL_BALLOON_SWITCH_UP ? MV_UP :
element == EL_BALLOON_SWITCH_DOWN ? MV_DOWN :
MV_NO_MOVING);
-
-#if 0
- PlaySoundLevel(x, y, SND_CLASS_BALLOON_SWITCH_ACTIVATING);
-#endif
}
else if (element == EL_LAMP)
{
local_player->lights_still_needed--;
DrawLevelField(x, y);
-
-#if 0
- PlaySoundLevel(x, y, SND_LAMP_ACTIVATING);
-#endif
}
else if (element == EL_TIME_ORB_FULL)
{
}
else
{
-#if 1
if (!PLAYER_SWITCHING(player, x, y))
-#else
- if (!player->Switching)
-#endif
{
- player->Switching = TRUE;
+ player->is_switching = TRUE;
player->switch_x = x;
player->switch_y = y;
dy == -1 ? MV_UP :
dy == +1 ? MV_DOWN : MV_NO_MOVING);
- if (player->MovPos && game.engine_version >= VERSION_IDENT(2,2,0))
+ if (player->MovPos && game.engine_version >= VERSION_IDENT(2,2,0,0))
return FALSE;
if (!player->active || !IN_LEV_FIELD(x, y))
if (!dx && !dy)
{
if (player->MovPos == 0)
- player->Pushing = FALSE;
+ player->is_pushing = FALSE;
- player->snapped = FALSE;
+ player->is_snapping = FALSE;
if (player->MovPos == 0)
{
+ player->is_moving = FALSE;
player->is_digging = FALSE;
player->is_collecting = FALSE;
-#if 1
- player->is_moving = FALSE;
-#endif
}
-#if 0
- printf("::: trying to snap...\n");
-#endif
-
return FALSE;
}
- if (player->snapped)
+ if (player->is_snapping)
return FALSE;
player->MovDir = snap_direction;
-#if 1
+ player->is_moving = FALSE;
player->is_digging = FALSE;
player->is_collecting = FALSE;
-#if 1
- player->is_moving = FALSE;
-#endif
-#endif
if (DigField(player, x, y, 0, 0, DF_SNAP) == MF_NO_ACTION)
return FALSE;
- player->snapped = TRUE;
-#if 1
+ player->is_snapping = TRUE;
+
+ player->is_moving = FALSE;
player->is_digging = FALSE;
player->is_collecting = FALSE;
-#if 1
- player->is_moving = FALSE;
-#endif
-#endif
DrawLevelField(x, y);
BackToFront();
{
int new_element = player->inventory_element[--player->inventory_size];
-#if 1
Feld[jx][jy] = (new_element == EL_DYNAMITE ? EL_DYNAMITE_ACTIVE :
new_element == EL_SP_DISK_RED ? EL_SP_DISK_RED_ACTIVE :
new_element);
-#else
- Feld[jx][jy] = (player->use_disk_red_graphic ? EL_SP_DISK_RED_ACTIVE :
- EL_DYNAMITE_ACTIVE);
-#endif
DrawText(DX_DYNAMITE, DY_DYNAMITE,
int2str(local_player->inventory_size, 3), FONT_TEXT_2);
if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
- PlaySoundLevelAction(jx, jy, ACTION_DROPPING);
+ PlayLevelSoundAction(jx, jy, ACTION_DROPPING);
CheckTriggeredElementChange(jx, jy, new_element, CE_OTHER_GETS_DROPPED);
CheckElementChange(jx, jy, new_element, CE_DROPPED_BY_PLAYER);
if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy)))
DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0);
- PlaySoundLevelAction(jx, jy, ACTION_DROPPING);
+ PlayLevelSoundAction(jx, jy, ACTION_DROPPING);
}
return TRUE;
static int *loop_sound_frame = NULL;
static int *loop_sound_volume = NULL;
-void InitPlaySoundLevel()
+void InitPlayLevelSound()
{
int num_sounds = getSoundListSize();
loop_sound_volume = checked_calloc(num_sounds * sizeof(int));
}
-static void PlaySoundLevel(int x, int y, int nr)
+static void PlayLevelSound(int x, int y, int nr)
{
int sx = SCREENX(x), sy = SCREENY(y);
int volume, stereo_position;
PlaySoundExt(nr, volume, stereo_position, type);
}
-static void PlaySoundLevelNearest(int x, int y, int sound_action)
+static void PlayLevelSoundNearest(int x, int y, int sound_action)
{
- PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) :
+ PlayLevelSound(x < LEVELX(BX1) ? LEVELX(BX1) :
x > LEVELX(BX2) ? LEVELX(BX2) : x,
y < LEVELY(BY1) ? LEVELY(BY1) :
y > LEVELY(BY2) ? LEVELY(BY2) : y,
sound_action);
}
-static void PlaySoundLevelAction(int x, int y, int action)
+static void PlayLevelSoundAction(int x, int y, int action)
{
- PlaySoundLevelElementAction(x, y, Feld[x][y], action);
+ PlayLevelSoundElementAction(x, y, Feld[x][y], action);
}
-static void PlaySoundLevelElementAction(int x, int y, int element, int action)
+static void PlayLevelSoundElementAction(int x, int y, int element, int action)
{
int sound_effect = element_info[element].sound[action];
if (sound_effect != SND_UNDEFINED)
- PlaySoundLevel(x, y, sound_effect);
+ PlayLevelSound(x, y, sound_effect);
}
-static void PlaySoundLevelActionIfLoop(int x, int y, int action)
+static void PlayLevelSoundElementActionIfLoop(int x, int y, int element,
+ int action)
+{
+ int sound_effect = element_info[element].sound[action];
+
+ if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
+ PlayLevelSound(x, y, sound_effect);
+}
+
+static void PlayLevelSoundActionIfLoop(int x, int y, int action)
{
int sound_effect = element_info[Feld[x][y]].sound[action];
if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect))
- PlaySoundLevel(x, y, sound_effect);
+ PlayLevelSound(x, y, sound_effect);
}
-static void StopSoundLevelActionIfLoop(int x, int y, int action)
+static void StopLevelSoundActionIfLoop(int x, int y, int action)
{
int sound_effect = element_info[Feld[x][y]].sound[action];
StopSoundExt(sound_effect, SND_CTRL_STOP_SOUND);
}
+static void PlayLevelMusic()
+{
+#if 1
+ if (levelset.music[level_nr] != MUS_UNDEFINED)
+ PlayMusic(levelset.music[level_nr]); /* from config file */
+ else
+ PlayMusic(-(level_nr + 1)); /* from music dir */
+#else
+ PlayMusic(level_nr);
+#endif
+}
+
void RaiseScore(int value)
{
local_player->score += value;
setup.sound = setup.sound_music = TRUE;
SetAudioMode(setup.sound);
- PlayMusic(level_nr);
+
+ PlayLevelMusic();
}
break;
projects / rocksndiamonds.git / blobdiff