X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=f5c787f6d07a37fc606f0426e3877f04cea1f626;hb=005e27dc77775cbda39afc1daabc8d5f6011f575;hp=c4764283bb635d6a25c086410d69e80695cd4c53;hpb=85279bc51ad11bce89beae5b0e02f1faec520afa;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index c4764283..a8389022 100644 --- a/src/game.c +++ b/src/game.c @@ -27,26 +27,34 @@ /* EXPERIMENTAL STUFF */ #define USE_NEW_AMOEBA_CODE FALSE +/* EXPERIMENTAL STUFF */ +#define USE_NEW_MOVE_STYLE TRUE *0 +#define USE_NEW_MOVE_DELAY TRUE *1 +#define USE_NEW_PUSH_DELAY TRUE *1 +#define USE_NEW_BLOCK_STYLE TRUE *1 + /* for DigField() */ #define DF_NO_PUSH 0 #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 /* for Explode() */ #define EX_PHASE_START 0 -#define EX_NO_EXPLOSION 0 -#define EX_NORMAL 1 -#define EX_CENTER 2 -#define EX_BORDER 3 +#define EX_TYPE_NONE 0 +#define EX_TYPE_NORMAL (1 << 0) +#define EX_TYPE_CENTER (1 << 1) +#define EX_TYPE_BORDER (1 << 2) +#define EX_TYPE_CROSS (1 << 3) +#define EX_TYPE_SINGLE_TILE (EX_TYPE_CENTER | EX_TYPE_BORDER) /* special positions in the game control window (relative to control window) */ #define XX_LEVEL 37 @@ -59,7 +67,8 @@ #define YY_KEYS 123 #define XX_SCORE 15 #define YY_SCORE 159 -#define XX_TIME 29 +#define XX_TIME1 29 +#define XX_TIME2 30 #define YY_TIME 194 /* special positions in the game control window (relative to main window) */ @@ -73,7 +82,8 @@ #define DY_KEYS (DY + YY_KEYS) #define DX_SCORE (DX + XX_SCORE) #define DY_SCORE (DY + YY_SCORE) -#define DX_TIME (DX + XX_TIME) +#define DX_TIME1 (DX + XX_TIME1) +#define DX_TIME2 (DX + XX_TIME2) #define DY_TIME (DY + YY_TIME) /* values for initial player move delay (initial delay counter value) */ @@ -89,12 +99,191 @@ #define DOUBLE_PLAYER_SPEED(p) (HALVE_MOVE_DELAY((p)->move_delay_value)) #define HALVE_PLAYER_SPEED(p) (DOUBLE_MOVE_DELAY((p)->move_delay_value)) +/* values for other actions */ +#define MOVE_STEPSIZE_NORMAL (TILEX / MOVE_DELAY_NORMAL_SPEED) + +#define GET_DX_FROM_DIR(d) ((d) == MV_LEFT ? -1 : (d) == MV_RIGHT ? 1 : 0) +#define GET_DY_FROM_DIR(d) ((d) == MV_UP ? -1 : (d) == MV_DOWN ? 1 : 0) + #define INIT_GFX_RANDOM() (SimpleRND(1000000)) #define GET_NEW_PUSH_DELAY(e) ( (element_info[e].push_delay_fixed) + \ RND(element_info[e].push_delay_random)) +#define GET_NEW_DROP_DELAY(e) ( (element_info[e].drop_delay_fixed) + \ + RND(element_info[e].drop_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 GET_TARGET_ELEMENT(e, ch) \ + ((e) == EL_TRIGGER_ELEMENT ? (ch)->actual_trigger_element : \ + (e) == EL_TRIGGER_PLAYER ? (ch)->actual_trigger_player : (e)) + +#define GET_VALID_PLAYER_ELEMENT(e) \ + ((e) >= EL_PLAYER_1 && (e) <= EL_PLAYER_4 ? (e) : EL_PLAYER_1) + +#define CAN_GROW_INTO(e) \ + ((e) == EL_SAND || (IS_DIGGABLE(e) && level.grow_into_diggable)) + +#define ELEMENT_CAN_ENTER_FIELD_BASE_X(x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (condition))) + +#define ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + (condition))) + +#define ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + (condition))) + +#define ELEMENT_CAN_ENTER_FIELD_BASE_4(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (condition) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + (DONT_COLLIDE_WITH(e) && \ + IS_PLAYER(x, y) && \ + !PLAYER_ENEMY_PROTECTED(x, y)))) + +#if 0 +#define ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (condition) || \ + (DONT_COLLIDE_WITH(e) && \ + IS_PLAYER(x, y) && \ + !PLAYER_ENEMY_PROTECTED(x, y)))) +#endif + +#define ELEMENT_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_4(e, x, y, 0) + +#if 1 +#define SATELLITE_CAN_ENTER_FIELD(x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(EL_SATELLITE, x, y, 0) +#else +#define SATELLITE_CAN_ENTER_FIELD(x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_X(x, y, Feld[x][y] == EL_ACID) +#endif + +#if 0 +#define ENEMY_CAN_ENTER_FIELD(e, x, y) (IN_LEV_FIELD(x, y) && IS_FREE(x, y)) +#endif + +#define ENEMY_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0) + +#if 1 + +#define YAMYAM_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, Feld[x][y] == EL_DIAMOND) + +#define DARK_YAMYAM_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x,y, IS_FOOD_DARK_YAMYAM(Feld[x][y])) + +#define PACMAN_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_3(e, x, y, IS_AMOEBOID(Feld[x][y])) + +#define PIG_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, IS_FOOD_PIG(Feld[x][y])) + +#define PENGUIN_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, (Feld[x][y] == EL_EXIT_OPEN ||\ + IS_FOOD_PENGUIN(Feld[x][y]))) +#define DRAGON_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0) + +#define MOLE_CAN_ENTER_FIELD(e, x, y, condition) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, (condition)) + +#define SPRING_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_2(e, x, y, 0) + +#else + +#define YAMYAM_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + Feld[x][y] == EL_DIAMOND)) + +#define DARK_YAMYAM_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + IS_FOOD_DARK_YAMYAM(Feld[x][y]))) + +#define PACMAN_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + IS_AMOEBOID(Feld[x][y]))) + +#define PIG_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + IS_FOOD_PIG(Feld[x][y]))) + +#define PENGUIN_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + IS_FOOD_PENGUIN(Feld[x][y]) || \ + Feld[x][y] == EL_EXIT_OPEN)) + +#define DRAGON_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID))) + +#define MOLE_CAN_ENTER_FIELD(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID) || \ + (condition))) + +#define SPRING_CAN_ENTER_FIELD(e, x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (CAN_MOVE_INTO_ACID(e) && \ + Feld[x][y] == EL_ACID))) + +#endif + +#define GROUP_NR(e) ((e) - EL_GROUP_START) +#define MOVE_ENTER_EL(e) (element_info[e].move_enter_element) +#define IS_IN_GROUP(e, nr) (element_info[e].in_group[nr] == TRUE) +#define IS_IN_GROUP_EL(e, ge) (IS_IN_GROUP(e, (ge) - EL_GROUP_START)) + +#define IS_EQUAL_OR_IN_GROUP(e, ge) \ + (IS_GROUP_ELEMENT(ge) ? IS_IN_GROUP(e, GROUP_NR(ge)) : (e) == (ge)) + +#if 0 +#define CE_ENTER_FIELD_COND(e, x, y) \ + (!IS_PLAYER(x, y) && \ + (Feld[x][y] == EL_ACID || \ + IS_EQUAL_OR_IN_GROUP(Feld[x][y], MOVE_ENTER_EL(e)))) +#else +#define CE_ENTER_FIELD_COND(e, x, y) \ + (!IS_PLAYER(x, y) && \ + IS_EQUAL_OR_IN_GROUP(Feld[x][y], MOVE_ENTER_EL(e))) +#endif + +#define CUSTOM_ELEMENT_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_BASE_4(e, x, y, CE_ENTER_FIELD_COND(e, x, y)) + +#define IN_LEV_FIELD_AND_IS_FREE(x, y) (IN_LEV_FIELD(x, y) && IS_FREE(x, y)) +#define IN_LEV_FIELD_AND_NOT_FREE(x, y) (IN_LEV_FIELD(x, y) && !IS_FREE(x, y)) + +#define ACCESS_FROM(e, d) (element_info[e].access_direction &(d)) +#define IS_WALKABLE_FROM(e, d) (IS_WALKABLE(e) && ACCESS_FROM(e, d)) +#define IS_PASSABLE_FROM(e, d) (IS_PASSABLE(e) && ACCESS_FROM(e, d)) +#define IS_ACCESSIBLE_FROM(e, d) (IS_ACCESSIBLE(e) && ACCESS_FROM(e, d)) /* game button identifiers */ #define GAME_CTRL_ID_STOP 0 @@ -109,17 +298,61 @@ /* forward declaration for internal use */ +static void AdvanceFrameAndPlayerCounters(int); + +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); + +int DigField(struct PlayerInfo *, int, int, int, int, int, int, int); + static void InitBeltMovement(void); static void CloseAllOpenTimegates(void); static void CheckGravityMovement(struct PlayerInfo *); -static void KillHeroUnlessProtected(int, int); +static void CheckGravityMovementWhenNotMoving(struct PlayerInfo *); +static void KillHeroUnlessEnemyProtected(int, int); +static void KillHeroUnlessExplosionProtected(int, int); + +static void TestIfPlayerTouchesCustomElement(int, int); +static void TestIfElementTouchesCustomElement(int, int); +static void TestIfElementHitsCustomElement(int, int, int); +#if 0 +static void TestIfElementSmashesCustomElement(int, int, int); +#endif -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 ChangeElement(int, int, int); + +static boolean CheckTriggeredElementChangeExt(int, int, int, int, int,int,int); +#define CheckTriggeredElementChange(x, y, e, ev) \ + CheckTriggeredElementChangeExt(x, y, e, ev, CH_PLAYER_ANY, \ + CH_SIDE_ANY, -1) +#define CheckTriggeredElementChangeByPlayer(x, y, e, ev, p, s) \ + CheckTriggeredElementChangeExt(x, y, e, ev, p, s, -1) +#define CheckTriggeredElementChangeBySide(x, y, e, ev, s) \ + CheckTriggeredElementChangeExt(x, y, e, ev, CH_PLAYER_ANY, s, -1) +#define CheckTriggeredElementChangeByPage(x, y, e, ev, p) \ + CheckTriggeredElementChangeExt(x, y, e, ev, CH_PLAYER_ANY, \ + CH_SIDE_ANY, p) + +static boolean CheckElementChangeExt(int, int, int, int, int, int, int, int); +#define CheckElementChange(x, y, e, te, ev) \ + CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, CH_SIDE_ANY, -1) +#define CheckElementChangeByPlayer(x, y, e, ev, p, s) \ + CheckElementChangeExt(x, y, e, EL_EMPTY, ev, p, s, CH_PAGE_ANY) +#define CheckElementChangeBySide(x, y, e, te, ev, s) \ + CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, s, CH_PAGE_ANY) +#define CheckElementChangeByPage(x, y, e, te, ev, p) \ + CheckElementChangeExt(x, y, e, te, ev, CH_PLAYER_ANY, CH_SIDE_ANY, p) + +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 *); @@ -149,16 +382,28 @@ static void RunTimegateWheel(int x, int y); struct ChangingElementInfo { - int base_element; - int next_element; + int element; + int target_element; int change_delay; void (*pre_change_function)(int x, int y); void (*change_function)(int x, int y); void (*post_change_function)(int x, int y); }; -static struct ChangingElementInfo changing_element_list[] = +static struct ChangingElementInfo change_delay_list[] = { +#if USE_NEW_BLOCK_STYLE +#if 0 + { + EL_PLAYER_IS_LEAVING, + EL_EMPTY, + -1, /* delay for blocking field left by player set at runtime */ + NULL, + NULL, + NULL + }, +#endif +#endif { EL_NUT_BREAKING, EL_EMERALD, @@ -183,6 +428,30 @@ static struct ChangingElementInfo changing_element_list[] = NULL, NULL }, + { + EL_EXIT_CLOSING, + EL_EXIT_CLOSED, + 29, + NULL, + NULL, + NULL + }, + { + EL_SP_EXIT_OPENING, + EL_SP_EXIT_OPEN, + 29, + NULL, + NULL, + NULL + }, + { + EL_SP_EXIT_CLOSING, + EL_SP_EXIT_CLOSED, + 29, + NULL, + NULL, + NULL + }, { EL_SWITCHGATE_OPENING, EL_SWITCHGATE_OPEN, @@ -299,15 +568,120 @@ static struct ChangingElementInfo changing_element_list[] = } }; -static struct ChangingElementInfo changing_element[MAX_NUM_ELEMENTS]; +struct +{ + int element; + int push_delay_fixed, push_delay_random; +} +push_delay_list[] = +{ + { EL_SPRING, 0, 0 }, + { EL_BALLOON, 0, 0 }, + + { EL_SOKOBAN_OBJECT, 2, 0 }, + { EL_SOKOBAN_FIELD_FULL, 2, 0 }, + { EL_SATELLITE, 2, 0 }, + { EL_SP_DISK_YELLOW, 2, 0 }, + + { EL_UNDEFINED, 0, 0 }, +}; + +struct +{ + int element; + int move_stepsize; +} +move_stepsize_list[] = +{ + { EL_AMOEBA_DROP, 2 }, + { EL_AMOEBA_DROPPING, 2 }, + { EL_QUICKSAND_FILLING, 1 }, + { EL_QUICKSAND_EMPTYING, 1 }, + { EL_MAGIC_WALL_FILLING, 2 }, + { EL_BD_MAGIC_WALL_FILLING, 2 }, + { EL_MAGIC_WALL_EMPTYING, 2 }, + { EL_BD_MAGIC_WALL_EMPTYING, 2 }, + + { EL_UNDEFINED, 0 }, +}; + +struct +{ + int element; + int count; +} +collect_count_list[] = +{ + { EL_EMERALD, 1 }, + { EL_BD_DIAMOND, 1 }, + { EL_EMERALD_YELLOW, 1 }, + { EL_EMERALD_RED, 1 }, + { EL_EMERALD_PURPLE, 1 }, + { EL_DIAMOND, 3 }, + { EL_SP_INFOTRON, 1 }, + { EL_PEARL, 5 }, + { EL_CRYSTAL, 8 }, + + { EL_UNDEFINED, 0 }, +}; + +struct +{ + int element; + int direction; +} +access_direction_list[] = +{ + { EL_TUBE_ANY, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }, + { EL_TUBE_VERTICAL, MV_UP | MV_DOWN }, + { EL_TUBE_HORIZONTAL, MV_LEFT | MV_RIGHT }, + { EL_TUBE_VERTICAL_LEFT, MV_LEFT | MV_UP | MV_DOWN }, + { EL_TUBE_VERTICAL_RIGHT, MV_RIGHT | MV_UP | MV_DOWN }, + { EL_TUBE_HORIZONTAL_UP, MV_LEFT | MV_RIGHT | MV_UP }, + { EL_TUBE_HORIZONTAL_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 }, + + { EL_SP_PORT_LEFT, MV_RIGHT }, + { EL_SP_PORT_RIGHT, MV_LEFT }, + { EL_SP_PORT_UP, MV_DOWN }, + { EL_SP_PORT_DOWN, MV_UP }, + { EL_SP_PORT_HORIZONTAL, MV_LEFT | MV_RIGHT }, + { EL_SP_PORT_VERTICAL, MV_UP | MV_DOWN }, + { EL_SP_PORT_ANY, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }, + { EL_SP_GRAVITY_PORT_LEFT, MV_RIGHT }, + { EL_SP_GRAVITY_PORT_RIGHT, MV_LEFT }, + { EL_SP_GRAVITY_PORT_UP, MV_DOWN }, + { EL_SP_GRAVITY_PORT_DOWN, MV_UP }, + { EL_SP_GRAVITY_ON_PORT_LEFT, MV_RIGHT }, + { EL_SP_GRAVITY_ON_PORT_RIGHT, MV_LEFT }, + { EL_SP_GRAVITY_ON_PORT_UP, MV_DOWN }, + { EL_SP_GRAVITY_ON_PORT_DOWN, MV_UP }, + { EL_SP_GRAVITY_OFF_PORT_LEFT, MV_RIGHT }, + { EL_SP_GRAVITY_OFF_PORT_RIGHT, MV_LEFT }, + { EL_SP_GRAVITY_OFF_PORT_UP, MV_DOWN }, + { EL_SP_GRAVITY_OFF_PORT_DOWN, MV_UP }, + + { EL_UNDEFINED, MV_NO_MOVING } +}; + +static unsigned long trigger_events[MAX_NUM_ELEMENTS]; + +#define IS_AUTO_CHANGING(e) (element_info[e].change_events & \ + CH_EVENT_BIT(CE_DELAY)) +#define IS_JUST_CHANGING(x, y) (ChangeDelay[x][y] != 0) +#define IS_CHANGING(x, y) (IS_AUTO_CHANGING(Feld[x][y]) || \ + IS_JUST_CHANGING(x, y)) -#define IS_AUTO_CHANGING(e) (changing_element[e].base_element != EL_UNDEFINED) +#define CE_PAGE(e, ce) (element_info[e].event_page[ce]) void GetPlayerConfig() { if (!audio.sound_available) - setup.sound = FALSE; + setup.sound_simple = FALSE; if (!audio.loops_available) setup.sound_loops = FALSE; @@ -318,7 +692,7 @@ void GetPlayerConfig() if (!video.fullscreen_available) setup.fullscreen = FALSE; - setup.sound_simple = setup.sound; + setup.sound = (setup.sound_simple || setup.sound_loops || setup.sound_music); SetAudioMode(setup.sound); InitJoysticks(); @@ -375,6 +749,73 @@ static int getBeltDirFromBeltSwitchElement(int element) return belt_move_dir[belt_dir_nr]; } +static void InitPlayerField(int x, int y, int element, boolean init_game) +{ + if (element == EL_SP_MURPHY) + { + if (init_game) + { + if (stored_player[0].present) + { + Feld[x][y] = EL_SP_MURPHY_CLONE; + + return; + } + else + { + stored_player[0].use_murphy_graphic = TRUE; + } + + Feld[x][y] = EL_PLAYER_1; + } + } + + if (init_game) + { + struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_PLAYER_1]; + int jx = player->jx, jy = player->jy; + int sp_block_delay = 7; + int em_block_delay = 7; + int sp_no_block_delay = 1; + int em_no_block_delay = 1; + + player->present = TRUE; + + player->block_last_field = (element == EL_SP_MURPHY ? + level.sp_block_last_field : + level.block_last_field); + + player->block_delay_value = + (element == EL_SP_MURPHY ? + (player->block_last_field ? sp_block_delay : sp_no_block_delay) : + (player->block_last_field ? em_block_delay : em_no_block_delay)); + + if (!options.network || player->connected) + { + player->active = TRUE; + + /* remove potentially duplicate players */ + if (StorePlayer[jx][jy] == Feld[x][y]) + StorePlayer[jx][jy] = 0; + + StorePlayer[x][y] = Feld[x][y]; + + if (options.debug) + { + printf("Player %d activated.\n", player->element_nr); + printf("[Local player is %d and currently %s.]\n", + local_player->element_nr, + local_player->active ? "active" : "not active"); + } + } + + Feld[x][y] = EL_EMPTY; + + player->jx = player->last_jx = x; + player->jy = player->last_jy = y; + } +} + static void InitField(int x, int y, boolean init_game) { int element = Feld[x][y]; @@ -382,55 +823,23 @@ static void InitField(int x, int y, boolean init_game) switch (element) { case EL_SP_MURPHY: - if (init_game) - { - if (stored_player[0].present) - { - Feld[x][y] = EL_SP_MURPHY_CLONE; - break; - } - else - { - stored_player[0].use_murphy_graphic = TRUE; - } - - Feld[x][y] = EL_PLAYER_1; - } - /* no break! */ case EL_PLAYER_1: case EL_PLAYER_2: case EL_PLAYER_3: case EL_PLAYER_4: - if (init_game) - { - struct PlayerInfo *player = &stored_player[Feld[x][y] - EL_PLAYER_1]; - int jx = player->jx, jy = player->jy; - - player->present = TRUE; - - if (!options.network || player->connected) - { - player->active = TRUE; - - /* remove potentially duplicate players */ - if (StorePlayer[jx][jy] == Feld[x][y]) - StorePlayer[jx][jy] = 0; + InitPlayerField(x, y, element, init_game); + break; - StorePlayer[x][y] = Feld[x][y]; + case EL_SOKOBAN_FIELD_PLAYER: + element = Feld[x][y] = EL_PLAYER_1; + InitField(x, y, init_game); - if (options.debug) - { - printf("Player %d activated.\n", player->element_nr); - printf("[Local player is %d and currently %s.]\n", - local_player->element_nr, - local_player->active ? "active" : "not active"); - } - } + element = Feld[x][y] = EL_SOKOBAN_FIELD_EMPTY; + InitField(x, y, init_game); + break; - Feld[x][y] = EL_EMPTY; - player->jx = player->last_jx = x; - player->jy = player->last_jy = y; - } + case EL_SOKOBAN_FIELD_EMPTY: + local_player->sokobanfields_still_needed++; break; case EL_STONEBLOCK: @@ -498,6 +907,11 @@ static void InitField(int x, int y, boolean init_game) break; case EL_DYNAMITE_ACTIVE: + case EL_SP_DISK_RED_ACTIVE: + case EL_DYNABOMB_PLAYER_1_ACTIVE: + case EL_DYNABOMB_PLAYER_2_ACTIVE: + case EL_DYNABOMB_PLAYER_3_ACTIVE: + case EL_DYNABOMB_PLAYER_4_ACTIVE: MovDelay[x][y] = 96; break; @@ -505,23 +919,22 @@ static void InitField(int x, int y, boolean init_game) local_player->lights_still_needed++; break; - case EL_SOKOBAN_FIELD_EMPTY: - local_player->sokobanfields_still_needed++; - break; - case EL_PENGUIN: local_player->friends_still_needed++; break; case EL_PIG: case EL_DRAGON: - MovDir[x][y] = 1 << RND(4); + GfxDir[x][y] = MovDir[x][y] = 1 << RND(4); break; +#if 0 case EL_SP_EMPTY: Feld[x][y] = EL_EMPTY; break; +#endif +#if 0 case EL_EM_KEY_1_FILE: Feld[x][y] = EL_EM_KEY_1; break; @@ -534,6 +947,7 @@ static void InitField(int x, int y, boolean init_game) case EL_EM_KEY_4_FILE: Feld[x][y] = EL_EM_KEY_4; break; +#endif case EL_CONVEYOR_BELT_1_SWITCH_LEFT: case EL_CONVEYOR_BELT_1_SWITCH_MIDDLE: @@ -578,110 +992,480 @@ static void InitField(int x, int y, boolean init_game) default: if (IS_CUSTOM_ELEMENT(element) && CAN_MOVE(element)) InitMovDir(x, y); + else if (IS_GROUP_ELEMENT(element)) + { + struct ElementGroupInfo *group = element_info[element].group; + int last_anim_random_frame = gfx.anim_random_frame; + int element_pos; + + if (group->choice_mode == ANIM_RANDOM) + gfx.anim_random_frame = RND(group->num_elements_resolved); + + element_pos = getAnimationFrame(group->num_elements_resolved, 1, + group->choice_mode, 0, + group->choice_pos); + + if (group->choice_mode == ANIM_RANDOM) + gfx.anim_random_frame = last_anim_random_frame; + + group->choice_pos++; + + Feld[x][y] = group->element_resolved[element_pos]; + + InitField(x, y, init_game); + } break; } } -void DrawGameDoorValues() +static inline void InitField_WithBug1(int x, int y, boolean init_game) { - int i, j; + InitField(x, y, init_game); - for (i=0; igems_still_needed, 3), FONT_TEXT_2); - DrawText(DX + XX_DYNAMITE, DY + YY_DYNAMITE, - int2str(local_player->dynamite, 3), FONT_TEXT_2); - DrawText(DX + XX_SCORE, DY + YY_SCORE, - int2str(local_player->score, 5), FONT_TEXT_2); - DrawText(DX + XX_TIME, DY + YY_TIME, - int2str(TimeLeft, 3), FONT_TEXT_2); +static inline void InitField_WithBug2(int x, int y, boolean init_game) +{ + int old_element = Feld[x][y]; + + InitField(x, y, init_game); + + /* not needed to call InitMovDir() -- already done by InitField()! */ + if (game.engine_version < VERSION_IDENT(3,1,0,0) && + CAN_MOVE(old_element) && + (old_element < EL_MOLE_LEFT || old_element > EL_MOLE_DOWN)) + InitMovDir(x, y); + + /* this case is in fact a combination of not less than three bugs: + first, it calls InitMovDir() for elements that can move, although this is + already done by InitField(); then, it checks the element that was at this + field _before_ the call to InitField() (which can change it); lastly, it + was not called for "mole with direction" elements, which were treated as + "cannot move" due to (fixed) wrong element initialization in "src/init.c" + */ } +inline void DrawGameValue_Emeralds(int value) +{ + DrawText(DX_EMERALDS, DY_EMERALDS, int2str(value, 3), FONT_TEXT_2); +} -/* - ============================================================================= - InitGameEngine() - ----------------------------------------------------------------------------- - initialize game engine due to level / tape version number - ============================================================================= -*/ +inline void DrawGameValue_Dynamite(int value) +{ + DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(value, 3), FONT_TEXT_2); +} -static void InitGameEngine() +inline void DrawGameValue_Keys(struct PlayerInfo *player) { int i; - /* set game engine from tape file when re-playing, else from level file */ - game.engine_version = (tape.playing ? tape.engine_version : - level.game_version); + for (i = 0; i < MAX_KEYS; i++) + if (player->key[i]) + DrawMiniGraphicExt(drawto, DX_KEYS + i * MINI_TILEX, DY_KEYS, + el2edimg(EL_KEY_1 + i)); +} - /* dynamically adjust element properties according to game engine version */ - InitElementPropertiesEngine(game.engine_version); +inline void DrawGameValue_Score(int value) +{ + DrawText(DX_SCORE, DY_SCORE, int2str(value, 5), FONT_TEXT_2); +} -#if 0 - printf("level %d: level version == %06d\n", level_nr, level.game_version); - printf(" tape version == %06d [%s] [file: %06d]\n", - tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"), - tape.file_version); - printf(" => game.engine_version == %06d\n", game.engine_version); -#endif +inline void DrawGameValue_Time(int value) +{ + if (value < 1000) + DrawText(DX_TIME1, DY_TIME, int2str(value, 3), FONT_TEXT_2); + else + DrawText(DX_TIME2, DY_TIME, int2str(value, 4), FONT_LEVEL_NUMBER); +} - /* 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 : - INITIAL_MOVE_DELAY_OFF); +inline void DrawGameValue_Level(int value) +{ + if (level_nr < 100) + DrawText(DX_LEVEL, DY_LEVEL, int2str(value, 2), FONT_TEXT_2); + else + { + /* misuse area for displaying emeralds to draw bigger level number */ + DrawTextExt(drawto, DX_EMERALDS, DY_EMERALDS, + int2str(value, 3), FONT_LEVEL_NUMBER, BLIT_OPAQUE); - /* dynamically adjust player properties according to level information */ - game.initial_move_delay_value = - (level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED); + /* now copy it to the area for displaying level number */ + BlitBitmap(drawto, drawto, + DX_EMERALDS, DY_EMERALDS + 1, + getFontWidth(FONT_LEVEL_NUMBER) * 3, + getFontHeight(FONT_LEVEL_NUMBER) - 1, + DX_LEVEL - 1, DY_LEVEL + 1); - /* initialize changing elements information */ - for (i=0; igems_still_needed); + + /* yes, this is all really ugly :-) */ } +} - /* add changing elements from pre-defined list */ - i = 0; - while (changing_element_list[i].base_element != EL_UNDEFINED) +void DrawGameDoorValues() +{ + int i; + + DrawGameValue_Level(level_nr); + + for (i = 0; i < MAX_PLAYERS; i++) + DrawGameValue_Keys(&stored_player[i]); + + DrawGameValue_Emeralds(local_player->gems_still_needed); + DrawGameValue_Dynamite(local_player->inventory_size); + DrawGameValue_Score(local_player->score); + DrawGameValue_Time(TimeLeft); +} + +static void resolve_group_element(int group_element, int recursion_depth) +{ + static int group_nr; + static struct ElementGroupInfo *group; + struct ElementGroupInfo *actual_group = element_info[group_element].group; + int i; + + if (recursion_depth > NUM_GROUP_ELEMENTS) /* recursion too deep */ { - struct ChangingElementInfo *ce = &changing_element_list[i]; - int element = ce->base_element; + Error(ERR_WARN, "recursion too deep when resolving group element %d", + group_element - EL_GROUP_START + 1); + + /* replace element which caused too deep recursion by question mark */ + group->element_resolved[group->num_elements_resolved++] = EL_UNKNOWN; - changing_element[element].base_element = ce->base_element; - changing_element[element].next_element = ce->next_element; - changing_element[element].change_delay = ce->change_delay; - changing_element[element].pre_change_function = ce->pre_change_function; - changing_element[element].change_function = ce->change_function; - changing_element[element].post_change_function = ce->post_change_function; + return; + } + + if (recursion_depth == 0) /* initialization */ + { + group = element_info[group_element].group; + group_nr = group_element - EL_GROUP_START; - i++; + group->num_elements_resolved = 0; + group->choice_pos = 0; } - /* add changing elements from custom element configuration */ - for (i=0; i < NUM_CUSTOM_ELEMENTS; i++) + for (i = 0; i < actual_group->num_elements; i++) { - int element = EL_CUSTOM_START + i; - struct ElementChangeInfo *change = &element_info[element].change; + int element = actual_group->element[i]; - /* only add custom elements that change after fixed/random frame delay */ - if (!CAN_CHANGE(element) || !HAS_CHANGE_EVENT(element, CE_DELAY)) - continue; + if (group->num_elements_resolved == NUM_FILE_ELEMENTS) + break; - changing_element[element].base_element = element; - changing_element[element].next_element = change->successor; - changing_element[element].change_delay = (change->delay_fixed * - change->delay_frames); + if (IS_GROUP_ELEMENT(element)) + resolve_group_element(element, recursion_depth + 1); + else + { + group->element_resolved[group->num_elements_resolved++] = element; + element_info[element].in_group[group_nr] = TRUE; + } + } + +#if 0 + if (recursion_depth == 0 && group_element <= EL_GROUP_4) + { + printf("::: group %d: %d resolved elements\n", + group_element - EL_GROUP_START, group->num_elements_resolved); + for (i = 0; i < group->num_elements_resolved; i++) + printf("::: - %d ['%s']\n", group->element_resolved[i], + element_info[group->element_resolved[i]].token_name); } +#endif +} + + +/* + ============================================================================= + InitGameEngine() + ----------------------------------------------------------------------------- + initialize game engine due to level / tape version number + ============================================================================= +*/ + +static void InitGameEngine() +{ + int i, j, k; + + /* set game engine from tape file when re-playing, else from level file */ + game.engine_version = (tape.playing ? tape.engine_version : + level.game_version); + + /* dynamically adjust element properties according to game engine version */ + InitElementPropertiesEngine(game.engine_version); + +#if 0 + printf("level %d: level version == %06d\n", level_nr, level.game_version); + printf(" tape version == %06d [%s] [file: %06d]\n", + tape.engine_version, (tape.playing ? "PLAYING" : "RECORDING"), + tape.file_version); + printf(" => game.engine_version == %06d\n", game.engine_version); +#endif + + /* ---------- recursively resolve group elements ------------------------- */ + + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + for (j = 0; j < NUM_GROUP_ELEMENTS; j++) + element_info[i].in_group[j] = FALSE; + + for (i = 0; i < NUM_GROUP_ELEMENTS; i++) + resolve_group_element(EL_GROUP_START + i, 0); + + /* ---------- initialize player's initial move delay --------------------- */ + +#if USE_NEW_MOVE_DELAY + /* dynamically adjust player properties according to level information */ + game.initial_move_delay_value = + (level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED); + + /* dynamically adjust player properties according to game engine version */ + game.initial_move_delay = (game.engine_version <= VERSION_IDENT(2,0,1,0) ? + game.initial_move_delay_value : 0); +#else + /* dynamically adjust player properties according to game engine version */ + game.initial_move_delay = + (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); +#endif + + /* ---------- 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 */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + { + struct ElementInfo *ei = &element_info[i]; + + /* this pointer might have been changed in the level editor */ + ei->change = &ei->change_page[0]; + + if (!IS_CUSTOM_ELEMENT(i)) + { + ei->change->target_element = EL_EMPTY_SPACE; + ei->change->delay_fixed = 0; + ei->change->delay_random = 0; + ei->change->delay_frames = 1; + } + + ei->change_events = CE_BITMASK_DEFAULT; + for (j = 0; j < NUM_CHANGE_EVENTS; j++) + { + ei->event_page_nr[j] = 0; + ei->event_page[j] = &ei->change_page[0]; + } + } + + /* add changing elements from pre-defined list */ + for (i = 0; change_delay_list[i].element != EL_UNDEFINED; i++) + { + struct ChangingElementInfo *ch_delay = &change_delay_list[i]; + struct ElementInfo *ei = &element_info[ch_delay->element]; + + ei->change->target_element = ch_delay->target_element; + ei->change->delay_fixed = ch_delay->change_delay; + + ei->change->pre_change_function = ch_delay->pre_change_function; + ei->change->change_function = ch_delay->change_function; + ei->change->post_change_function = ch_delay->post_change_function; + + ei->change_events |= CH_EVENT_BIT(CE_DELAY); + +#if 1 + SET_PROPERTY(ch_delay->element, EP_CAN_CHANGE, TRUE); +#endif + } + +#if 1 + /* add change events from custom element configuration */ + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + struct ElementInfo *ei = &element_info[EL_CUSTOM_START + i]; + + for (j = 0; j < ei->num_change_pages; j++) + { + if (!ei->change_page[j].can_change) + continue; + + for (k = 0; k < NUM_CHANGE_EVENTS; k++) + { + /* only add event page for the first page found with this event */ + if (ei->change_page[j].events & CH_EVENT_BIT(k) && + !(ei->change_events & CH_EVENT_BIT(k))) + { + ei->change_events |= CH_EVENT_BIT(k); + ei->event_page_nr[k] = j; + ei->event_page[k] = &ei->change_page[j]; + } + } + } + } + +#else + + /* add change events from custom element configuration */ + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; + + /* only add custom elements that change after fixed/random frame delay */ + if (CAN_CHANGE(element) && HAS_CHANGE_EVENT(element, CE_DELAY)) + element_info[element].change_events |= CH_EVENT_BIT(CE_DELAY); + } +#endif + + /* ---------- initialize run-time trigger player and element ------------- */ + + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + struct ElementInfo *ei = &element_info[EL_CUSTOM_START + i]; + + for (j = 0; j < ei->num_change_pages; j++) + { + ei->change_page[j].actual_trigger_element = EL_EMPTY; + ei->change_page[j].actual_trigger_player = EL_PLAYER_1; + } + } + + /* ---------- initialize trigger events ---------------------------------- */ + + /* initialize trigger events information */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + trigger_events[i] = EP_BITMASK_DEFAULT; + +#if 1 + /* add trigger events from element change event properties */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + { + struct ElementInfo *ei = &element_info[i]; + + for (j = 0; j < ei->num_change_pages; j++) + { + if (!ei->change_page[j].can_change) + continue; + + if (ei->change_page[j].events & CH_EVENT_BIT(CE_BY_OTHER_ACTION)) + { + int trigger_element = ei->change_page[j].trigger_element; + + if (IS_GROUP_ELEMENT(trigger_element)) + { + struct ElementGroupInfo *group = element_info[trigger_element].group; + + for (k = 0; k < group->num_elements_resolved; k++) + trigger_events[group->element_resolved[k]] + |= ei->change_page[j].events; + } + else + trigger_events[trigger_element] |= ei->change_page[j].events; + } + } + } +#else + /* add trigger events from element change event properties */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + if (HAS_CHANGE_EVENT(i, CE_BY_OTHER_ACTION)) + trigger_events[element_info[i].change->trigger_element] |= + element_info[i].change->events; +#endif + + /* ---------- initialize push delay -------------------------------------- */ + + /* initialize push delay values to default */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + { + if (!IS_CUSTOM_ELEMENT(i)) + { + element_info[i].push_delay_fixed = game.default_push_delay_fixed; + element_info[i].push_delay_random = game.default_push_delay_random; + } + } + + /* set push delay value for certain elements from pre-defined list */ + for (i = 0; push_delay_list[i].element != EL_UNDEFINED; i++) + { + int e = push_delay_list[i].element; + + element_info[e].push_delay_fixed = push_delay_list[i].push_delay_fixed; + element_info[e].push_delay_random = push_delay_list[i].push_delay_random; + } + + /* set push delay value for Supaplex elements for newer engine versions */ + if (game.engine_version >= VERSION_IDENT(3,1,0,0)) + { + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + { + if (IS_SP_ELEMENT(i)) + { +#if USE_NEW_MOVE_STYLE + element_info[i].push_delay_fixed = 7; /* just enough to escape ... */ + element_info[i].push_delay_random = 0; /* ... from falling zonk */ +#else + element_info[i].push_delay_fixed = 6; /* just enough to escape ... */ + element_info[i].push_delay_random = 0; /* ... from falling zonk */ +#endif + } + } + } + + /* ---------- initialize move stepsize ----------------------------------- */ + + /* initialize move stepsize values to default */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + if (!IS_CUSTOM_ELEMENT(i)) + element_info[i].move_stepsize = MOVE_STEPSIZE_NORMAL; + + /* set move stepsize value for certain elements from pre-defined list */ + for (i = 0; move_stepsize_list[i].element != EL_UNDEFINED; i++) + { + int e = move_stepsize_list[i].element; + + element_info[e].move_stepsize = move_stepsize_list[i].move_stepsize; + } + +#if 0 + /* ---------- initialize move dig/leave ---------------------------------- */ + + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + { + element_info[i].can_leave_element = FALSE; + element_info[i].can_leave_element_last = FALSE; + } +#endif + + /* ---------- initialize gem count --------------------------------------- */ + + /* initialize gem count values for each element */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + if (!IS_CUSTOM_ELEMENT(i)) + element_info[i].collect_count = 0; + + /* add gem count values for all elements from pre-defined list */ + for (i = 0; collect_count_list[i].element != EL_UNDEFINED; i++) + element_info[collect_count_list[i].element].collect_count = + collect_count_list[i].count; + + /* ---------- initialize access direction -------------------------------- */ + + /* initialize access direction values to default (access from every side) */ + for (i = 0; i < MAX_NUM_ELEMENTS; i++) + if (!IS_CUSTOM_ELEMENT(i)) + element_info[i].access_direction = MV_ALL_DIRECTIONS; + + /* set access direction value for certain elements from pre-defined list */ + for (i = 0; access_direction_list[i].element != EL_UNDEFINED; i++) + element_info[access_direction_list[i].element].access_direction = + access_direction_list[i].direction; } @@ -698,7 +1482,7 @@ void InitGame() boolean emulate_bd = TRUE; /* unless non-BOULDERDASH elements found */ boolean emulate_sb = TRUE; /* unless non-SOKOBAN elements found */ boolean emulate_sp = TRUE; /* unless non-SUPAPLEX elements found */ - int i, j, x, y; + int i, j, k, x, y; InitGameEngine(); @@ -715,11 +1499,12 @@ void InitGame() /* don't play tapes over network */ network_playing = (options.network && !tape.playing); - for (i=0; iindex_nr = i; + player->index_bit = (1 << i); player->element_nr = EL_PLAYER_1 + i; player->present = FALSE; @@ -735,10 +1520,9 @@ void InitGame() player->lights_still_needed = 0; player->friends_still_needed = 0; - for (j=0; j<4; j++) + for (j = 0; j < MAX_KEYS; j++) player->key[j] = FALSE; - player->dynamite = 0; player->dynabomb_count = 0; player->dynabomb_size = 1; player->dynabombs_left = 0; @@ -746,8 +1530,6 @@ void InitGame() 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; @@ -755,25 +1537,95 @@ void InitGame() player->StepFrame = 0; player->use_murphy_graphic = FALSE; - player->use_disk_red_graphic = FALSE; + + player->block_last_field = FALSE; /* initialized in InitPlayerField() */ + player->block_delay = 0; + player->block_delay_value = -1; /* initialized in InitPlayerField() */ + + player->can_fall_into_acid = CAN_MOVE_INTO_ACID(player->element_nr); player->actual_frame_counter = 0; + player->step_counter = 0; + player->last_move_dir = MV_NO_MOVING; - player->is_moving = FALSE; - player->is_moving = FALSE; player->is_waiting = FALSE; + player->is_moving = FALSE; + player->is_auto_moving = FALSE; player->is_digging = FALSE; + player->is_snapping = FALSE; player->is_collecting = FALSE; + player->is_pushing = FALSE; + player->is_switching = FALSE; + player->is_dropping = FALSE; + + player->is_bored = FALSE; + player->is_sleeping = FALSE; + + player->frame_counter_bored = -1; + player->frame_counter_sleeping = -1; + + player->anim_delay_counter = 0; + player->post_delay_counter = 0; + + player->action_waiting = ACTION_DEFAULT; + player->last_action_waiting = ACTION_DEFAULT; + player->special_action_bored = ACTION_DEFAULT; + player->special_action_sleeping = ACTION_DEFAULT; + + player->num_special_action_bored = 0; + player->num_special_action_sleeping = 0; + + /* determine number of special actions for bored and sleeping animation */ + for (j = ACTION_BORING_1; j <= ACTION_BORING_LAST; j++) + { + boolean found = FALSE; + + for (k = 0; k < NUM_DIRECTIONS; k++) + if (el_act_dir2img(player->element_nr, j, k) != + el_act_dir2img(player->element_nr, ACTION_DEFAULT, k)) + found = TRUE; + + if (found) + player->num_special_action_bored++; + else + break; + } + for (j = ACTION_SLEEPING_1; j <= ACTION_SLEEPING_LAST; j++) + { + boolean found = FALSE; + + for (k = 0; k < NUM_DIRECTIONS; k++) + if (el_act_dir2img(player->element_nr, j, k) != + el_act_dir2img(player->element_nr, ACTION_DEFAULT, k)) + found = TRUE; + + if (found) + player->num_special_action_sleeping++; + else + break; + } + + player->switch_x = -1; + player->switch_y = -1; + + player->show_envelope = 0; player->move_delay = game.initial_move_delay; player->move_delay_value = game.initial_move_delay_value; - player->push_delay = 0; - player->push_delay_value = 5; + player->move_delay_reset_counter = 0; + +#if USE_NEW_PUSH_DELAY + player->push_delay = -1; /* initialized when pushing starts */ + player->push_delay_value = game.initial_push_delay_value; +#else + player->push_delay = 0; + player->push_delay_value = game.initial_push_delay_value; +#endif - player->snapped = FALSE; + player->drop_delay = 0; player->last_jx = player->last_jy = 0; player->jx = player->jy = 0; @@ -781,7 +1633,10 @@ void InitGame() player->shield_normal_time_left = 0; player->shield_deadly_time_left = 0; - DigField(player, 0, 0, 0, 0, DF_NO_PUSH); + player->inventory_infinite_element = EL_UNDEFINED; + player->inventory_size = 0; + + DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH); SnapField(player, 0, 0); player->LevelSolved = FALSE; @@ -790,7 +1645,7 @@ void InitGame() network_player_action_received = FALSE; -#if defined(PLATFORM_UNIX) +#if defined(NETWORK_AVALIABLE) /* initial null action */ if (network_playing) SendToServer_MovePlayer(MV_NO_MOVING); @@ -802,6 +1657,7 @@ void InitGame() TimeFrames = 0; TimePlayed = 0; TimeLeft = level.time; + TapeTime = 0; ScreenMovDir = MV_NO_MOVING; ScreenMovPos = 0; @@ -818,40 +1674,57 @@ void InitGame() game.timegate_time_left = 0; game.switchgate_pos = 0; game.balloon_dir = MV_NO_MOVING; + game.gravity = level.initial_gravity; game.explosions_delayed = TRUE; - for (i=0; i<4; i++) + game.envelope_active = FALSE; + + for (i = 0; i < NUM_BELTS; i++) { game.belt_dir[i] = MV_NO_MOVING; game.belt_dir_nr[i] = 3; /* not moving, next moving left */ } - for (i=0; i= VERSION_IDENT(3,1,0,0)) || + game.emulation == EMU_SUPAPLEX ? 3 : 2); + int last_phase = (num_phase + 1) * delay; + int half_phase = (num_phase / 2) * delay; + + element_info[i].explosion_delay = last_phase - 1; + element_info[i].ignition_delay = half_phase; + +#if 0 + if (i == EL_BLACK_ORB) + element_info[i].ignition_delay = 0; +#else + if (i == EL_BLACK_ORB) + element_info[i].ignition_delay = 1; +#endif + } + +#if 0 + if (element_info[i].explosion_delay < 1) /* !!! check again !!! */ + element_info[i].explosion_delay = 1; + + if (element_info[i].ignition_delay < 1) /* !!! check again !!! */ + element_info[i].ignition_delay = 1; +#endif + } + /* correct non-moving belts to start moving left */ - for (i=0; i<4; i++) + for (i = 0; i < NUM_BELTS; i++) if (game.belt_dir[i] == MV_NO_MOVING) game.belt_dir_nr[i] = 3; /* not moving, next moving left */ /* check if any connected player was not found in playfield */ - for (i=0; iconnected && !player->present) { - for (j=0; jjx, jy = some_player->jy; @@ -892,7 +1798,13 @@ void InitGame() { player->present = TRUE; player->active = TRUE; + some_player->present = FALSE; + some_player->active = FALSE; + +#if 0 + player->element_nr = some_player->element_nr; +#endif StorePlayer[jx][jy] = player->element_nr; player->jx = player->last_jx = jx; @@ -906,9 +1818,9 @@ void InitGame() if (tape.playing) { - /* when playing a tape, eliminate all players who do not participate */ + /* when playing a tape, eliminate all players which do not participate */ - for (i=0; ijx, jy = player->jy; player->active = FALSE; + player->present = FALSE; + StorePlayer[jx][jy] = 0; Feld[jx][jy] = EL_EMPTY; } @@ -948,14 +1862,14 @@ void InitGame() /* when recording the game, store which players take part in the game */ if (tape.recording) { - for (i=0; ijx >= SBX_Left + MIDPOSX) - scroll_x = (local_player->jx <= SBX_Right + MIDPOSX ? - local_player->jx - MIDPOSX : - SBX_Right); - if (local_player->jy >= SBY_Upper + MIDPOSY) - scroll_y = (local_player->jy <= SBY_Lower + MIDPOSY ? - local_player->jy - MIDPOSY : - SBY_Lower); + /* if local player not found, look for custom element that might create + the player (make some assumptions about the right custom element) */ + if (!local_player->present) + { + int start_x = 0, start_y = 0; + int found_rating = 0; + int found_element = EL_UNDEFINED; + + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { + int element = Feld[x][y]; + int content; + int xx, yy; + boolean is_player; + + if (!IS_CUSTOM_ELEMENT(element)) + continue; + + if (CAN_CHANGE(element)) + { + for (i = 0; i < element_info[element].num_change_pages; i++) + { + content = element_info[element].change_page[i].target_element; + is_player = ELEM_IS_PLAYER(content); + + if (is_player && (found_rating < 3 || element < found_element)) + { + start_x = x; + start_y = y; + + found_rating = 3; + found_element = element; + } + } + } + + for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3; xx++) + { + content = element_info[element].content[xx][yy]; + is_player = ELEM_IS_PLAYER(content); + + if (is_player && (found_rating < 2 || element < found_element)) + { + start_x = x + xx - 1; + start_y = y + yy - 1; + + found_rating = 2; + found_element = element; + } + + if (!CAN_CHANGE(element)) + continue; + + for (i = 0; i < element_info[element].num_change_pages; i++) + { + content= element_info[element].change_page[i].target_content[xx][yy]; + is_player = ELEM_IS_PLAYER(content); + + if (is_player && (found_rating < 1 || element < found_element)) + { + start_x = x + xx - 1; + start_y = y + yy - 1; + + found_rating = 1; + found_element = element; + } + } + } + } + + scroll_x = (start_x < SBX_Left + MIDPOSX ? SBX_Left : + start_x > SBX_Right + MIDPOSX ? SBX_Right : + start_x - MIDPOSX); + + scroll_y = (start_y < SBY_Upper + MIDPOSY ? SBY_Upper : + start_y > SBY_Lower + MIDPOSY ? SBY_Lower : + start_y - MIDPOSY); + } + else + { +#if 1 + scroll_x = (local_player->jx < SBX_Left + MIDPOSX ? SBX_Left : + local_player->jx > SBX_Right + MIDPOSX ? SBX_Right : + local_player->jx - MIDPOSX); + + scroll_y = (local_player->jy < SBY_Upper + MIDPOSY ? SBY_Upper : + local_player->jy > SBY_Lower + MIDPOSY ? SBY_Lower : + local_player->jy - MIDPOSY); +#else + scroll_x = SBX_Left; + scroll_y = SBY_Upper; + if (local_player->jx >= SBX_Left + MIDPOSX) + scroll_x = (local_player->jx <= SBX_Right + MIDPOSX ? + local_player->jx - MIDPOSX : + SBX_Right); + if (local_player->jy >= SBY_Upper + MIDPOSY) + scroll_y = (local_player->jy <= SBY_Lower + MIDPOSY ? + local_player->jy - MIDPOSY : + SBY_Lower); +#endif + } CloseDoor(DOOR_CLOSE_1); @@ -1020,19 +2025,6 @@ void InitGame() BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); - if (level_nr < 100) - DrawText(DX + XX_LEVEL, DY + YY_LEVEL, int2str(level_nr, 2), FONT_TEXT_2); - else - { - DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS, - int2str(level_nr, 3), FONT_LEVEL_NUMBER, BLIT_OPAQUE); - BlitBitmap(drawto, drawto, - DX + XX_EMERALDS, DY + YY_EMERALDS + 1, - getFontWidth(FONT_LEVEL_NUMBER) * 3, - getFontHeight(FONT_LEVEL_NUMBER) - 1, - DX + XX_LEVEL - 1, DY + YY_LEVEL + 1); - } - DrawGameDoorValues(); UnmapGameButtons(); @@ -1050,17 +2042,22 @@ void InitGame() OpenDoor(DOOR_OPEN_ALL); PlaySoundStereo(SND_GAME_STARTING, SOUND_MIDDLE); + if (setup.sound_music) - PlayMusic(level_nr); + PlayLevelMusic(); KeyboardAutoRepeatOffUnlessAutoplay(); if (options.debug) { - for (i=0; i<4; i++) + for (i = 0; i < MAX_PLAYERS; i++) 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) @@ -1141,27 +2138,52 @@ void InitMovDir(int x, int y) default: if (IS_CUSTOM_ELEMENT(element)) { - if (element_info[element].move_direction_initial != MV_NO_MOVING) - MovDir[x][y] = element_info[element].move_direction_initial; - else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS) + struct ElementInfo *ei = &element_info[element]; + int move_direction_initial = ei->move_direction_initial; + int move_pattern = ei->move_pattern; + + if (move_direction_initial == MV_START_PREVIOUS) + { + if (MovDir[x][y] != MV_NO_MOVING) + return; + + move_direction_initial = MV_START_AUTOMATIC; + } + + if (move_direction_initial == MV_START_RANDOM) + MovDir[x][y] = 1 << RND(4); + else if (move_direction_initial & MV_ANY_DIRECTION) + MovDir[x][y] = move_direction_initial; + else if (move_pattern == MV_ALL_DIRECTIONS || + move_pattern == MV_TURNING_LEFT || + move_pattern == MV_TURNING_RIGHT || + move_pattern == MV_TURNING_LEFT_RIGHT || + move_pattern == MV_TURNING_RIGHT_LEFT || + move_pattern == MV_TURNING_RANDOM) MovDir[x][y] = 1 << RND(4); - else if (element_info[element].move_pattern == MV_HORIZONTAL) + else if (move_pattern == MV_HORIZONTAL) MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT); - else if (element_info[element].move_pattern == MV_VERTICAL) + else if (move_pattern == MV_VERTICAL) MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN); - else if (element_info[element].move_pattern & MV_ANY_DIRECTION) + else if (move_pattern & MV_ANY_DIRECTION) MovDir[x][y] = element_info[element].move_pattern; - else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE || - element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE) + else if (move_pattern == MV_ALONG_LEFT_SIDE || + move_pattern == MV_ALONG_RIGHT_SIDE) { - for (i=0; i<4; i++) +#if 1 + /* use random direction as default start direction */ + if (game.engine_version >= VERSION_IDENT(3,1,0,0)) + MovDir[x][y] = 1 << RND(4); +#endif + + for (i = 0; i < NUM_DIRECTIONS; i++) { int x1 = x + xy[i][0]; int y1 = y + xy[i][1]; if (!IN_LEV_FIELD(x1, y1) || !IS_FREE(x1, y1)) { - if (element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE) + if (move_pattern == MV_ALONG_RIGHT_SIDE) MovDir[x][y] = direction[0][i]; else MovDir[x][y] = direction[1][i]; @@ -1181,7 +2203,7 @@ void InitMovDir(int x, int y) element != EL_BD_FIREFLY) break; - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { int x1 = x + xy[i][0]; int y1 = y + xy[i][1]; @@ -1204,6 +2226,8 @@ void InitMovDir(int x, int y) } break; } + + GfxDir[x][y] = MovDir[x][y]; } void InitAmoebaNr(int x, int y) @@ -1213,7 +2237,7 @@ void InitAmoebaNr(int x, int y) if (group_nr == 0) { - for (i=1; iMovPos) return; +#if 1 + if (tape.auto_play) /* tape might already be stopped here */ + tape.auto_play_level_solved = TRUE; +#else if (tape.playing && tape.auto_play) tape.auto_play_level_solved = TRUE; +#endif local_player->LevelSolved = FALSE; @@ -1259,7 +2288,9 @@ void GameWon() TimeLeft -= 10; else TimeLeft--; - DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2); + + DrawGameValue_Time(TimeLeft); + BackToFront(); if (!tape.playing) @@ -1285,7 +2316,9 @@ void GameWon() TimePlayed += 10; else TimePlayed++; - DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FONT_TEXT_2); + + DrawGameValue_Time(TimePlayed); + BackToFront(); if (!tape.playing) @@ -1296,6 +2329,18 @@ void GameWon() StopSound(SND_GAME_LEVELTIME_BONUS); } + /* close exit door after last player */ + if ((Feld[ExitX][ExitY] == EL_EXIT_OPEN || + Feld[ExitX][ExitY] == EL_SP_EXIT_OPEN) && AllPlayersGone) + { + int element = Feld[ExitX][ExitY]; + + Feld[ExitX][ExitY] = (element == EL_EXIT_OPEN ? EL_EXIT_CLOSING : + EL_SP_EXIT_CLOSING); + + PlayLevelSoundElementAction(ExitX, ExitY, element, ACTION_CLOSING); + } + /* Hero disappears */ DrawLevelField(ExitX, ExitY); BackToFront(); @@ -1357,7 +2402,7 @@ int NewHiScore() local_player->score < highscore[MAX_SCORE_ENTRIES - 1].Score) return -1; - for (k=0; kscore > highscore[k].Score) { @@ -1368,14 +2413,14 @@ int NewHiScore() int m = MAX_SCORE_ENTRIES - 1; #ifdef ONE_PER_NAME - for (l=k; lk; l--) + for (l = m; l > k; l--) { strcpy(highscore[l].Name, highscore[l - 1].Name); highscore[l].Score = highscore[l - 1].Score; @@ -1431,18 +2476,22 @@ static void ResetGfxAnimation(int x, int y) { GfxFrame[x][y] = 0; GfxAction[x][y] = ACTION_DEFAULT; + GfxDir[x][y] = MovDir[x][y]; } void InitMovingField(int x, int y, int direction) { int element = Feld[x][y]; - int newx = x + (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); - int newy = y + (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); + int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); + 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; @@ -1453,8 +2502,9 @@ void InitMovingField(int x, int y, int direction) 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) @@ -1526,47 +2576,78 @@ static int MovingOrBlocked2ElementIfNotLeaving(int x, int y) static void RemoveField(int x, int y) { Feld[x][y] = EL_EMPTY; - GfxElement[x][y] = EL_UNDEFINED; + MovPos[x][y] = 0; MovDir[x][y] = 0; MovDelay[x][y] = 0; + + AmoebaNr[x][y] = 0; + ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; + Pushed[x][y] = FALSE; + +#if 0 + ExplodeField[x][y] = EX_TYPE_NONE; +#endif + + GfxElement[x][y] = EL_UNDEFINED; + GfxAction[x][y] = ACTION_DEFAULT; + GfxDir[x][y] = MV_NO_MOVING; } void RemoveMovingField(int x, int y) { int oldx = x, oldy = y, newx = x, newy = y; + int element = Feld[x][y]; + int next_element = EL_UNDEFINED; - if (Feld[x][y] != EL_BLOCKED && !IS_MOVING(x, y)) + if (element != EL_BLOCKED && !IS_MOVING(x, y)) return; if (IS_MOVING(x, y)) { Moving2Blocked(x, y, &newx, &newy); +#if 0 if (Feld[newx][newy] != EL_BLOCKED) return; +#else + if (Feld[newx][newy] != EL_BLOCKED) + { + /* element is moving, but target field is not free (blocked), but + already occupied by something different (example: acid pool); + in this case, only remove the moving field, but not the target */ + + RemoveField(oldx, oldy); + + Store[oldx][oldy] = Store2[oldx][oldy] = 0; + + DrawLevelField(oldx, oldy); + + return; + } +#endif } - else if (Feld[x][y] == EL_BLOCKED) + else if (element == EL_BLOCKED) { Blocked2Moving(x, y, &oldx, &oldy); if (!IS_MOVING(oldx, oldy)) return; } - if (Feld[x][y] == EL_BLOCKED && + if (element == EL_BLOCKED && (Feld[oldx][oldy] == EL_QUICKSAND_EMPTYING || Feld[oldx][oldy] == EL_MAGIC_WALL_EMPTYING || Feld[oldx][oldy] == EL_BD_MAGIC_WALL_EMPTYING || Feld[oldx][oldy] == EL_AMOEBA_DROPPING)) - Feld[oldx][oldy] = get_next_element(Feld[oldx][oldy]); - else - Feld[oldx][oldy] = EL_EMPTY; + next_element = get_next_element(Feld[oldx][oldy]); + + RemoveField(oldx, oldy); + RemoveField(newx, newy); Store[oldx][oldy] = Store2[oldx][oldy] = 0; - Feld[newx][newy] = EL_EMPTY; - MovPos[oldx][oldy] = MovDir[oldx][oldy] = MovDelay[oldx][oldy] = 0; - MovPos[newx][newy] = MovDir[newx][newy] = MovDelay[newx][newy] = 0; - GfxAction[oldx][oldy] = GfxAction[newx][newy] = ACTION_DEFAULT; + if (next_element != EL_UNDEFINED) + Feld[oldx][oldy] = next_element; DrawLevelField(oldx, oldy); DrawLevelField(newx, newy); @@ -1615,14 +2696,14 @@ void CheckDynamite(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) @@ -1634,14 +2715,331 @@ void CheckDynamite(int x, int y) Bang(x, y); } +void DrawRelocatePlayer(struct PlayerInfo *player) +{ + boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); + int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + int wait_delay_value = (no_delay ? 0 : frame_delay_value); + int jx = player->jx; + int jy = player->jy; + + if (level.instant_relocation) + { +#if 1 + int offset = (setup.scroll_delay ? 3 : 0); + + if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) + { + scroll_x = (local_player->jx < SBX_Left + MIDPOSX ? SBX_Left : + local_player->jx > SBX_Right + MIDPOSX ? SBX_Right : + local_player->jx - MIDPOSX); + + scroll_y = (local_player->jy < SBY_Upper + MIDPOSY ? SBY_Upper : + local_player->jy > SBY_Lower + MIDPOSY ? SBY_Lower : + local_player->jy - MIDPOSY); + } + else + { + if ((player->MovDir == MV_LEFT && scroll_x > jx - MIDPOSX + offset) || + (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset)) + scroll_x = jx - MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset); + + if ((player->MovDir == MV_UP && scroll_y > jy - MIDPOSY + offset) || + (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset)) + scroll_y = jy - MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset); + + /* don't scroll over playfield boundaries */ + if (scroll_x < SBX_Left || scroll_x > SBX_Right) + scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right); + + /* don't scroll over playfield boundaries */ + if (scroll_y < SBY_Upper || scroll_y > SBY_Lower) + scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower); + } +#else + scroll_x += (local_player->jx - old_jx); + scroll_y += (local_player->jy - old_jy); + + /* don't scroll over playfield boundaries */ + if (scroll_x < SBX_Left || scroll_x > SBX_Right) + scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right); + + /* don't scroll over playfield boundaries */ + if (scroll_y < SBY_Upper || scroll_y > SBY_Lower) + scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower); +#endif + + RedrawPlayfield(TRUE, 0,0,0,0); + } + else + { +#if 1 +#if 0 + int offset = (setup.scroll_delay ? 3 : 0); +#endif + int scroll_xx = -999, scroll_yy = -999; + + ScrollScreen(NULL, SCROLL_GO_ON); /* scroll last frame to full tile */ + + while (scroll_xx != scroll_x || scroll_yy != scroll_y) + { + int dx = 0, dy = 0; + int fx = FX, fy = FY; + + scroll_xx = (local_player->jx < SBX_Left + MIDPOSX ? SBX_Left : + local_player->jx > SBX_Right + MIDPOSX ? SBX_Right : + local_player->jx - MIDPOSX); + + scroll_yy = (local_player->jy < SBY_Upper + MIDPOSY ? SBY_Upper : + local_player->jy > SBY_Lower + MIDPOSY ? SBY_Lower : + local_player->jy - MIDPOSY); + + dx = (scroll_xx < scroll_x ? +1 : scroll_xx > scroll_x ? -1 : 0); + dy = (scroll_yy < scroll_y ? +1 : scroll_yy > scroll_y ? -1 : 0); + +#if 1 + if (dx == 0 && dy == 0) /* no scrolling needed at all */ + break; +#else + if (scroll_xx == scroll_x && scroll_yy == scroll_y) + break; +#endif + + scroll_x -= dx; + scroll_y -= dy; + + fx += dx * TILEX / 2; + fy += dy * TILEY / 2; + + ScrollLevel(dx, dy); + DrawAllPlayers(); + + /* scroll in two steps of half tile size to make things smoother */ + BlitBitmap(drawto_field, window, fx, fy, SXSIZE, SYSIZE, SX, SY); + FlushDisplay(); + Delay(wait_delay_value); + + /* scroll second step to align at full tile size */ + BackToFront(); + Delay(wait_delay_value); + } +#else + int scroll_xx = -999, scroll_yy = -999; + + ScrollScreen(NULL, SCROLL_GO_ON); /* scroll last frame to full tile */ + + while (scroll_xx != scroll_x || scroll_yy != scroll_y) + { + int dx = 0, dy = 0; + int fx = FX, fy = FY; + + scroll_xx = (local_player->jx < SBX_Left + MIDPOSX ? SBX_Left : + local_player->jx > SBX_Right + MIDPOSX ? SBX_Right : + local_player->jx - MIDPOSX); + + scroll_yy = (local_player->jy < SBY_Upper + MIDPOSY ? SBY_Upper : + local_player->jy > SBY_Lower + MIDPOSY ? SBY_Lower : + local_player->jy - MIDPOSY); + + dx = (scroll_xx < scroll_x ? +1 : scroll_xx > scroll_x ? -1 : 0); + dy = (scroll_yy < scroll_y ? +1 : scroll_yy > scroll_y ? -1 : 0); + +#if 1 + if (dx == 0 && dy == 0) /* no scrolling needed at all */ + break; +#else + if (scroll_xx == scroll_x && scroll_yy == scroll_y) + break; +#endif + + scroll_x -= dx; + scroll_y -= dy; + + fx += dx * TILEX / 2; + fy += dy * TILEY / 2; + + ScrollLevel(dx, dy); + DrawAllPlayers(); + + /* scroll in two steps of half tile size to make things smoother */ + BlitBitmap(drawto_field, window, fx, fy, SXSIZE, SYSIZE, SX, SY); + FlushDisplay(); + Delay(wait_delay_value); + + /* scroll second step to align at full tile size */ + BackToFront(); + Delay(wait_delay_value); + } +#endif + + DrawPlayer(player); + BackToFront(); + Delay(wait_delay_value); + } +} + +void RelocatePlayer(int jx, int jy, int el_player_raw) +{ +#if 1 + int el_player = GET_VALID_PLAYER_ELEMENT(el_player_raw); +#else + int el_player = (el_player_raw == EL_SP_MURPHY ? EL_PLAYER_1 :el_player_raw); +#endif + struct PlayerInfo *player = &stored_player[el_player - EL_PLAYER_1]; + boolean ffwd_delay = (tape.playing && tape.fast_forward); + boolean no_delay = (tape.warp_forward); + int frame_delay_value = (ffwd_delay ? FfwdFrameDelay : GameFrameDelay); + int wait_delay_value = (no_delay ? 0 : frame_delay_value); + int old_jx = player->jx; + int old_jy = player->jy; + int old_element = Feld[old_jx][old_jy]; + int element = Feld[jx][jy]; + boolean player_relocated = (old_jx != jx || old_jy != jy); + + int move_dir_horiz = (jx < old_jx ? MV_LEFT : jx > old_jx ? MV_RIGHT : 0); + int move_dir_vert = (jy < old_jy ? MV_UP : jy > old_jy ? MV_DOWN : 0); +#if 1 + int enter_side_horiz = MV_DIR_OPPOSITE(move_dir_horiz); + int enter_side_vert = MV_DIR_OPPOSITE(move_dir_vert); + int leave_side_horiz = move_dir_horiz; + int leave_side_vert = move_dir_vert; +#else + static int trigger_sides[4][2] = + { + /* enter side leave side */ + { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* moving left */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* moving right */ + { CH_SIDE_BOTTOM, CH_SIDE_TOP }, /* moving up */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM } /* moving down */ + }; + int enter_side_horiz = trigger_sides[MV_DIR_BIT(move_dir_horiz)][0]; + int enter_side_vert = trigger_sides[MV_DIR_BIT(move_dir_vert)][0]; + int leave_side_horiz = trigger_sides[MV_DIR_BIT(move_dir_horiz)][1]; + int leave_side_vert = trigger_sides[MV_DIR_BIT(move_dir_vert)][1]; +#endif + int enter_side = enter_side_horiz | enter_side_vert; + int leave_side = leave_side_horiz | leave_side_vert; + + if (player->GameOver) /* do not reanimate dead player */ + return; + + if (!player_relocated) /* no need to relocate the player */ + return; + + if (IS_PLAYER(jx, jy)) /* player already placed at new position */ + { + RemoveField(jx, jy); /* temporarily remove newly placed player */ + DrawLevelField(jx, jy); + } + + if (player->present) + { + while (player->MovPos) + { + ScrollPlayer(player, SCROLL_GO_ON); + ScrollScreen(NULL, SCROLL_GO_ON); + +#if USE_NEW_MOVE_DELAY + AdvanceFrameAndPlayerCounters(player->index_nr); +#else + FrameCounter++; +#endif + + DrawPlayer(player); + + BackToFront(); + Delay(wait_delay_value); + } + + DrawPlayer(player); /* needed here only to cleanup last field */ + DrawLevelField(player->jx, player->jy); /* remove player graphic */ + + player->is_moving = FALSE; + } + +#if 1 + if (IS_CUSTOM_ELEMENT(old_element)) + CheckElementChangeByPlayer(old_jx, old_jy, old_element, + CE_LEFT_BY_PLAYER, + player->index_bit, leave_side); + + CheckTriggeredElementChangeByPlayer(old_jx, old_jy, old_element, + CE_OTHER_GETS_LEFT, + player->index_bit, leave_side); +#endif + + Feld[jx][jy] = el_player; + InitPlayerField(jx, jy, el_player, TRUE); + + if (!ELEM_IS_PLAYER(element)) /* player may be set on walkable element */ + { + Feld[jx][jy] = element; + InitField(jx, jy, FALSE); + } + +#if 1 + if (player == local_player) /* only visually relocate local player */ + DrawRelocatePlayer(player); +#endif + +#if 1 + TestIfHeroTouchesBadThing(jx, jy); + TestIfPlayerTouchesCustomElement(jx, jy); +#endif + +#if 0 + printf("::: %d,%d: %d\n", jx, jy-1, Changed[jx][jy-1]); +#endif + +#if 0 +#if 0 + /* needed to allow change of walkable custom element by entering player */ + if (!(Changed[jx][jy] & CH_EVENT_BIT(CE_ENTERED_BY_PLAYER))) + Changed[jx][jy] = 0; /* allow another change (but prevent loop) */ +#else + /* needed to allow change of walkable custom element by entering player */ + Changed[jx][jy] = 0; /* allow another change */ +#endif +#endif + +#if 0 + printf("::: player entering %d, %d from %s ...\n", jx, jy, + enter_side == MV_LEFT ? "left" : + enter_side == MV_RIGHT ? "right" : + enter_side == MV_UP ? "top" : + enter_side == MV_DOWN ? "bottom" : "oops! no idea!"); +#endif + +#if 1 + if (IS_CUSTOM_ELEMENT(element)) + CheckElementChangeByPlayer(jx, jy, element, CE_ENTERED_BY_PLAYER, + player->index_bit, enter_side); + + CheckTriggeredElementChangeByPlayer(jx, jy, element, + CE_OTHER_GETS_ENTERED, + player->index_bit, enter_side); +#endif +} + void Explode(int ex, int ey, int phase, int mode) { int x, y; +#if 0 int num_phase = 9; +#endif + + /* !!! eliminate this variable !!! */ int delay = (game.emulation == EMU_SUPAPLEX ? 3 : 2); + +#if 1 + int last_phase; +#else int last_phase = num_phase * delay; int half_phase = (num_phase / 2) * delay; int first_phase_after_start = EX_PHASE_START + 1; +#endif + int border_element; if (game.explosions_delayed) { @@ -1653,8 +3051,24 @@ void Explode(int ex, int ey, int phase, int mode) { int center_element = Feld[ex][ey]; +#if 0 + printf("::: start explosion %d,%d [%d]\n", ex, ey, FrameCounter); +#endif + +#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 >= VERSION_IDENT(2,2,0,7) && + center_element == EL_EMPTY && + (mode == EX_TYPE_NORMAL || mode == EX_TYPE_CENTER)) + return; +#endif + + if (mode == EX_TYPE_NORMAL || mode == EX_TYPE_CENTER) + PlayLevelSoundAction(ex, ey, ACTION_EXPLODING); + /* remove things displayed in background while burning dynamite */ - if (!IS_INDESTRUCTIBLE(Back[ex][ey])) + if (Back[ex][ey] != EL_EMPTY && !IS_INDESTRUCTIBLE(Back[ex][ey])) Back[ex][ey] = 0; if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey)) @@ -1665,75 +3079,174 @@ void Explode(int ex, int ey, int phase, int mode) Feld[ex][ey] = center_element; } - for (y = ey - 1; y <= ey + 1; y++) for(x = ex - 1; x <= ex + 1; x++) +#if 1 + +#if 1 + last_phase = element_info[center_element].explosion_delay + 1; +#else + last_phase = element_info[center_element].explosion_delay; +#endif + +#if 0 + printf("::: %d -> %d\n", center_element, last_phase); +#endif +#endif + + for (y = ey - 1; y <= ey + 1; y++) for (x = ex - 1; x <= ex + 1; x++) { + int xx = x - ex + 1; + int yy = y - ey + 1; int element; +#if 1 +#if 1 + if (!IN_LEV_FIELD(x, y) || + (mode & EX_TYPE_SINGLE_TILE && (x != ex || y != ey)) || + (mode == EX_TYPE_CROSS && (x != ex && y != ey))) + continue; +#else + if (!IN_LEV_FIELD(x, y) || + (mode != EX_TYPE_NORMAL && (x != ex || y != ey))) + continue; +#endif +#else if (!IN_LEV_FIELD(x, y) || - ((mode != EX_NORMAL || center_element == EL_AMOEBA_TO_DIAMOND) && + ((mode != EX_TYPE_NORMAL || + center_element == EL_AMOEBA_TO_DIAMOND) && (x != ex || y != ey))) continue; +#endif element = Feld[x][y]; if (IS_MOVING(x, y) || IS_BLOCKED(x, y)) { element = MovingOrBlocked2Element(x, y); - RemoveMovingField(x, y); + + if (!IS_EXPLOSION_PROOF(element)) + RemoveMovingField(x, y); } #if 1 + +#if 0 if (IS_EXPLOSION_PROOF(element)) continue; +#else + /* indestructible elements can only explode in center (but not flames) */ +#if 1 + if ((IS_EXPLOSION_PROOF(element) && (x != ex || y != ey || + mode == EX_TYPE_BORDER)) || + element == EL_FLAMES) + continue; +#else + if ((IS_EXPLOSION_PROOF(element) && (x != ex || y != ey)) || + element == EL_FLAMES) + continue; +#endif +#endif + #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; #endif +#if 1 + if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y)) && + (game.engine_version < VERSION_IDENT(3,1,0,0) || + (x == ex && y == ey && mode != EX_TYPE_BORDER))) +#else if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y))) +#endif { if (IS_ACTIVE_BOMB(element)) { /* re-activate things under the bomb like gate or penguin */ +#if 1 + Feld[x][y] = (Back[x][y] ? Back[x][y] : EL_EMPTY); + Back[x][y] = 0; +#else Feld[x][y] = (Store[x][y] ? Store[x][y] : EL_EMPTY); Store[x][y] = 0; - } +#endif - continue; +#if 0 + printf("::: %d,%d: %d %s [%d, %d]\n", x, y, Feld[x][y], + element_info[Feld[x][y]].token_name, + Store[x][y], Store2[x][y]); +#endif + } + + continue; } /* save walkable background elements while explosion on same tile */ +#if 0 if (IS_INDESTRUCTIBLE(element)) Back[x][y] = element; +#else +#if 1 +#if 1 + if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element) && + (x != ex || y != ey || mode == EX_TYPE_BORDER)) + Back[x][y] = element; +#else + if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element) && + (x != ex || y != ey)) + Back[x][y] = element; +#endif +#else + if (IS_WALKABLE(element) && IS_INDESTRUCTIBLE(element)) + Back[x][y] = element; +#endif +#endif /* ignite explodable elements reached by other explosion */ if (element == EL_EXPLOSION) element = Store2[x][y]; - if (IS_PLAYER(ex, ey) && !PLAYER_PROTECTED(ex, ey)) +#if 1 + if (AmoebaNr[x][y] && + (element == EL_AMOEBA_FULL || + element == EL_BD_AMOEBA || + element == EL_AMOEBA_GROWING)) + { + AmoebaCnt[AmoebaNr[x][y]]--; + AmoebaCnt2[AmoebaNr[x][y]]--; + } + + RemoveField(x, y); +#endif + + if (IS_PLAYER(ex, ey) && !PLAYER_EXPLOSION_PROTECTED(ex, ey)) { switch(StorePlayer[ex][ey]) { case EL_PLAYER_2: - Store[x][y] = EL_EMERALD_RED; + Store[x][y] = EL_PLAYER_IS_EXPLODING_2; break; case EL_PLAYER_3: - Store[x][y] = EL_EMERALD; + Store[x][y] = EL_PLAYER_IS_EXPLODING_3; break; case EL_PLAYER_4: - Store[x][y] = EL_EMERALD_PURPLE; + Store[x][y] = EL_PLAYER_IS_EXPLODING_4; break; case EL_PLAYER_1: default: - Store[x][y] = EL_EMERALD_YELLOW; + Store[x][y] = EL_PLAYER_IS_EXPLODING_1; break; } +#if 1 + if (PLAYERINFO(ex, ey)->use_murphy_graphic) + Store[x][y] = EL_EMPTY; +#else if (game.emulation == EMU_SUPAPLEX) Store[x][y] = EL_EMPTY; +#endif } else if (center_element == EL_MOLE) Store[x][y] = EL_EMERALD_RED; @@ -1748,11 +3261,10 @@ void Explode(int ex, int ey, int phase, int mode) else if (center_element == EL_AMOEBA_TO_DIAMOND) Store[x][y] = level.amoeba_content; else if (center_element == EL_YAMYAM) - Store[x][y] = - level.yamyam_content[game.yamyam_content_nr][x - ex + 1][y - ey + 1]; - else if (IS_CUSTOM_ELEMENT(center_element)) - Store[x][y] = - element_info[center_element].content[x - ex + 1][y - ey + 1]; + Store[x][y] = level.yamyam_content[game.yamyam_content_nr][xx][yy]; + else if (IS_CUSTOM_ELEMENT(center_element) && + element_info[center_element].content[xx][yy] != EL_EMPTY) + Store[x][y] = element_info[center_element].content[xx][yy]; else if (element == EL_WALL_EMERALD) Store[x][y] = EL_EMERALD; else if (element == EL_WALL_DIAMOND) @@ -1769,13 +3281,21 @@ void Explode(int ex, int ey, int phase, int mode) Store[x][y] = EL_PEARL; else if (element == EL_WALL_CRYSTAL) Store[x][y] = EL_CRYSTAL; + else if (IS_CUSTOM_ELEMENT(element) && !CAN_EXPLODE(element)) + Store[x][y] = element_info[element].content[1][1]; else Store[x][y] = EL_EMPTY; - if (x != ex || y != ey || - center_element == EL_AMOEBA_TO_DIAMOND || mode == EX_BORDER) + if (x != ex || y != ey || mode == EX_TYPE_BORDER || + center_element == EL_AMOEBA_TO_DIAMOND) Store2[x][y] = element; +#if 0 + printf("::: %d,%d: %d %s\n", x, y, Store2[x][y], + element_info[Store2[x][y]].token_name); +#endif + +#if 0 if (AmoebaNr[x][y] && (element == EL_AMOEBA_FULL || element == EL_BD_AMOEBA || @@ -1785,11 +3305,35 @@ void Explode(int ex, int ey, int phase, int mode) AmoebaCnt2[AmoebaNr[x][y]]--; } - Feld[x][y] = EL_EXPLOSION; - GfxElement[x][y] = EL_UNDEFINED; +#if 1 + RemoveField(x, y); +#else MovDir[x][y] = MovPos[x][y] = 0; + GfxDir[x][y] = MovDir[x][y]; AmoebaNr[x][y] = 0; +#endif +#endif + + Feld[x][y] = EL_EXPLOSION; +#if 1 + GfxElement[x][y] = center_element; +#else + GfxElement[x][y] = EL_UNDEFINED; +#endif + ExplodePhase[x][y] = 1; +#if 1 + ExplodeDelay[x][y] = last_phase; +#endif + +#if 0 +#if 1 + GfxFrame[x][y] = 0; /* animation does not start until next frame */ +#else + GfxFrame[x][y] = -1; /* animation does not start until next frame */ +#endif +#endif + Stop[x][y] = TRUE; } @@ -1797,6 +3341,11 @@ void Explode(int ex, int ey, int phase, int mode) game.yamyam_content_nr = (game.yamyam_content_nr + 1) % level.num_yamyam_contents; +#if 0 + printf("::: %d,%d: %d %s [%d]\n", ex + 1, ey, Feld[ex + 1][ey], + element_info[Feld[ex + 1][ey]].token_name, Store2[ex + 1][ey]); +#endif + return; } @@ -1806,8 +3355,126 @@ void Explode(int ex, int ey, int phase, int mode) x = ex; y = ey; +#if 1 + if (phase == 1) + GfxFrame[x][y] = 0; /* restart explosion animation */ +#endif + +#if 0 + printf(":X: phase == %d [%d]\n", phase, GfxFrame[x][y]); +#endif + +#if 1 + last_phase = ExplodeDelay[x][y]; +#endif + ExplodePhase[x][y] = (phase < last_phase ? phase + 1 : 0); +#ifdef DEBUG + + /* activate this even in non-DEBUG version until cause for crash in + getGraphicAnimationFrame() (see below) is found and eliminated */ +#endif +#if 1 + + if (GfxElement[x][y] == EL_UNDEFINED) + { + printf("\n\n"); + printf("Explode(): x = %d, y = %d: GfxElement == EL_UNDEFINED\n", x, y); + printf("Explode(): This should never happen!\n"); + printf("\n\n"); + + GfxElement[x][y] = EL_EMPTY; + } +#endif + +#if 1 + + border_element = Store2[x][y]; +#if 1 + if (IS_PLAYER(x, y) && !PLAYER_EXPLOSION_PROTECTED(x, y)) + border_element = StorePlayer[x][y]; +#else + if (IS_PLAYER(x, y)) + border_element = StorePlayer[x][y]; +#endif + +#if 0 + printf("::: %d,%d: %d %s [%d]\n", x, y, border_element, + element_info[border_element].token_name, Store2[x][y]); +#endif + +#if 0 + printf("::: phase == %d\n", phase); +#endif + + if (phase == element_info[border_element].ignition_delay || + phase == last_phase) + { + boolean border_explosion = FALSE; + +#if 1 +#if 1 + if (IS_PLAYER(x, y) && PLAYERINFO(x, y)->present && + !PLAYER_EXPLOSION_PROTECTED(x, y)) +#else + if (IS_PLAYER(x, y) && PLAYERINFO(x, y)->present) +#endif +#else + if (IS_PLAYER(x, y)) +#endif + { + KillHeroUnlessExplosionProtected(x, y); + border_explosion = TRUE; + +#if 0 + if (phase == last_phase) + printf("::: IS_PLAYER\n"); +#endif + } + else if (CAN_EXPLODE_BY_EXPLOSION(border_element)) + { +#if 0 + printf("::: %d,%d: %d %s\n", x, y, border_element, + element_info[border_element].token_name); +#endif + + Feld[x][y] = Store2[x][y]; + Store2[x][y] = 0; + Bang(x, y); + border_explosion = TRUE; + +#if 0 + if (phase == last_phase) + printf("::: CAN_EXPLODE_BY_EXPLOSION\n"); +#endif + } + else if (border_element == EL_AMOEBA_TO_DIAMOND) + { + AmoebeUmwandeln(x, y); + Store2[x][y] = 0; + border_explosion = TRUE; + +#if 0 + if (phase == last_phase) + printf("::: EL_AMOEBA_TO_DIAMOND [%d, %d] [%d]\n", + element_info[border_element].explosion_delay, + element_info[border_element].ignition_delay, + phase); +#endif + } + +#if 1 + /* if an element just explodes due to another explosion (chain-reaction), + do not immediately end the new explosion when it was the last frame of + the explosion (as it would be done in the following "if"-statement!) */ + if (border_explosion && phase == last_phase) + return; +#endif + } + +#else + if (phase == first_phase_after_start) { int element = Store2[x][y]; @@ -1824,8 +3491,8 @@ void Explode(int ex, int ey, int phase, int mode) int element = Store2[x][y]; if (IS_PLAYER(x, y)) - KillHeroUnlessProtected(x, y); - else if (CAN_EXPLODE_BY_FIRE(element)) + KillHeroUnlessExplosionProtected(x, y); + else if (CAN_EXPLODE_BY_EXPLOSION(element)) { Feld[x][y] = Store2[x][y]; Store2[x][y] = 0; @@ -1834,34 +3501,107 @@ void Explode(int ex, int ey, int phase, int mode) else if (element == EL_AMOEBA_TO_DIAMOND) AmoebeUmwandeln(x, y); } +#endif if (phase == last_phase) { int element; +#if 0 + printf("::: done: phase == %d\n", phase); +#endif + +#if 0 + printf("::: explosion %d,%d done [%d]\n", x, y, FrameCounter); +#endif + element = Feld[x][y] = Store[x][y]; Store[x][y] = Store2[x][y] = 0; - + GfxElement[x][y] = EL_UNDEFINED; + + /* player can escape from explosions and might therefore be still alive */ + if (element >= EL_PLAYER_IS_EXPLODING_1 && + element <= EL_PLAYER_IS_EXPLODING_4) + Feld[x][y] = (stored_player[element - EL_PLAYER_IS_EXPLODING_1].active ? + EL_EMPTY : + element == EL_PLAYER_IS_EXPLODING_1 ? EL_EMERALD_YELLOW : + element == EL_PLAYER_IS_EXPLODING_2 ? EL_EMERALD_RED : + element == EL_PLAYER_IS_EXPLODING_3 ? EL_EMERALD : + EL_EMERALD_PURPLE); + + /* restore probably existing indestructible background element */ if (Back[x][y] && IS_INDESTRUCTIBLE(Back[x][y])) element = Feld[x][y] = Back[x][y]; 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 1 + InitField_WithBug2(x, y, FALSE); +#else InitField(x, y, FALSE); +#if 1 + /* !!! not needed !!! */ +#if 1 + if (game.engine_version < VERSION_IDENT(3,1,0,0) && + CAN_MOVE(Feld[x][y]) && Feld[x][y] != EL_MOLE) + InitMovDir(x, y); +#else if (CAN_MOVE(element)) InitMovDir(x, y); +#endif +#endif +#endif DrawLevelField(x, y); - if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present) + TestIfElementTouchesCustomElement(x, y); + + if (GFX_CRUMBLED(element)) + DrawLevelFieldCrumbledSandNeighbours(x, y); + + if (IS_PLAYER(x, y) && !PLAYERINFO(x, y)->present) StorePlayer[x][y] = 0; + + if (ELEM_IS_PLAYER(element)) + RelocatePlayer(x, y, element); } +#if 1 + else if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) +#else else if (phase >= delay && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) +#endif { +#if 1 + int graphic = el_act2img(GfxElement[x][y], ACTION_EXPLODING); +#else int stored = Store[x][y]; int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION : stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON : IMG_SP_EXPLOSION); +#endif +#if 1 + int frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]); +#else int frame = getGraphicAnimationFrame(graphic, phase - delay); +#endif + +#if 0 + printf("::: phase == %d [%d]\n", phase, GfxFrame[x][y]); +#endif + +#if 0 + printf("::: %d / %d [%d - %d]\n", + GfxFrame[x][y], phase - delay, phase, delay); +#endif + +#if 0 + printf("::: %d ['%s'] -> %d\n", GfxElement[x][y], + element_info[GfxElement[x][y]].token_name, + graphic); +#endif if (phase == delay) DrawLevelFieldCrumbledSand(x, y); @@ -1884,6 +3624,7 @@ void Explode(int ex, int ey, int phase, int mode) void DynaExplode(int ex, int ey) { int i, j; + int dynabomb_element = Feld[ex][ey]; int dynabomb_size = 1; boolean dynabomb_xl = FALSE; struct PlayerInfo *player; @@ -1895,22 +3636,22 @@ void DynaExplode(int ex, int ey) { 0, +1 } }; - if (IS_ACTIVE_BOMB(Feld[ex][ey])) + if (IS_ACTIVE_BOMB(dynabomb_element)) { - player = &stored_player[Feld[ex][ey] - EL_DYNABOMB_PLAYER_1_ACTIVE]; + player = &stored_player[dynabomb_element - EL_DYNABOMB_PLAYER_1_ACTIVE]; dynabomb_size = player->dynabomb_size; dynabomb_xl = player->dynabomb_xl; player->dynabombs_left++; } - Explode(ex, ey, EX_PHASE_START, EX_CENTER); + Explode(ex, ey, EX_PHASE_START, EX_TYPE_CENTER); - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { - for (j=1; j<=dynabomb_size; j++) + for (j = 1; j <= dynabomb_size; j++) { - int x = ex + j * xy[i % 4][0]; - int y = ey + j * xy[i % 4][1]; + int x = ex + j * xy[i][0]; + int y = ey + j * xy[i][1]; int element; if (!IN_LEV_FIELD(x, y) || IS_INDESTRUCTIBLE(Feld[x][y])) @@ -1922,25 +3663,58 @@ void DynaExplode(int ex, int ey) if (element == EL_EXPLOSION && IS_ACTIVE_BOMB(Store2[x][y])) continue; - Explode(x, y, EX_PHASE_START, EX_BORDER); + Explode(x, y, EX_PHASE_START, EX_TYPE_BORDER); - if (element != EL_EMPTY && - element != EL_SAND && - element != EL_EXPLOSION && - !dynabomb_xl) +#if 1 +#if 1 + if (element != EL_EMPTY && element != EL_EXPLOSION && + !IS_DIGGABLE(element) && !dynabomb_xl) break; +#else + if (element != EL_EMPTY && element != EL_EXPLOSION && + !CAN_GROW_INTO(element) && !dynabomb_xl) + break; +#endif +#else + /* !!! extend EL_SAND to anything diggable (but maybe not SP_BASE) !!! */ + if (element != EL_EMPTY && element != EL_EXPLOSION && + element != EL_SAND && !dynabomb_xl) + break; +#endif } } } void Bang(int x, int y) { +#if 1 + int element = MovingOrBlocked2Element(x, y); +#else int element = Feld[x][y]; +#endif + +#if 1 + if (IS_PLAYER(x, y) && !PLAYER_EXPLOSION_PROTECTED(x, y)) +#else + if (IS_PLAYER(x, y)) +#endif + { + struct PlayerInfo *player = PLAYERINFO(x, y); + + element = Feld[x][y] = (player->use_murphy_graphic ? EL_SP_MURPHY : + player->element_nr); + } +#if 0 +#if 1 + 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 0 if (IS_PLAYER(x, y)) /* remove objects that might cause smaller explosion */ @@ -1959,7 +3733,7 @@ void Bang(int x, int y) case EL_PACMAN: case EL_MOLE: RaiseScoreElement(element); - Explode(x, y, EX_PHASE_START, EX_NORMAL); + Explode(x, y, EX_PHASE_START, EX_TYPE_NORMAL); break; case EL_DYNABOMB_PLAYER_1_ACTIVE: case EL_DYNABOMB_PLAYER_2_ACTIVE: @@ -1973,36 +3747,77 @@ void Bang(int x, int y) case EL_PENGUIN: case EL_LAMP: case EL_LAMP_ACTIVE: +#if 1 + case EL_AMOEBA_TO_DIAMOND: +#endif if (IS_PLAYER(x, y)) - Explode(x, y, EX_PHASE_START, EX_NORMAL); + Explode(x, y, EX_PHASE_START, EX_TYPE_NORMAL); else - Explode(x, y, EX_PHASE_START, EX_CENTER); + Explode(x, y, EX_PHASE_START, EX_TYPE_CENTER); break; default: - Explode(x, y, EX_PHASE_START, EX_NORMAL); +#if 1 + if (element_info[element].explosion_type == EXPLODES_CROSS) +#else + if (CAN_EXPLODE_CROSS(element)) +#endif +#if 1 + Explode(x, y, EX_PHASE_START, EX_TYPE_CROSS); +#else + DynaExplode(x, y); +#endif +#if 1 + else if (element_info[element].explosion_type == EXPLODES_1X1) +#else + else if (CAN_EXPLODE_1X1(element)) +#endif + Explode(x, y, EX_PHASE_START, EX_TYPE_CENTER); + else + Explode(x, y, EX_PHASE_START, EX_TYPE_NORMAL); break; } + + CheckTriggeredElementChange(x, y, element, CE_OTHER_IS_EXPLODING); } void SplashAcid(int x, int y) { +#if 1 + if (IN_LEV_FIELD(x - 1, y - 1) && IS_FREE(x - 1, y - 1) && + (!IN_LEV_FIELD(x - 1, y - 2) || + !CAN_FALL(MovingOrBlocked2Element(x - 1, y - 2)))) + Feld[x - 1][y - 1] = EL_ACID_SPLASH_LEFT; + + if (IN_LEV_FIELD(x + 1, y - 1) && IS_FREE(x + 1, y - 1) && + (!IN_LEV_FIELD(x + 1, y - 2) || + !CAN_FALL(MovingOrBlocked2Element(x + 1, y - 2)))) + Feld[x + 1][y - 1] = EL_ACID_SPLASH_RIGHT; + + PlayLevelSound(x, y, SND_ACID_SPLASHING); +#else + /* input: position of element entering acid (obsolete) */ + int element = Feld[x][y]; + if (!IN_LEV_FIELD(x, y + 1) || Feld[x][y + 1] != EL_ACID) + return; + 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) || - !CAN_FALL(MovingOrBlocked2Element(x-1, y-1)))) - Feld[x-1][y] = EL_ACID_SPLASH_LEFT; + if (IN_LEV_FIELD(x - 1, y) && IS_FREE(x - 1, y) && + (!IN_LEV_FIELD(x - 1, y - 1) || + !CAN_FALL(MovingOrBlocked2Element(x - 1, y - 1)))) + Feld[x - 1][y] = EL_ACID_SPLASH_LEFT; - if (IN_LEV_FIELD(x+1, y) && IS_FREE(x+1, y) && - (!IN_LEV_FIELD(x+1, y-1) || - !CAN_FALL(MovingOrBlocked2Element(x+1, y-1)))) - Feld[x+1][y] = EL_ACID_SPLASH_RIGHT; + if (IN_LEV_FIELD(x + 1, y) && IS_FREE(x + 1, y) && + (!IN_LEV_FIELD(x + 1, y - 1) || + !CAN_FALL(MovingOrBlocked2Element(x + 1, y - 1)))) + Feld[x + 1][y] = EL_ACID_SPLASH_RIGHT; } +#endif } static void InitBeltMovement() @@ -2025,11 +3840,11 @@ static void InitBeltMovement() int x, y, i, j; /* set frame order for belt animation graphic according to belt direction */ - for (i=0; i<4; i++) + for (i = 0; i < NUM_BELTS; i++) { int belt_nr = i; - for (j=0; j<3; j++) + for (j = 0; j < NUM_BELT_PARTS; j++) { int element = belt_base_active_element[belt_nr] + j; int graphic = el2img(element); @@ -2041,13 +3856,13 @@ static void InitBeltMovement() } } - for(y=0; y= VERSION_IDENT(2,2,0,7) && IS_MOVING(x, y + 1) && + ABS(MovPos[x][y + 1] + getElementMoveStepsize(x, y + 1)) >= TILEX) + object_hit = FALSE; + if (object_hit) - smashed = MovingOrBlocked2Element(x, y+1); + smashed = MovingOrBlocked2Element(x, y + 1); + + impact = (lastline || object_hit); } if (!lastline && smashed == EL_ACID) /* element falls into acid */ { - SplashAcid(x, y); + SplashAcid(x, y + 1); return; } - if (impact) + /* !!! not sufficient for all cases -- see EL_PEARL below !!! */ + /* only reset graphic animation if graphic really changes after impact */ + if (impact && + el_act_dir2img(element, GfxAction[x][y], MV_DOWN) != el2img(element)) { ResetGfxAnimation(x, y); DrawLevelField(x, y); } -#if 1 if (impact && CAN_EXPLODE_IMPACT(element)) -#else - if ((element == EL_BOMB || - element == EL_SP_DISK_ORANGE || - element == EL_DX_SUPABOMB) && - (lastline || object_hit)) /* element is bomb */ -#endif { Bang(x, y); return; } - else if (element == EL_PEARL) + else if (impact && element == EL_PEARL) { + ResetGfxAnimation(x, y); + 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, smashed, CE_IMPACT)) + { + PlayLevelSoundElementAction(x, y, element, ACTION_IMPACT); + return; } if (impact && element == EL_AMOEBA_DROP) { - if (object_hit && IS_PLAYER(x, y+1)) - KillHeroUnlessProtected(x, y+1); + if (object_hit && IS_PLAYER(x, y + 1)) + KillHeroUnlessEnemyProtected(x, y + 1); else if (object_hit && smashed == EL_PENGUIN) Bang(x, y + 1); else @@ -2379,7 +4243,7 @@ void Impact(int x, int y) return; } - if (!lastline && object_hit) /* check which object was hit */ + if (object_hit) /* check which object was hit */ { if (CAN_PASS_MAGIC_WALL(element) && (smashed == EL_MAGIC_WALL || @@ -2391,30 +4255,36 @@ void Impact(int x, int y) EL_BD_MAGIC_WALL_ACTIVE); /* activate magic wall / mill */ - for (yy=0; yy rnd_value/8) + else if (can_move_on && rnd > rnd_value / 8) MovDir[x][y] = old_move_dir; else if (can_turn_left && can_turn_right) - MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir); - else if (can_turn_left && rnd > rnd_value/8) + MovDir[x][y] = (rnd < rnd_value / 2 ? left_dir : right_dir); + else if (can_turn_left && rnd > rnd_value / 8) MovDir[x][y] = left_dir; else if (can_turn_right && rnd > rnd_value/8) MovDir[x][y] = right_dir; else MovDir[x][y] = back_dir; - if (!IS_FREE(x+move_xy[MovDir[x][y]].x, y+move_xy[MovDir[x][y]].y) && - !IS_FOOD_PIG(Feld[x+move_xy[MovDir[x][y]].x][y+move_xy[MovDir[x][y]].y])) + xx = x + move_xy[MovDir[x][y]].x; + yy = y + move_xy[MovDir[x][y]].y; + + if (!IS_FREE(xx, yy) && !IS_FOOD_PIG(Feld[xx][yy])) MovDir[x][y] = old_move_dir; MovDelay[x][y] = 0; } else if (element == EL_DRAGON) { - boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; + boolean can_turn_left = DRAGON_CAN_ENTER_FIELD(element, left_x, left_y); + boolean can_turn_right = DRAGON_CAN_ENTER_FIELD(element, right_x, right_y); + boolean can_move_on = DRAGON_CAN_ENTER_FIELD(element, move_x, move_y); int rnd_value = 24; int rnd = RND(rnd_value); - if (IN_LEV_FIELD(left_x, left_y) && IS_FREE(left_x, left_y)) - can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x, right_y) && IS_FREE(right_x, right_y)) - can_turn_right = TRUE; - if (IN_LEV_FIELD(move_x, move_y) && IS_FREE(move_x, move_y)) - can_move_on = TRUE; +#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) + if (can_move_on && rnd > rnd_value / 8) MovDir[x][y] = old_move_dir; else if (can_turn_left && can_turn_right) - MovDir[x][y] = (rnd < rnd_value/2 ? left_dir : right_dir); - else if (can_turn_left && rnd > rnd_value/8) + MovDir[x][y] = (rnd < rnd_value / 2 ? left_dir : right_dir); + else if (can_turn_left && rnd > rnd_value / 8) MovDir[x][y] = left_dir; - else if (can_turn_right && rnd > rnd_value/8) + else if (can_turn_right && rnd > rnd_value / 8) MovDir[x][y] = right_dir; else MovDir[x][y] = back_dir; - if (!IS_FREE(x+move_xy[MovDir[x][y]].x, y+move_xy[MovDir[x][y]].y)) + 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; } else if (element == EL_MOLE) { - boolean can_turn_left = FALSE, can_turn_right = FALSE, can_move_on = FALSE; - - if (IN_LEV_FIELD(move_x, move_y) && - (IS_FREE(move_x, move_y) || IS_AMOEBOID(Feld[move_x][move_y]) || - Feld[move_x][move_y] == EL_AMOEBA_SHRINKING)) - can_move_on = TRUE; - + boolean can_move_on = + (MOLE_CAN_ENTER_FIELD(element, move_x, move_y, + IS_AMOEBOID(Feld[move_x][move_y]) || + Feld[move_x][move_y] == EL_AMOEBA_SHRINKING)); if (!can_move_on) { - if (IN_LEV_FIELD(left_x, left_y) && - (IS_FREE(left_x, left_y) || IS_AMOEBOID(Feld[left_x][left_y]))) - can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x, right_y) && - (IS_FREE(right_x, right_y) || IS_AMOEBOID(Feld[right_x][right_y]))) - can_turn_right = TRUE; + boolean can_turn_left = + (MOLE_CAN_ENTER_FIELD(element, left_x, left_y, + IS_AMOEBOID(Feld[left_x][left_y]))); + + boolean can_turn_right = + (MOLE_CAN_ENTER_FIELD(element, right_x, right_y, + IS_AMOEBOID(Feld[right_x][right_y]))); if (can_turn_left && can_turn_right) MovDir[x][y] = (RND(2) ? left_dir : right_dir); @@ -2798,10 +4715,16 @@ void TurnRound(int x, int y) } else if (element == EL_SPRING) { - if ((MovDir[x][y] == MV_LEFT || MovDir[x][y] == MV_RIGHT) && - (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) || - (IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1)))) +#if 0 + if (MovDir[x][y] & MV_HORIZONTAL && + !SPRING_CAN_ENTER_FIELD(element, move_x, move_y)) MovDir[x][y] = MV_NO_MOVING; +#else + if (MovDir[x][y] & MV_HORIZONTAL && + (!SPRING_CAN_ENTER_FIELD(element, move_x, move_y) || + SPRING_CAN_ENTER_FIELD(element, x, y + 1))) + MovDir[x][y] = MV_NO_MOVING; +#endif MovDelay[x][y] = 0; } @@ -2820,7 +4743,7 @@ void TurnRound(int x, int y) { int i; - for (i=0; ijx, jy = player->jy; @@ -2828,7 +4751,8 @@ void TurnRound(int x, int y) if (!player->active) continue; - if (attr_x == -1 || ABS(jx-x)+ABS(jy-y) < ABS(attr_x-x)+ABS(attr_y-y)) + if (attr_x == -1 || + ABS(jx - x) + ABS(jy - y) < ABS(attr_x - x) + ABS(attr_y - y)) { attr_x = jx; attr_y = jy; @@ -2836,7 +4760,13 @@ void TurnRound(int x, int y) } } +#if 1 + if (element == EL_ROBOT && ZX >= 0 && ZY >= 0 && + (Feld[ZX][ZY] == EL_ROBOT_WHEEL_ACTIVE || + game.engine_version < VERSION_IDENT(3,1,0,0))) +#else if (element == EL_ROBOT && ZX >= 0 && ZY >= 0) +#endif { attr_x = ZX; attr_y = ZY; @@ -2853,10 +4783,10 @@ void TurnRound(int x, int y) { 0, +1 } }; - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { - int ex = x + xy[i % 4][0]; - int ey = y + xy[i % 4][1]; + int ex = x + xy[i][0]; + int ey = y + xy[i][1]; if (IN_LEV_FIELD(ex, ey) && Feld[ex][ey] == EL_EXIT_OPEN) { @@ -2886,11 +4816,40 @@ void TurnRound(int x, int y) Moving2Blocked(x, y, &newx, &newy); if (IN_LEV_FIELD(newx, newy) && IS_FREE_OR_PLAYER(newx, newy)) - MovDelay[x][y] = 8+8*!RND(3); + MovDelay[x][y] = 8 + 8 * !RND(3); else MovDelay[x][y] = 16; } - else + else if (element == EL_PENGUIN) + { + int newx, newy; + + MovDelay[x][y] = 1; + + if (MovDir[x][y] & MV_HORIZONTAL && MovDir[x][y] & MV_VERTICAL) + { + boolean first_horiz = RND(2); + int new_move_dir = MovDir[x][y]; + + MovDir[x][y] = + new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL); + Moving2Blocked(x, y, &newx, &newy); + + if (PENGUIN_CAN_ENTER_FIELD(EL_PENGUIN, newx, newy)) + return; + + MovDir[x][y] = + new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL); + Moving2Blocked(x, y, &newx, &newy); + + if (PENGUIN_CAN_ENTER_FIELD(EL_PENGUIN, newx, newy)) + return; + + MovDir[x][y] = old_move_dir; + return; + } + } + else /* (element == EL_SATELLITE) */ { int newx, newy; @@ -2905,24 +4864,14 @@ void TurnRound(int x, int y) new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL); Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx, newy) && - (IS_FREE(newx, newy) || - Feld[newx][newy] == EL_ACID || - (element == EL_PENGUIN && - (Feld[newx][newy] == EL_EXIT_OPEN || - IS_FOOD_PENGUIN(Feld[newx][newy]))))) + if (SATELLITE_CAN_ENTER_FIELD(newx, newy)) return; MovDir[x][y] = new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL); Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx, newy) && - (IS_FREE(newx, newy) || - Feld[newx][newy] == EL_ACID || - (element == EL_PENGUIN && - (Feld[newx][newy] == EL_EXIT_OPEN || - IS_FOOD_PENGUIN(Feld[newx][newy]))))) + if (SATELLITE_CAN_ENTER_FIELD(newx, newy)) return; MovDir[x][y] = old_move_dir; @@ -2930,20 +4879,31 @@ void TurnRound(int x, int y) } } } - else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS) + else if (move_pattern == MV_TURNING_LEFT || + move_pattern == MV_TURNING_RIGHT || + move_pattern == MV_TURNING_LEFT_RIGHT || + move_pattern == MV_TURNING_RIGHT_LEFT || + move_pattern == MV_TURNING_RANDOM || + move_pattern == MV_ALL_DIRECTIONS) { - boolean can_turn_left = FALSE, can_turn_right = FALSE; + boolean can_turn_left = + CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y); + boolean can_turn_right = + CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, right_x,right_y); - if (IN_LEV_FIELD(left_x, left_y) && - (IS_FREE(left_x, left_y) || - (DONT_COLLIDE_WITH(element) && IS_FREE_OR_PLAYER(left_x, left_y)))) - can_turn_left = TRUE; - if (IN_LEV_FIELD(right_x, right_y) && - (IS_FREE(right_x, right_y) || - (DONT_COLLIDE_WITH(element) && IS_FREE_OR_PLAYER(right_x, right_y)))) - can_turn_right = TRUE; - - if (can_turn_left && can_turn_right) + if (move_pattern == MV_TURNING_LEFT) + MovDir[x][y] = left_dir; + else if (move_pattern == MV_TURNING_RIGHT) + MovDir[x][y] = right_dir; + else if (move_pattern == MV_TURNING_LEFT_RIGHT) + MovDir[x][y] = (can_turn_left || !can_turn_right ? left_dir : right_dir); + else if (move_pattern == MV_TURNING_RIGHT_LEFT) + MovDir[x][y] = (can_turn_right || !can_turn_left ? right_dir : left_dir); + else if (move_pattern == MV_TURNING_RANDOM) + MovDir[x][y] = (can_turn_left && !can_turn_right ? left_dir : + can_turn_right && !can_turn_left ? right_dir : + RND(2) ? left_dir : right_dir); + else if (can_turn_left && can_turn_right) MovDir[x][y] = (RND(3) ? (RND(2) ? left_dir : right_dir) : back_dir); else if (can_turn_left) MovDir[x][y] = (RND(2) ? left_dir : back_dir); @@ -2954,58 +4914,49 @@ void TurnRound(int x, int y) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_HORIZONTAL || - element_info[element].move_pattern == MV_VERTICAL) + else if (move_pattern == MV_HORIZONTAL || + move_pattern == MV_VERTICAL) { - if (element_info[element].move_pattern & old_move_dir) + if (move_pattern & old_move_dir) MovDir[x][y] = back_dir; - else if (element_info[element].move_pattern == MV_HORIZONTAL) + else if (move_pattern == MV_HORIZONTAL) MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT); - else if (element_info[element].move_pattern == MV_VERTICAL) + else if (move_pattern == MV_VERTICAL) MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN); MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern & MV_ANY_DIRECTION) + else if (move_pattern & MV_ANY_DIRECTION) { - MovDir[x][y] = element_info[element].move_pattern; + MovDir[x][y] = move_pattern; MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE) + else if (move_pattern == MV_ALONG_LEFT_SIDE) { - if (IN_LEV_FIELD(left_x, left_y) && - (IS_FREE(left_x, left_y) || - (DONT_COLLIDE_WITH(element) && IS_FREE_OR_PLAYER(left_x, left_y)))) + if (CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y)) MovDir[x][y] = left_dir; - else if (!IN_LEV_FIELD(move_x, move_y) || - (!IS_FREE(move_x, move_y) && - (!DONT_COLLIDE_WITH(element) || !IS_FREE_OR_PLAYER(move_x, move_y)))) + else if (!CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, move_x, move_y)) MovDir[x][y] = right_dir; if (MovDir[x][y] != old_move_dir) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_ALONG_RIGHT_SIDE) + else if (move_pattern == MV_ALONG_RIGHT_SIDE) { - if (IN_LEV_FIELD(right_x, right_y) && - (IS_FREE(right_x, right_y) || - (DONT_COLLIDE_WITH(element) && IS_FREE_OR_PLAYER(right_x, right_y)))) + if (CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, right_x, right_y)) MovDir[x][y] = right_dir; - else if (!IN_LEV_FIELD(move_x, move_y) || - (!IS_FREE(move_x, move_y) && - (!DONT_COLLIDE_WITH(element) || !IS_FREE_OR_PLAYER(move_x, move_y)))) + else if (!CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, move_x, move_y)) MovDir[x][y] = left_dir; if (MovDir[x][y] != old_move_dir) MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); } - else if (element_info[element].move_pattern == MV_TOWARDS_PLAYER || - element_info[element].move_pattern == MV_AWAY_FROM_PLAYER) + else if (move_pattern == MV_TOWARDS_PLAYER || + move_pattern == MV_AWAY_FROM_PLAYER) { int attr_x = -1, attr_y = -1; int newx, newy; - boolean move_away = - (element_info[element].move_pattern == MV_AWAY_FROM_PLAYER); + boolean move_away = (move_pattern == MV_AWAY_FROM_PLAYER); if (AllPlayersGone) { @@ -3016,7 +4967,7 @@ void TurnRound(int x, int y) { int i; - for (i=0; ijx, jy = player->jy; @@ -3024,7 +4975,8 @@ void TurnRound(int x, int y) if (!player->active) continue; - if (attr_x == -1 || ABS(jx-x)+ABS(jy-y) < ABS(attr_x-x)+ABS(attr_y-y)) + if (attr_x == -1 || + ABS(jx - x) + ABS(jy - y) < ABS(attr_x - x) + ABS(attr_y - y)) { attr_x = jx; attr_y = jy; @@ -3053,36 +5005,134 @@ void TurnRound(int x, int y) new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL); Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx, newy) && (IS_FREE(newx, newy) || - (DONT_COLLIDE_WITH(element) && - IS_FREE_OR_PLAYER(newx, newy)) || - Feld[newx][newy] == EL_ACID)) + if (CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, newx, newy)) return; MovDir[x][y] = new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL); Moving2Blocked(x, y, &newx, &newy); - if (IN_LEV_FIELD(newx, newy) && (IS_FREE(newx, newy) || - (DONT_COLLIDE_WITH(element) && - IS_FREE_OR_PLAYER(newx, newy)) || - Feld[newx][newy] == EL_ACID)) + if (CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, newx, newy)) return; MovDir[x][y] = old_move_dir; } } + else if (move_pattern == MV_WHEN_PUSHED || + move_pattern == MV_WHEN_DROPPED) + { + if (!CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, move_x, move_y)) + MovDir[x][y] = MV_NO_MOVING; + + MovDelay[x][y] = 0; + } + else if (move_pattern & MV_MAZE_RUNNER_STYLE) + { + static int test_xy[7][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 }, + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + }; + static int test_dir[7] = + { + MV_UP, + MV_LEFT, + MV_RIGHT, + MV_DOWN, + MV_UP, + MV_LEFT, + MV_RIGHT, + }; + boolean hunter_mode = (move_pattern == MV_MAZE_HUNTER); + int move_preference = -1000000; /* start with very low preference */ + int new_move_dir = MV_NO_MOVING; + int start_test = RND(4); + int i; + + for (i = 0; i < NUM_DIRECTIONS; i++) + { + int move_dir = test_dir[start_test + i]; + int move_dir_preference; + + xx = x + test_xy[start_test + i][0]; + yy = y + test_xy[start_test + i][1]; + + if (hunter_mode && IN_LEV_FIELD(xx, yy) && + (IS_PLAYER(xx, yy) || Feld[xx][yy] == EL_PLAYER_IS_LEAVING)) + { + new_move_dir = move_dir; + + break; + } + + if (!CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, xx, yy)) + continue; + + move_dir_preference = -1 * RunnerVisit[xx][yy]; + if (hunter_mode && PlayerVisit[xx][yy] > 0) + move_dir_preference = PlayerVisit[xx][yy]; + + if (move_dir_preference > move_preference) + { + /* prefer field that has not been visited for the longest time */ + move_preference = move_dir_preference; + new_move_dir = move_dir; + } + else if (move_dir_preference == move_preference && + move_dir == old_move_dir) + { + /* prefer last direction when all directions are preferred equally */ + move_preference = move_dir_preference; + new_move_dir = move_dir; + } + } + + MovDir[x][y] = new_move_dir; + if (old_move_dir != new_move_dir) + MovDelay[x][y] = 9; + } +} + +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; - for (i=0; iactive && 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); @@ -3097,24 +5147,34 @@ static boolean JustBeingPushed(int x, int y) void StartMoving(int x, int y) { - boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0)); +#if 0 + boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0,0)); +#endif boolean started_moving = FALSE; /* some elements can fall _and_ move */ int element = Feld[x][y]; if (Stop[x][y]) return; - GfxAction[x][y] = ACTION_DEFAULT; +#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) { - if ((x>0 && IS_PLAYER(x-1, y)) || (x 0 && IS_PLAYER(x - 1, y)) || + (x < lev_fieldx - 1 && IS_PLAYER(x + 1, y))) if (JustBeingPushed(x, y)) return; if (element == EL_QUICKSAND_FULL) { - if (IS_FREE(x, y+1)) + if (IS_FREE(x, y + 1)) { InitMovingField(x, y, MV_DOWN); started_moving = TRUE; @@ -3122,12 +5182,12 @@ void StartMoving(int x, int y) 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) + else if (Feld[x][y + 1] == EL_QUICKSAND_EMPTY) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY + 1; @@ -3140,18 +5200,18 @@ void StartMoving(int x, int y) } Feld[x][y] = EL_QUICKSAND_EMPTY; - Feld[x][y+1] = EL_QUICKSAND_FULL; - Store[x][y+1] = Store[x][y]; + Feld[x][y + 1] = EL_QUICKSAND_FULL; + 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 } } else if ((element == EL_ROCK || element == EL_BD_ROCK) && - Feld[x][y+1] == EL_QUICKSAND_EMPTY) + Feld[x][y + 1] == EL_QUICKSAND_EMPTY) { InitMovingField(x, y, MV_DOWN); started_moving = TRUE; @@ -3159,14 +5219,14 @@ void StartMoving(int x, int y) 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) { - if (IS_FREE(x, y+1)) + if (IS_FREE(x, y + 1)) { InitMovingField(x, y, MV_DOWN); started_moving = TRUE; @@ -3174,7 +5234,7 @@ void StartMoving(int x, int y) Feld[x][y] = EL_MAGIC_WALL_EMPTYING; Store[x][y] = EL_CHANGED(Store[x][y]); } - else if (Feld[x][y+1] == EL_MAGIC_WALL_ACTIVE) + else if (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -3187,14 +5247,14 @@ void StartMoving(int x, int y) } Feld[x][y] = EL_MAGIC_WALL_ACTIVE; - Feld[x][y+1] = EL_MAGIC_WALL_FULL; - Store[x][y+1] = EL_CHANGED(Store[x][y]); + Feld[x][y + 1] = EL_MAGIC_WALL_FULL; + Store[x][y + 1] = EL_CHANGED(Store[x][y]); Store[x][y] = 0; } } else if (element == EL_BD_MAGIC_WALL_FULL) { - if (IS_FREE(x, y+1)) + if (IS_FREE(x, y + 1)) { InitMovingField(x, y, MV_DOWN); started_moving = TRUE; @@ -3202,7 +5262,7 @@ void StartMoving(int x, int y) Feld[x][y] = EL_BD_MAGIC_WALL_EMPTYING; Store[x][y] = EL_CHANGED2(Store[x][y]); } - else if (Feld[x][y+1] == EL_BD_MAGIC_WALL_ACTIVE) + else if (Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE) { if (!MovDelay[x][y]) MovDelay[x][y] = TILEY/4 + 1; @@ -3215,30 +5275,30 @@ void StartMoving(int x, int y) } Feld[x][y] = EL_BD_MAGIC_WALL_ACTIVE; - Feld[x][y+1] = EL_BD_MAGIC_WALL_FULL; - Store[x][y+1] = EL_CHANGED2(Store[x][y]); + Feld[x][y + 1] = EL_BD_MAGIC_WALL_FULL; + Store[x][y + 1] = EL_CHANGED2(Store[x][y]); Store[x][y] = 0; } } else if (CAN_PASS_MAGIC_WALL(element) && - (Feld[x][y+1] == EL_MAGIC_WALL_ACTIVE || - Feld[x][y+1] == EL_BD_MAGIC_WALL_ACTIVE)) + (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE || + Feld[x][y + 1] == EL_BD_MAGIC_WALL_ACTIVE)) { InitMovingField(x, y, MV_DOWN); started_moving = TRUE; Feld[x][y] = - (Feld[x][y+1] == EL_MAGIC_WALL_ACTIVE ? EL_MAGIC_WALL_FILLING : + (Feld[x][y + 1] == EL_MAGIC_WALL_ACTIVE ? EL_MAGIC_WALL_FILLING : EL_BD_MAGIC_WALL_FILLING); Store[x][y] = element; } #if 0 - else if (CAN_SMASH(element) && Feld[x][y+1] == EL_ACID) + else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_ACID) #else - else if (CAN_FALL(element) && Feld[x][y+1] == EL_ACID) + else if (CAN_FALL(element) && Feld[x][y + 1] == EL_ACID) #endif { - SplashAcid(x, y); + SplashAcid(x, y + 1); InitMovingField(x, y, MV_DOWN); started_moving = TRUE; @@ -3246,15 +5306,58 @@ void StartMoving(int x, int y) Store[x][y] = EL_ACID; #if 0 /* !!! TEST !!! better use "_FALLING" etc. !!! */ - GfxAction[x][y+1] = ACTION_ACTIVE; + GfxAction[x][y + 1] = ACTION_ACTIVE; #endif } - else if (CAN_SMASH(element) && Feld[x][y+1] == EL_BLOCKED && - JustStopped[x][y]) +#if 1 + else if ((game.engine_version >= VERSION_IDENT(3,1,0,0) && + CheckCollision[x][y] && !IS_FREE(x, y + 1)) || + + (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))) || + + (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))) + +#else +#if 1 + else if (game.engine_version < VERSION_IDENT(2,2,0,7) && + CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED && + WasJustMoving[x][y] && !Pushed[x][y + 1]) +#else + else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED && + WasJustMoving[x][y]) +#endif +#endif + { + /* 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... :-/ ) */ + +#if 0 + WasJustMoving[x][y] = 0; + WasJustFalling[x][y] = 0; +#endif + + CheckCollision[x][y] = 0; + +#if 0 + if (IS_PLAYER(x, y + 1)) + printf("::: we ARE now killing the player [%d]\n", FrameCounter); +#endif + Impact(x, y); } - else if (IS_FREE(x, y+1) && element == EL_SPRING && use_spring_bug) + else if (IS_FREE(x, y + 1) && element == EL_SPRING && level.use_spring_bug) { if (MovDir[x][y] == MV_NO_MOVING) { @@ -3262,9 +5365,9 @@ void StartMoving(int x, int y) started_moving = TRUE; } } - else if (IS_FREE(x, y+1)) + 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); @@ -3275,68 +5378,174 @@ void StartMoving(int x, int y) Feld[x][y] = EL_AMOEBA_GROWING; Store[x][y] = EL_AMOEBA_WET; } - /* Store[x][y+1] must be zero, because: - (EL_QUICKSAND_FULL -> EL_ROCK): Store[x][y+1] == EL_QUICKSAND_EMPTY + /* Store[x][y + 1] must be zero, because: + (EL_QUICKSAND_FULL -> EL_ROCK): Store[x][y + 1] == EL_QUICKSAND_EMPTY */ #if 0 #if OLD_GAME_BEHAVIOUR - else if (IS_SLIPPERY(Feld[x][y+1]) && !Store[x][y+1]) + 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] && + else if (IS_SLIPPERY(Feld[x][y + 1]) && !Store[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_EM_SLIPPERY_WALL(Feld[x][y+1]) && IS_GEM(element))) && - !IS_FALLING(x, y+1) && !JustStopped[x][y+1] && + 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) && !WasJustMoving[x][y + 1] && element != EL_DX_SUPABOMB && element != EL_SP_DISK_ORANGE) #endif { - boolean left = (x>0 && IS_FREE(x-1, y) && - (IS_FREE(x-1, y+1) || Feld[x-1][y+1] == EL_ACID)); - boolean right = (x 0 && IS_FREE(x - 1, y) && + (IS_FREE(x - 1, y + 1) || + Feld[x - 1][y + 1] == EL_ACID)); + boolean can_fall_right = (x < lev_fieldx - 1 && IS_FREE(x + 1, y) && + (IS_FREE(x + 1, y + 1) || + Feld[x + 1][y + 1] == EL_ACID)); + boolean can_fall_any = (can_fall_left || can_fall_right); + boolean can_fall_both = (can_fall_left && can_fall_right); + + if (can_fall_any && IS_CUSTOM_ELEMENT(Feld[x][y + 1])) + { + int slippery_type = element_info[Feld[x][y + 1]].slippery_type; + + if (slippery_type == SLIPPERY_ONLY_LEFT) + can_fall_right = FALSE; + else if (slippery_type == SLIPPERY_ONLY_RIGHT) + can_fall_left = FALSE; + else if (slippery_type == SLIPPERY_ANY_LEFT_RIGHT && can_fall_both) + can_fall_right = FALSE; + else if (slippery_type == SLIPPERY_ANY_RIGHT_LEFT && can_fall_both) + can_fall_left = FALSE; + + can_fall_any = (can_fall_left || can_fall_right); + can_fall_both = (can_fall_left && can_fall_right); + } - if (left || right) + if (can_fall_any) { - if (left && right && + if (can_fall_both && (game.emulation != EMU_BOULDERDASH && element != EL_BD_ROCK && element != EL_BD_DIAMOND)) - left = !(right = RND(2)); + can_fall_left = !(can_fall_right = RND(2)); - InitMovingField(x, y, left ? MV_LEFT : MV_RIGHT); + InitMovingField(x, y, can_fall_left ? MV_LEFT : MV_RIGHT); started_moving = TRUE; } } - else if (IS_BELT_ACTIVE(Feld[x][y+1])) +#if 0 + else if (IS_BELT_ACTIVE(Feld[x][y + 1]) && !CAN_MOVE(element)) +#else + else if (IS_BELT_ACTIVE(Feld[x][y + 1])) +#endif { - boolean left_is_free = (x>0 && IS_FREE(x-1, y)); - boolean right_is_free = (x 0 && IS_FREE(x - 1, y)); + boolean right_is_free = (x < lev_fieldx - 1 && IS_FREE(x + 1, y)); + int belt_nr = getBeltNrFromBeltActiveElement(Feld[x][y + 1]); int belt_dir = game.belt_dir[belt_nr]; if ((belt_dir == MV_LEFT && left_is_free) || (belt_dir == MV_RIGHT && right_is_free)) { +#if 1 + int nextx = (belt_dir == MV_LEFT ? x - 1 : x + 1); +#endif + InitMovingField(x, y, belt_dir); started_moving = TRUE; +#if 1 + Pushed[x][y] = TRUE; + Pushed[nextx][y] = TRUE; +#endif + GfxAction[x][y] = ACTION_DEFAULT; } + else + { + MovDir[x][y] = 0; /* if element was moving, stop it */ + } } } - /* not "else if" because of EL_SPRING */ + /* not "else if" because of elements that can fall and move (EL_SPRING) */ +#if 0 + if (CAN_MOVE(element) && !started_moving && MovDir[x][y] != MV_NO_MOVING) +#else if (CAN_MOVE(element) && !started_moving) +#endif { + int move_pattern = element_info[element].move_pattern; int newx, newy; +#if 0 +#if DEBUG + if (MovDir[x][y] == MV_NO_MOVING) + { + printf("StartMoving(): %d,%d: element %d ['%s'] not moving\n", + x, y, element, element_info[element].token_name); + printf("StartMoving(): This should never happen!\n"); + } +#endif +#endif + + Moving2Blocked(x, y, &newx, &newy); + +#if 1 + if (IS_PUSHABLE(element) && JustBeingPushed(x, y)) + return; +#else if ((element == EL_SATELLITE || element == EL_BALLOON || element == EL_SPRING) && JustBeingPushed(x, y)) return; +#endif + +#if 1 + +#if 1 + if (game.engine_version >= VERSION_IDENT(3,1,0,0) && + CheckCollision[x][y] && !IN_LEV_FIELD_AND_IS_FREE(newx, newy)) +#else + if (game.engine_version >= VERSION_IDENT(3,1,0,0) && + WasJustMoving[x][y] && IN_LEV_FIELD(newx, newy) && + (Feld[newx][newy] == EL_BLOCKED || IS_PLAYER(newx, newy))) +#endif + { +#if 0 + printf("::: element %d '%s' WasJustMoving %d [%d, %d, %d, %d]\n", + element, element_info[element].token_name, + WasJustMoving[x][y], + HAS_ANY_CHANGE_EVENT(element, CE_HITTING_SOMETHING), + HAS_ANY_CHANGE_EVENT(element, CE_HIT_BY_SOMETHING), + HAS_ANY_CHANGE_EVENT(element, CE_OTHER_IS_HITTING), + HAS_ANY_CHANGE_EVENT(element, CE_OTHER_GETS_HIT)); +#endif + +#if 1 + WasJustMoving[x][y] = 0; +#endif + + CheckCollision[x][y] = 0; + + TestIfElementHitsCustomElement(x, y, MovDir[x][y]); + +#if 0 + if (Feld[x][y] != element) /* element has changed */ + { + element = Feld[x][y]; + move_pattern = element_info[element].move_pattern; + + if (!CAN_MOVE(element)) + return; + } +#else + if (Feld[x][y] != element) /* element has changed */ + return; +#endif + } +#endif #if 0 #if 0 @@ -3352,6 +5561,11 @@ void StartMoving(int x, int y) #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 @@ -3360,10 +5574,20 @@ void StartMoving(int x, int y) if (element != EL_YAMYAM && element != EL_DARK_YAMYAM && element != EL_PACMAN && - !(element_info[element].move_pattern & MV_ANY_DIRECTION)) + !(move_pattern & MV_ANY_DIRECTION) && + move_pattern != MV_TURNING_LEFT && + move_pattern != MV_TURNING_RIGHT && + move_pattern != MV_TURNING_LEFT_RIGHT && + move_pattern != MV_TURNING_RIGHT_LEFT && + move_pattern != MV_TURNING_RANDOM) { 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 || @@ -3392,7 +5616,13 @@ void StartMoving(int x, int y) /* !!! 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 || @@ -3407,7 +5637,7 @@ void StartMoving(int x, int y) #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); @@ -3421,12 +5651,27 @@ void StartMoving(int x, int y) 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]); - for (i=1; i<=3; i++) +#if 0 + printf("::: %d, %d\n", GfxAction[x][y], GfxFrame[x][y]); +#endif + + 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])) @@ -3436,14 +5681,36 @@ void StartMoving(int x, int y) { int flamed = MovingOrBlocked2Element(xx, yy); - if (IS_CLASSIC_ENEMY(flamed) || CAN_EXPLODE_BY_FIRE(flamed)) + /* !!! */ +#if 0 + if (IS_CLASSIC_ENEMY(flamed) || CAN_EXPLODE_BY_DRAGONFIRE(flamed)) + Bang(xx, yy); + else if (IS_MOVING(xx, yy) || IS_BLOCKED(xx, yy)) + RemoveMovingField(xx, yy); + else + RemoveField(xx, yy); +#else + if (IS_CLASSIC_ENEMY(flamed) || CAN_EXPLODE_BY_DRAGONFIRE(flamed)) Bang(xx, yy); else RemoveMovingField(xx, yy); +#endif +#if 0 + if (ChangeDelay[xx][yy]) + printf("::: !!! [%d]\n", (IS_MOVING(xx, yy) || + Feld[xx][yy] == EL_BLOCKED)); +#endif + +#if 1 + ChangeDelay[xx][yy] = 0; +#endif Feld[xx][yy] = EL_FLAMES; if (IN_SCR_FIELD(sx, sy)) + { + DrawLevelFieldCrumbledSand(xx, yy); DrawGraphic(sx, sy, flame_graphic, frame); + } } else { @@ -3456,23 +5723,30 @@ void StartMoving(int x, int y) if (MovDelay[x][y]) /* element still has to wait some time */ { - PlaySoundLevelAction(x, y, ACTION_WAITING); + PlayLevelSoundAction(x, y, ACTION_WAITING); return; } - GfxAction[x][y] = ACTION_MOVING; +#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 */ Moving2Blocked(x, y, &newx, &newy); /* get next screen position */ - if (DONT_COLLIDE_WITH(element) && IS_PLAYER(newx, newy) && - !PLAYER_PROTECTED(newx, newy)) + if (DONT_COLLIDE_WITH(element) && + IN_LEV_FIELD(newx, newy) && IS_PLAYER(newx, newy) && + !PLAYER_ENEMY_PROTECTED(newx, newy)) { #if 1 TestIfBadThingRunsIntoHero(x, y, MovDir[x][y]); + return; #else /* player killed by element which is deadly when colliding with */ @@ -3482,6 +5756,18 @@ void StartMoving(int x, int y) #endif } +#if 1 +#if 1 + else if (CAN_MOVE_INTO_ACID(element) && + IN_LEV_FIELD(newx, newy) && Feld[newx][newy] == EL_ACID && + (MovDir[x][y] == MV_DOWN || + game.engine_version >= VERSION_IDENT(3,1,0,0))) +#else + else if (CAN_MOVE_INTO_ACID(element) && MovDir[x][y] == MV_DOWN && + IN_LEV_FIELD(newx, newy) && Feld[newx][newy] == EL_ACID) +#endif +#else + else if ((element == EL_PENGUIN || element == EL_ROBOT || element == EL_SATELLITE || @@ -3489,18 +5775,24 @@ void StartMoving(int x, int y) IS_CUSTOM_ELEMENT(element)) && IN_LEV_FIELD(newx, newy) && MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_ACID) +#endif { - SplashAcid(x, y); + SplashAcid(newx, newy); Store[x][y] = EL_ACID; } else if (element == EL_PENGUIN && IN_LEV_FIELD(newx, newy)) { if (Feld[newx][newy] == EL_EXIT_OPEN) { +#if 1 + RemoveField(x, y); + DrawLevelField(x, y); +#else Feld[x][y] = EL_EMPTY; DrawLevelField(x, y); +#endif - 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); @@ -3513,10 +5805,10 @@ void StartMoving(int x, int y) } else if (IS_FOOD_PENGUIN(Feld[newx][newy])) { - if (DigField(local_player, newx, newy, 0, 0, DF_DIG) == MF_MOVING) + if (DigField(local_player, x, y, 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)) { @@ -3526,6 +5818,7 @@ void StartMoving(int x, int y) DrawPlayerField(x, y); else DrawLevelField(x, y); + return; } } @@ -3541,7 +5834,7 @@ void StartMoving(int x, int y) DrawLevelField(newx, newy); } - PlaySoundLevel(x, y, SND_PIG_DIGGING); + PlayLevelSound(x, y, SND_PIG_DIGGING); } else if (!IS_FREE(newx, newy)) { @@ -3549,9 +5842,96 @@ void StartMoving(int x, int y) DrawPlayerField(x, y); else DrawLevelField(x, y); + return; } } + +#if 1 + + /* + else if (move_pattern & MV_MAZE_RUNNER_STYLE && IN_LEV_FIELD(newx, newy)) + */ + + else if (IS_CUSTOM_ELEMENT(element) && + CUSTOM_ELEMENT_CAN_ENTER_FIELD(element, newx, newy) + +#if 0 + && + !IS_FREE(newx, newy) +#endif + +) + { + int new_element = Feld[newx][newy]; + +#if 0 + printf("::: '%s' digs '%s' [%d]\n", + element_info[element].token_name, + element_info[Feld[newx][newy]].token_name, + StorePlayer[newx][newy]); +#endif + + if (!IS_FREE(newx, newy)) + { + int action = (IS_DIGGABLE(new_element) ? ACTION_DIGGING : + IS_COLLECTIBLE(new_element) ? ACTION_COLLECTING : + ACTION_BREAKING); + + /* no element can dig solid indestructible elements */ + if (IS_INDESTRUCTIBLE(new_element) && + !IS_DIGGABLE(new_element) && + !IS_COLLECTIBLE(new_element)) + return; + + if (AmoebaNr[newx][newy] && + (new_element == EL_AMOEBA_FULL || + new_element == EL_BD_AMOEBA || + new_element == EL_AMOEBA_GROWING)) + { + AmoebaCnt[AmoebaNr[newx][newy]]--; + AmoebaCnt2[AmoebaNr[newx][newy]]--; + } + + if (IS_MOVING(newx, newy)) + RemoveMovingField(newx, newy); + else + { + RemoveField(newx, newy); + DrawLevelField(newx, newy); + } + + /* if digged element was about to explode, prevent the explosion */ + ExplodeField[newx][newy] = EX_TYPE_NONE; + + PlayLevelSoundAction(x, y, action); + } + +#if 1 +#if 1 + Store[newx][newy] = EL_EMPTY; + if (IS_EQUAL_OR_IN_GROUP(new_element, MOVE_ENTER_EL(element))) + Store[newx][newy] = element_info[element].move_leave_element; +#else + Store[newx][newy] = EL_EMPTY; + if (IS_EQUAL_OR_IN_GROUP(new_element, MOVE_ENTER_EL(element)) || + element_info[element].move_leave_type == LEAVE_TYPE_UNLIMITED) + Store[newx][newy] = element_info[element].move_leave_element; +#endif +#else + if (IS_EQUAL_OR_IN_GROUP(new_element, MOVE_ENTER_EL(element))) + element_info[element].can_leave_element = TRUE; +#endif + + if (move_pattern & MV_MAZE_RUNNER_STYLE) + { + RunnerVisit[x][y] = FrameCounter; + PlayerVisit[x][y] /= 8; /* expire player visit path */ + } + } + +#endif + else if (element == EL_DRAGON && IN_LEV_FIELD(newx, newy)) { if (!IS_FREE(newx, newy)) @@ -3560,14 +5940,15 @@ void StartMoving(int x, int y) 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) ? @@ -3579,19 +5960,40 @@ void StartMoving(int x, int y) element1 != EL_DRAGON && element2 != EL_DRAGON && element1 != EL_FLAMES && element2 != EL_FLAMES) { +#if 1 + ResetGfxAnimation(x, y); + GfxAction[x][y] = ACTION_ATTACKING; +#endif + if (IS_PLAYER(x, y)) DrawPlayerField(x, y); else DrawLevelField(x, y); - PlaySoundLevel(x, y, SND_DRAGON_ATTACKING); + PlayLevelSound(x, y, SND_DRAGON_ATTACKING); MovDelay[x][y] = 50; + + /* !!! */ +#if 0 + RemoveField(newx, newy); +#endif Feld[newx][newy] = EL_FLAMES; if (IN_LEV_FIELD(newx1, newy1) && Feld[newx1][newy1] == EL_EMPTY) + { +#if 0 + RemoveField(newx1, newy1); +#endif Feld[newx1][newy1] = EL_FLAMES; + } if (IN_LEV_FIELD(newx2, newy2) && Feld[newx2][newy2] == EL_EMPTY) + { +#if 0 + RemoveField(newx2, newy2); +#endif Feld[newx2][newy2] = EL_FLAMES; + } + return; } } @@ -3607,7 +6009,7 @@ void StartMoving(int x, int y) 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])) @@ -3620,15 +6022,22 @@ void StartMoving(int x, int y) AmoebaCnt[AmoebaNr[newx][newy]]--; } +#if 0 + /* !!! test !!! */ + if (IS_MOVING(newx, newy) || IS_BLOCKED(newx, newy)) +#else if (IS_MOVING(newx, newy)) +#endif + { RemoveMovingField(newx, newy); + } else { Feld[newx][newy] = EL_EMPTY; 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])) @@ -3644,15 +6053,21 @@ void StartMoving(int x, int y) 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; + DrawLevelField(x, y); + MovDelay[newx][newy] = 0; /* start amoeba shrinking delay */ + return; /* wait for shrinking amoeba */ } else /* element == EL_PACMAN */ { 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) && @@ -3668,8 +6083,30 @@ void StartMoving(int x, int y) TurnRound(x, y); +#if 0 + if (move_pattern & MV_ANY_DIRECTION && + move_pattern == MovDir[x][y]) + { + int blocking_element = + (IN_LEV_FIELD(newx, newy) ? Feld[newx][newy] : BorderElement); + +#if 0 + printf("::: '%s' is blocked by '%s'! [%d,%d -> %d,%d]\n", + element_info[element].token_name, + element_info[blocking_element].token_name, + x, y, newx, newy); +#endif + + CheckElementChangeBySide(x, y, element, blocking_element, CE_BLOCKED, + MovDir[x][y]); + + element = Feld[x][y]; /* element might have changed */ + } +#endif + #if 1 - DrawLevelElementAnimation(x, y, element); + if (GFX_ELEMENT(element) != EL_SAND) /* !!! FIX THIS (crumble) !!! */ + DrawLevelElementAnimation(x, y, element); #else if (element == EL_BUG || element == EL_SPACESHIP || @@ -3690,7 +6127,7 @@ void StartMoving(int x, int y) TestIfBadThingTouchesHero(x, y); #if 0 - PlaySoundLevelAction(x, y, ACTION_WAITING); + PlayLevelSoundAction(x, y, ACTION_WAITING); #endif return; @@ -3698,7 +6135,7 @@ void StartMoving(int x, int y) InitMovingField(x, y, MovDir[x][y]); - PlaySoundLevelAction(x, y, ACTION_MOVING); + PlayLevelSoundAction(x, y, ACTION_MOVING); } if (MovDir[x][y]) @@ -3708,219 +6145,474 @@ void StartMoving(int x, int y) void ContinueMoving(int x, int y) { int element = Feld[x][y]; + int stored = Store[x][y]; + struct ElementInfo *ei = &element_info[element]; int direction = MovDir[x][y]; int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); - int horiz_move = (dx != 0); int newx = x + dx, newy = y + dy; - int step = (horiz_move ? dx : dy) * TILEX / MOVE_DELAY_NORMAL_SPEED; - - if (element == EL_AMOEBA_DROP || element == EL_AMOEBA_DROPPING) - step /= 2; - else if (element == EL_QUICKSAND_FILLING || - element == EL_QUICKSAND_EMPTYING) - step /= 4; - else if (element == EL_MAGIC_WALL_FILLING || - element == EL_BD_MAGIC_WALL_FILLING || - element == EL_MAGIC_WALL_EMPTYING || - element == EL_BD_MAGIC_WALL_EMPTYING) - step /= 2; - else if (CAN_FALL(element) && horiz_move && - y < lev_fieldy-1 && IS_BELT_ACTIVE(Feld[x][y+1])) - step /= 2; - else if (element == EL_SPRING && horiz_move) - step *= 2; - else if (IS_CUSTOM_ELEMENT(element)) - step = SIGN(step) * element_info[element].move_stepsize; - -#if OLD_GAME_BEHAVIOUR - else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element)) - step*=2; +#if 0 + int nextx = newx + dx, nexty = newy + dy; +#endif +#if 1 + boolean pushed_by_player = (Pushed[x][y] && IS_PLAYER(x, y)); + boolean pushed_by_conveyor = (Pushed[x][y] && !IS_PLAYER(x, y)); +#else + boolean pushed_by_player = Pushed[x][y]; #endif - MovPos[x][y] += step; + MovPos[x][y] += getElementMoveStepsize(x, y); - if (ABS(MovPos[x][y]) >= TILEX) /* object reached its destination */ +#if 0 + if (pushed_by_player && IS_PLAYER(x, y)) { - Feld[x][y] = EL_EMPTY; - Feld[newx][newy] = element; - - if (element == EL_MOLE) - { - int i; - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; - - Feld[x][y] = EL_SAND; - DrawLevelField(x, y); - - for(i=0; i<4; i++) - { - int xx, yy; - - xx = x + xy[i][0]; - yy = y + xy[i][1]; - - if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_SAND) - DrawLevelField(xx, yy); /* for "crumbled sand" */ - } - } + /* special case: moving object pushed by player */ + MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos)); + } +#else + if (pushed_by_player) /* special case: moving object pushed by player */ + MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos)); +#endif - 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 (Store[x][y] == EL_ACID) - { - element = Feld[newx][newy] = EL_ACID; - } + if (ABS(MovPos[x][y]) < TILEX) + { + DrawLevelField(x, y); - Store[x][y] = 0; - MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; - MovDelay[newx][newy] = 0; + return; /* element is still moving */ + } - /* 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 */ + /* element reached destination field */ - ResetGfxAnimation(x, y); /* reset animation values for old field */ + Feld[x][y] = EL_EMPTY; + Feld[newx][newy] = element; + MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */ #if 1 -#if 0 - if (!CAN_MOVE(element)) - MovDir[newx][newy] = 0; -#else - /* - if (CAN_FALL(element) && 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; -#endif + if (Store[x][y] == EL_ACID) /* element is moving into acid pool */ + { + element = Feld[newx][newy] = EL_ACID; + } #endif + else if (element == EL_MOLE) + { + Feld[x][y] = EL_SAND; - DrawLevelField(x, y); - DrawLevelField(newx, newy); - - Stop[newx][newy] = TRUE; - JustStopped[newx][newy] = 3; - - if (DONT_TOUCH(element)) /* object may be nasty to player or others */ - { - TestIfBadThingTouchesHero(newx, newy); - TestIfBadThingTouchesFriend(newx, newy); - TestIfBadThingTouchesOtherBadThing(newx, newy); - } - else if (element == EL_PENGUIN) - TestIfFriendTouchesBadThing(newx, newy); - - if (CAN_SMASH(element) && direction == MV_DOWN && - (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) - Impact(x, newy); + DrawLevelFieldCrumbledSandNeighbours(x, y); } - else /* still moving on */ + else if (element == EL_QUICKSAND_FILLING) { - DrawLevelField(x, y); + element = Feld[newx][newy] = get_next_element(element); + Store[newx][newy] = Store[x][y]; } -} - -int AmoebeNachbarNr(int ax, int ay) -{ - int i; - int element = Feld[ax][ay]; - int group_nr = 0; - static int xy[4][2] = + else if (element == EL_QUICKSAND_EMPTYING) { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + 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]; + + if (Back[newx][newy]) + Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL; - for (i=0; i<4; i++) + Back[x][y] = Back[newx][newy] = 0; + } +#if 0 + else if (Store[x][y] == EL_ACID) { - int x = ax + xy[i][0]; - int y = ay + xy[i][1]; + element = Feld[newx][newy] = EL_ACID; + } +#endif +#if 0 + else if (IS_CUSTOM_ELEMENT(element) && !IS_PLAYER(x, y) && + ei->move_leave_element != EL_EMPTY && + (ei->move_leave_type == LEAVE_TYPE_UNLIMITED || + Store[x][y] != EL_EMPTY)) + { + /* some elements can leave other elements behind after moving */ - if (!IN_LEV_FIELD(x, y)) - continue; + Feld[x][y] = ei->move_leave_element; + InitField(x, y, FALSE); - if (Feld[x][y] == element && AmoebaNr[x][y] > 0) - group_nr = AmoebaNr[x][y]; + if (GFX_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSandNeighbours(x, y); } +#endif - return group_nr; -} + Store[x][y] = EL_EMPTY; + MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; + MovDelay[newx][newy] = 0; -void AmoebenVereinigen(int ax, int ay) -{ - int i, x, y, xx, yy; - int new_group_nr = AmoebaNr[ax][ay]; - static int xy[4][2] = + if (CAN_CHANGE(element)) { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + /* 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]; + } - if (new_group_nr == 0) - return; + ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; + Changed[x][y] = CE_BITMASK_DEFAULT; + ChangeEvent[x][y] = CE_BITMASK_DEFAULT; - for (i=0; i<4; i++) - { - x = ax + xy[i][0]; - y = ay + xy[i][1]; + /* 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 */ - if (!IN_LEV_FIELD(x, y)) - continue; + Pushed[x][y] = Pushed[newx][newy] = FALSE; + + ResetGfxAnimation(x, y); /* reset animation values for old field */ + +#if 1 + /* some elements can leave other elements behind after moving */ +#if 1 + if (IS_CUSTOM_ELEMENT(element) && ei->move_leave_element != EL_EMPTY && + (ei->move_leave_type == LEAVE_TYPE_UNLIMITED || stored != EL_EMPTY) && + (!IS_PLAYER(x, y) || IS_WALKABLE(ei->move_leave_element))) +#else + if (IS_CUSTOM_ELEMENT(element) && ei->move_leave_element != EL_EMPTY && + (ei->move_leave_type == LEAVE_TYPE_UNLIMITED || stored != EL_EMPTY) && + !IS_PLAYER(x, y)) +#endif + { + int move_leave_element = ei->move_leave_element; + + Feld[x][y] = move_leave_element; + InitField(x, y, FALSE); + + if (GFX_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSandNeighbours(x, y); + + if (ELEM_IS_PLAYER(move_leave_element)) + RelocatePlayer(x, y, move_leave_element); + } +#endif + +#if 0 + /* some elements can leave other elements behind after moving */ + if (IS_CUSTOM_ELEMENT(element) && !IS_PLAYER(x, y) && + ei->move_leave_element != EL_EMPTY && + (ei->move_leave_type == LEAVE_TYPE_UNLIMITED || + ei->can_leave_element_last)) + { + Feld[x][y] = ei->move_leave_element; + InitField(x, y, FALSE); + + if (GFX_CRUMBLED(Feld[x][y])) + DrawLevelFieldCrumbledSandNeighbours(x, y); + } + + ei->can_leave_element_last = ei->can_leave_element; + ei->can_leave_element = FALSE; +#endif + +#if 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; +#else + /* + if (!CAN_MOVE(element) || + (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN)) + MovDir[newx][newy] = 0; + */ + +#if 0 + if (!CAN_MOVE(element) || + (CAN_FALL(element) && direction == MV_DOWN)) + GfxDir[x][y] = MovDir[newx][newy] = 0; +#else + if (!CAN_MOVE(element) || + (CAN_FALL(element) && direction == MV_DOWN && + (element == EL_SPRING || + element_info[element].move_pattern == MV_WHEN_PUSHED || + element_info[element].move_pattern == MV_WHEN_DROPPED))) + GfxDir[x][y] = MovDir[newx][newy] = 0; +#endif + +#endif +#endif + + DrawLevelField(x, y); + DrawLevelField(newx, newy); + + Stop[newx][newy] = TRUE; /* ignore this element until the next frame */ + + /* prevent pushed element from moving on in pushed direction */ + if (pushed_by_player && CAN_MOVE(element) && + element_info[element].move_pattern & MV_ANY_DIRECTION && + !(element_info[element].move_pattern & direction)) + TurnRound(newx, newy); + +#if 1 + /* prevent elements on conveyor belt from moving on in last direction */ + if (pushed_by_conveyor && CAN_FALL(element) && + direction & MV_HORIZONTAL) + { +#if 0 + if (CAN_MOVE(element)) + InitMovDir(newx, newy); + else + MovDir[newx][newy] = 0; +#else + MovDir[newx][newy] = 0; +#endif + } +#endif + + if (!pushed_by_player) + { + int nextx = newx + dx, nexty = newy + dy; + boolean check_collision_again = IN_LEV_FIELD_AND_IS_FREE(nextx, nexty); + + WasJustMoving[newx][newy] = 3; + + if (CAN_FALL(element) && direction == MV_DOWN) + WasJustFalling[newx][newy] = 3; + + if ((!CAN_FALL(element) || direction == MV_DOWN) && check_collision_again) + CheckCollision[newx][newy] = 2; + } + + 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); + +#if USE_NEW_MOVE_STYLE +#if 0 + if (CAN_FALL(element) && direction == MV_DOWN && + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1)) && + IS_PLAYER(x, newy + 1)) + printf("::: we would now kill the player [%d]\n", FrameCounter); +#endif + + /* give the player one last chance (one more frame) to move away */ + if (CAN_FALL(element) && direction == MV_DOWN && + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1)) && + !IS_PLAYER(x, newy + 1)) + Impact(x, newy); +#else + if (CAN_FALL(element) && direction == MV_DOWN && + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) + Impact(x, newy); +#endif + +#if 1 + if (pushed_by_player) + { +#if 1 + int dig_side = MV_DIR_OPPOSITE(direction); +#else + static int trigger_sides[4] = + { + CH_SIDE_RIGHT, /* moving left */ + CH_SIDE_LEFT, /* moving right */ + CH_SIDE_BOTTOM, /* moving up */ + CH_SIDE_TOP, /* moving down */ + }; + int dig_side = trigger_sides[MV_DIR_BIT(direction)]; +#endif + struct PlayerInfo *player = PLAYERINFO(x, y); + + CheckElementChangeByPlayer(newx, newy, element, CE_PUSHED_BY_PLAYER, + player->index_bit, dig_side); + CheckTriggeredElementChangeByPlayer(newx,newy,element,CE_OTHER_GETS_PUSHED, + player->index_bit, dig_side); + } +#endif + +#if 1 + TestIfElementTouchesCustomElement(x, y); /* empty or new element */ +#endif + +#if 0 + if (ChangePage[newx][newy] != -1) /* delayed change */ + ChangeElement(newx, newy, ChangePage[newx][newy]); +#endif + +#if 1 + + TestIfElementHitsCustomElement(newx, newy, direction); + +#else + + if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) + { + int hitting_element = Feld[newx][newy]; + + /* !!! fix side (direction) orientation here and elsewhere !!! */ + CheckElementChangeBySide(newx, newy, hitting_element, CE_HITTING_SOMETHING, + direction); + +#if 0 + if (IN_LEV_FIELD(nextx, nexty)) + { + int opposite_direction = MV_DIR_OPPOSITE(direction); + int hitting_side = direction; + int touched_side = opposite_direction; + int touched_element = MovingOrBlocked2Element(nextx, nexty); + boolean object_hit = (!IS_MOVING(nextx, nexty) || + MovDir[nextx][nexty] != direction || + ABS(MovPos[nextx][nexty]) <= TILEY / 2); + + if (object_hit) + { + int i; + + CheckElementChangeBySide(nextx, nexty, touched_element, + CE_HIT_BY_SOMETHING, opposite_direction); + + if (IS_CUSTOM_ELEMENT(hitting_element) && + HAS_ANY_CHANGE_EVENT(hitting_element, CE_OTHER_IS_HITTING)) + { + for (i = 0; i < element_info[hitting_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[hitting_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_HITTING) && + change->trigger_side & touched_side && + change->trigger_element == touched_element) + { + CheckElementChangeByPage(newx, newy, hitting_element, + touched_element, CE_OTHER_IS_HITTING,i); + break; + } + } + } + + if (IS_CUSTOM_ELEMENT(touched_element) && + HAS_ANY_CHANGE_EVENT(touched_element, CE_OTHER_GETS_HIT)) + { + for (i = 0; i < element_info[touched_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[touched_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_GETS_HIT) && + change->trigger_side & hitting_side && + change->trigger_element == hitting_element) + { + CheckElementChangeByPage(nextx, nexty, touched_element, + hitting_element, CE_OTHER_GETS_HIT, i); + break; + } + } + } + } + } +#endif + } +#endif + + TestIfPlayerTouchesCustomElement(newx, newy); + TestIfElementTouchesCustomElement(newx, newy); +} + +int AmoebeNachbarNr(int ax, int ay) +{ + int i; + int element = Feld[ax][ay]; + int group_nr = 0; + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + + for (i = 0; i < NUM_DIRECTIONS; i++) + { + int x = ax + xy[i][0]; + int y = ay + xy[i][1]; + + if (!IN_LEV_FIELD(x, y)) + continue; + + if (Feld[x][y] == element && AmoebaNr[x][y] > 0) + group_nr = AmoebaNr[x][y]; + } + + return group_nr; +} + +void AmoebenVereinigen(int ax, int ay) +{ + int i, x, y, xx, yy; + int new_group_nr = AmoebaNr[ax][ay]; + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + + if (new_group_nr == 0) + return; + + for (i = 0; i < NUM_DIRECTIONS; i++) + { + x = ax + xy[i][0]; + y = ay + xy[i][1]; + + if (!IN_LEV_FIELD(x, y)) + continue; if ((Feld[x][y] == EL_AMOEBA_FULL || Feld[x][y] == EL_BD_AMOEBA || @@ -3937,9 +6629,9 @@ void AmoebenVereinigen(int ax, int ay) AmoebaCnt2[new_group_nr] += AmoebaCnt2[old_group_nr]; AmoebaCnt2[old_group_nr] = 0; - for (yy=0; yy= life[2] && nachbarn <= life[3]) + { + Feld[xx][yy] = element; + MovDelay[xx][yy] = (element == EL_GAME_OF_LIFE ? 0 : life_time-1); + if (!Stop[xx][yy]) + DrawLevelField(xx, yy); + Stop[xx][yy] = TRUE; + changed = TRUE; + } + } +#else + /* !!! extend EL_SAND to anything diggable (but maybe not SP_BASE) !!! */ else if (IS_FREE(xx, yy) || Feld[xx][yy] == EL_SAND) { /* free border field */ if (nachbarn >= life[2] && nachbarn <= life[3]) @@ -4352,21 +7086,22 @@ void Life(int ax, int ay) changed = TRUE; } } +#endif } 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 InitRobotWheel(int x, int y) { - MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; + ChangeDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; } 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) @@ -4377,12 +7112,17 @@ static void StopRobotWheel(int x, int y) static void InitTimegateWheel(int x, int y) { - MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; +#if 1 + ChangeDelay[x][y] = level.time_timegate * FRAMES_PER_SECOND; +#else + /* another brainless, "type style" bug ... :-( */ + ChangeDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; +#endif } 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) @@ -4400,9 +7140,12 @@ void CheckExit(int x, int y) return; } + if (AllPlayersGone) /* do not re-open exit door closed after last player */ + return; + 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) @@ -4418,18 +7161,21 @@ void CheckExitSP(int x, int y) return; } - Feld[x][y] = EL_SP_EXIT_OPEN; + if (AllPlayersGone) /* do not re-open exit door closed after last player */ + return; + + 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() { int x, y; - for (y=0; yindex_nr] = 0; - num_stored_actions++; +#if 0 + TestIfBadThingTouchesHero(x, y); + TestIfPlayerTouchesCustomElement(x, y); + TestIfElementTouchesCustomElement(x, y); +#endif - if (!player->active || tape.pausing) - return; + /* "Changed[][]" not set yet to allow "entered by player" change one time */ + if (ELEM_IS_PLAYER(target_element)) + RelocatePlayer(x, y, target_element); - if (player_action) - { - if (button1) - snapped = SnapField(player, dx, dy); - else - { - if (button2) - bombed = PlaceBomb(player); - moved = MoveFigure(player, dx, dy); - } +#if 1 + Changed[x][y] |= ChangeEvent[x][y]; /* ignore same changes in this frame */ +#endif - if (tape.single_step && tape.recording && !tape.pausing) - { - if (button1 || (bombed && !moved)) - { - TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); - SnapField(player, 0, 0); /* stop snapping */ - } - } +#if 1 + TestIfBadThingTouchesHero(x, y); + TestIfPlayerTouchesCustomElement(x, y); + TestIfElementTouchesCustomElement(x, y); +#endif +} - stored_player_action[player->index_nr] = player_action; - } - else +static boolean ChangeElementNow(int x, int y, int element, int page) +{ + struct ElementChangeInfo *change = &element_info[element].change_page[page]; + int target_element; + int old_element = Feld[x][y]; + + /* always use default change event to prevent running into a loop */ + if (ChangeEvent[x][y] == CE_BITMASK_DEFAULT) + ChangeEvent[x][y] = CH_EVENT_BIT(CE_DELAY); + + if (ChangeEvent[x][y] == CH_EVENT_BIT(CE_DELAY)) { - /* no actions for this player (no input at player's configured device) */ + /* reset actual trigger element and player */ + change->actual_trigger_element = EL_EMPTY; + change->actual_trigger_player = EL_PLAYER_1; + } - DigField(player, 0, 0, 0, 0, DF_NO_PUSH); - SnapField(player, 0, 0); - CheckGravityMovement(player); + /* do not change already changed elements with same change event */ +#if 0 + if (Changed[x][y] & ChangeEvent[x][y]) + return FALSE; +#else + if (Changed[x][y]) + return FALSE; +#endif + + Changed[x][y] |= ChangeEvent[x][y]; /* ignore same changes in this frame */ - if (player->MovPos == 0) - { #if 0 - printf("Trying... Player frame reset\n"); + /* !!! indirect change before direct change !!! */ + CheckTriggeredElementChangeByPage(x,y,Feld[x][y], CE_OTHER_IS_CHANGING,page); #endif - InitPlayerGfxAnimation(player, ACTION_DEFAULT, player->MovDir); - } + if (change->explode) + { + Bang(x, y); - if (player->MovPos == 0) /* needed for tape.playing */ - player->is_moving = FALSE; + return TRUE; } - if (tape.recording && num_stored_actions >= MAX_PLAYERS) + if (change->use_target_content) { - TapeRecordAction(stored_player_action); - num_stored_actions = 0; - } -} + boolean complete_replace = TRUE; + boolean can_replace[3][3]; + int xx, yy; -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; + for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3 ; xx++) + { + boolean is_empty; + boolean is_walkable; + boolean is_diggable; + boolean is_collectible; + boolean is_removable; + boolean is_destructible; + int ex = x + xx - 1; + int ey = y + yy - 1; + int content_element = change->target_content[xx][yy]; + int e; - if (game_status != GAME_MODE_PLAYING) - return; + can_replace[xx][yy] = TRUE; - action_delay_value = - (tape.playing && tape.fast_forward ? FfwdFrameDelay : GameFrameDelay); + if (ex == x && ey == y) /* do not check changing element itself */ + continue; - if (tape.playing && tape.index_search && !tape.pausing) - action_delay_value = 0; + if (content_element == EL_EMPTY_SPACE) + { + can_replace[xx][yy] = FALSE; /* do not replace border with space */ - /* ---------- main game synchronization point ---------- */ + continue; + } - WaitUntilDelayReached(&action_delay, action_delay_value); + if (!IN_LEV_FIELD(ex, ey)) + { + can_replace[xx][yy] = FALSE; + complete_replace = FALSE; - if (network_playing && !network_player_action_received) - { - /* -#ifdef DEBUG - printf("DEBUG: try to get network player actions in time\n"); + continue; + } + +#if 0 + if (Changed[ex][ey]) /* do not change already changed elements */ + { + can_replace[xx][yy] = FALSE; + complete_replace = FALSE; + + continue; + } #endif - */ -#if defined(PLATFORM_UNIX) - /* last chance to get network player actions without main loop delay */ - HandleNetworking(); + e = Feld[ex][ey]; + + if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey)) + e = MovingOrBlocked2Element(ex, ey); + +#if 1 + +#if 0 + is_empty = (IS_FREE(ex, ey) || + (IS_PLAYER(ex, ey) && IS_WALKABLE(content_element)) || + (IS_WALKABLE(e) && ELEM_IS_PLAYER(content_element) && + !IS_MOVING(ex, ey) && !IS_BLOCKED(ex, ey))); +#else + +#if 0 + is_empty = (IS_FREE(ex, ey) || + (IS_PLAYER(ex, ey) && IS_WALKABLE(content_element))); +#else + is_empty = (IS_FREE(ex, ey) || + (IS_FREE_OR_PLAYER(ex, ey) && IS_WALKABLE(content_element))); #endif - if (game_status != GAME_MODE_PLAYING) - return; +#endif - if (!network_player_action_received) - { - /* -#ifdef DEBUG - printf("DEBUG: failed to get network player actions in time\n"); + is_walkable = (is_empty || IS_WALKABLE(e)); + is_diggable = (is_empty || IS_DIGGABLE(e)); + is_collectible = (is_empty || IS_COLLECTIBLE(e)); + is_destructible = (is_empty || !IS_INDESTRUCTIBLE(e)); + is_removable = (is_diggable || is_collectible); + + can_replace[xx][yy] = + (((change->replace_when == CP_WHEN_EMPTY && is_empty) || + (change->replace_when == CP_WHEN_WALKABLE && is_walkable) || + (change->replace_when == CP_WHEN_DIGGABLE && is_diggable) || + (change->replace_when == CP_WHEN_COLLECTIBLE && is_collectible) || + (change->replace_when == CP_WHEN_REMOVABLE && is_removable) || + (change->replace_when == CP_WHEN_DESTRUCTIBLE && is_destructible)) && + !(IS_PLAYER(ex, ey) && ELEM_IS_PLAYER(content_element))); + + if (!can_replace[xx][yy]) + complete_replace = FALSE; +#else + empty_for_element = (IS_FREE(ex, ey) || (IS_FREE_OR_PLAYER(ex, ey) && + IS_WALKABLE(content_element))); +#if 1 + half_destructible = (empty_for_element || IS_DIGGABLE(e)); +#else + half_destructible = (IS_FREE(ex, ey) || IS_DIGGABLE(e)); +#endif + + if ((change->replace_when <= CP_WHEN_EMPTY && !empty_for_element) || + (change->replace_when <= CP_WHEN_DIGGABLE && !half_destructible) || + (change->replace_when <= CP_WHEN_DESTRUCTIBLE && IS_INDESTRUCTIBLE(e))) + { + can_replace[xx][yy] = FALSE; + complete_replace = FALSE; + } #endif - */ - return; } - } - if (tape.pausing) - return; + if (!change->only_if_complete || complete_replace) + { + boolean something_has_changed = FALSE; - recorded_player_action = (tape.playing ? TapePlayAction() : NULL); + if (change->only_if_complete && change->use_random_replace && + RND(100) < change->random_percentage) + return FALSE; + + for (yy = 0; yy < 3; yy++) for (xx = 0; xx < 3 ; xx++) + { + int ex = x + xx - 1; + int ey = y + yy - 1; + int content_element; + + if (can_replace[xx][yy] && (!change->use_random_replace || + RND(100) < change->random_percentage)) + { + if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey)) + RemoveMovingField(ex, ey); + + ChangeEvent[ex][ey] = ChangeEvent[x][y]; + + content_element = change->target_content[xx][yy]; + target_element = GET_TARGET_ELEMENT(content_element, change); - for (i=0; itarget_element, change); - if (!network_playing) - stored_player[i].effective_action = stored_player[i].action; + ChangeElementNowExt(x, y, target_element); + + PlayLevelSoundElementAction(x, y, element, ACTION_CHANGING); } -#if defined(PLATFORM_UNIX) - if (network_playing) - SendToServer_MovePlayer(summarized_player_action); +#if 1 + /* this uses direct change before indirect change */ + CheckTriggeredElementChangeByPage(x,y,old_element,CE_OTHER_IS_CHANGING,page); #endif - if (!options.network && !setup.team_mode) - local_player->effective_action = summarized_player_action; + return TRUE; +} - for (i=0; ichange_page[page]; - if (stored_player[i].programmed_action) - actual_player_action = stored_player[i].programmed_action; +#ifdef DEBUG + if (!CAN_CHANGE(element) && !CAN_CHANGE(Back[x][y])) + { + printf("\n\n"); + printf("ChangeElement(): %d,%d: element = %d ('%s')\n", + x, y, element, element_info[element].token_name); + printf("ChangeElement(): This should never happen!\n"); + printf("\n\n"); + } +#endif - if (recorded_player_action) - actual_player_action = recorded_player_action[i]; + /* this can happen with classic bombs on walkable, changing elements */ + if (!CAN_CHANGE(element)) + { +#if 0 + if (!CAN_CHANGE(Back[x][y])) /* prevent permanent repetition */ + ChangeDelay[x][y] = 0; +#endif - PlayerActions(&stored_player[i], actual_player_action); - ScrollFigure(&stored_player[i], SCROLL_GO_ON); + return; } - network_player_action_received = FALSE; + if (ChangeDelay[x][y] == 0) /* initialize element change */ + { + ChangeDelay[x][y] = ( change->delay_fixed * change->delay_frames + + RND(change->delay_random * change->delay_frames)) + 1; - ScrollScreen(NULL, SCROLL_GO_ON); + ResetGfxAnimation(x, y); + ResetRandomAnimationValue(x, y); -#if 0 - FrameCounter++; - TimeFrames++; + if (change->pre_change_function) + change->pre_change_function(x, y); + } - for (i=0; i 0) - JustStopped[x][y]--; + int graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); - GfxFrame[x][y]++; + if (IS_ANIMATED(graphic)) + DrawLevelGraphicAnimationIfNeeded(x, y, graphic); -#if DEBUG - if (IS_BLOCKED(x, y)) + if (change->change_function) + change->change_function(x, y); + } + else /* finish element change */ + { + if (ChangePage[x][y] != -1) /* remember page from delayed change */ { - int oldx, oldy; + page = ChangePage[x][y]; + ChangePage[x][y] = -1; - Blocked2Moving(x, y, &oldx, &oldy); - if (!IS_MOVING(oldx, oldy)) - { - printf("GameActions(): (BLOCKED => MOVING) context corrupted!\n"); - printf("GameActions(): BLOCKED: x = %d, y = %d\n", x, y); - printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n", oldx, oldy); - printf("GameActions(): This should never happen!\n"); - } + change = &ei->change_page[page]; } -#endif - } - for (y=0; yexplode) #else - graphic = el2img(element); + if (IS_MOVING(x, y)) /* never change a running system ;-) */ #endif - -#if 0 - if (element == -1) { - printf("::: %d,%d: %d [%d]\n", x, y, element, FrameCounter); + ChangeDelay[x][y] = 1; /* try change after next move step */ + ChangePage[x][y] = page; /* remember page to use for change */ - element = graphic = 0; + return; } -#endif - if (graphic_info[graphic].anim_global_sync) - GfxFrame[x][y] = FrameCounter; + if (ChangeElementNow(x, y, element, page)) + { + if (change->post_change_function) + change->post_change_function(x, y); + } + } +} - if (ANIM_MODE(graphic) == ANIM_RANDOM && - IS_NEXT_FRAME(GfxFrame[x][y], graphic)) - ResetRandomAnimationValue(x, y); +static boolean CheckTriggeredElementChangeExt(int lx, int ly, + int trigger_element, + int trigger_event, + int trigger_player, + int trigger_side, + int trigger_page) +{ + int i, j, x, y; + int trigger_page_bits = (trigger_page < 0 ? CH_PAGE_ANY : 1 << trigger_page); - SetRandomAnimationValue(x, y); + if (!(trigger_events[trigger_element] & CH_EVENT_BIT(trigger_event))) + return FALSE; -#if 1 - PlaySoundLevelActionIfLoop(x, y, GfxAction[x][y]); -#endif + for (i = 0; i < NUM_CUSTOM_ELEMENTS; i++) + { + int element = EL_CUSTOM_START + i; - if (IS_INACTIVE(element)) - { - if (IS_ANIMATED(graphic)) - DrawLevelGraphicAnimationIfNeeded(x, y, graphic); + boolean change_element = FALSE; + int page = 0; + if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event)) continue; - } - if (!IS_MOVING(x, y) && (CAN_FALL(element) || CAN_MOVE(element))) + for (j = 0; j < element_info[element].num_change_pages; j++) { - StartMoving(x, y); + struct ElementChangeInfo *change = &element_info[element].change_page[j]; -#if 1 - graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]); -#if 0 - if (element == EL_PACMAN) - printf("::: %d, %d, %d\n", - IS_ANIMATED(graphic), IS_MOVING(x, y), Stop[x][y]); -#endif + if (change->can_change && + change->events & CH_EVENT_BIT(trigger_event) && + change->trigger_side & trigger_side && + change->trigger_player & trigger_player && + change->trigger_page & trigger_page_bits && + IS_EQUAL_OR_IN_GROUP(trigger_element, change->trigger_element)) + { #if 0 - if (element == EL_YAMYAM) - printf("::: %d, %d, %d\n", - IS_ANIMATED(graphic), IS_MOVING(x, y), Stop[x][y]); -#endif + 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 - if (IS_ANIMATED(graphic) && - !IS_MOVING(x, y) && - !Stop[x][y]) - { - DrawLevelGraphicAnimationIfNeeded(x, y, graphic); + change_element = TRUE; + page = j; -#if 0 - if (element == EL_YAMYAM) - printf("::: %d, %d\n", graphic, GfxFrame[x][y]); -#endif - } + change->actual_trigger_element = trigger_element; + change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player); - if (IS_GEM(element) || element == EL_SP_INFOTRON) - EdelsteinFunkeln(x, y); + break; + } } - else if ((element == EL_ACID || - element == EL_EXIT_OPEN || - element == EL_SP_EXIT_OPEN || - element == EL_SP_TERMINAL || - element == EL_SP_TERMINAL_ACTIVE || - element == EL_EXTRA_TIME || - element == EL_SHIELD_NORMAL || - element == EL_SHIELD_DEADLY) && - IS_ANIMATED(graphic)) - DrawLevelGraphicAnimationIfNeeded(x, y, graphic); - else if (IS_MOVING(x, y)) - ContinueMoving(x, y); - else if (IS_ACTIVE_BOMB(element)) - CheckDynamite(x, y); -#if 0 - else if (element == EL_EXPLOSION && !game.explosions_delayed) - Explode(x, y, ExplodePhase[x][y], EX_NORMAL); -#endif - else if (element == EL_AMOEBA_GROWING) - AmoebeWaechst(x, y); - else if (element == EL_AMOEBA_SHRINKING) - AmoebaDisappearing(x, y); -#if !USE_NEW_AMOEBA_CODE - else if (IS_AMOEBALIVE(element)) - AmoebeAbleger(x, y); -#endif + if (!change_element) + continue; - else if (element == EL_GAME_OF_LIFE || element == EL_BIOMAZE) - Life(x, y); - else if (element == EL_EXIT_CLOSED) - CheckExit(x, y); - else if (element == EL_SP_EXIT_CLOSED) - CheckExitSP(x, y); - else if (element == EL_EXPANDABLE_WALL_GROWING) - MauerWaechst(x, y); - else if (element == EL_EXPANDABLE_WALL || - element == EL_EXPANDABLE_WALL_HORIZONTAL || - element == EL_EXPANDABLE_WALL_VERTICAL || - element == EL_EXPANDABLE_WALL_ANY) - MauerAbleger(x, y); - else if (element == EL_FLAMES) - CheckForDragon(x, y); + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { #if 0 - else if (IS_AUTO_CHANGING(element)) - ChangeElement(x, y); -#endif - else if (element == EL_EXPLOSION) - ; /* drawing of correct explosion animation is handled separately */ - else if (IS_ANIMATED(graphic) && !IS_AUTO_CHANGING(element)) - DrawLevelGraphicAnimationIfNeeded(x, y, graphic); - -#if 1 - /* this may take place after moving, therefore element may have changed */ - if (IS_AUTO_CHANGING(Feld[x][y])) - ChangeElement(x, y); + if (x == lx && y == ly) /* do not change trigger element itself */ + continue; #endif - if (IS_BELT_ACTIVE(element)) - PlaySoundLevelAction(x, y, ACTION_ACTIVE); - - if (game.magic_wall_active) - { - int jx = local_player->jx, jy = local_player->jy; - - /* play the element sound at the position nearest to the player */ - if ((element == EL_MAGIC_WALL_FULL || - element == EL_MAGIC_WALL_ACTIVE || - element == EL_MAGIC_WALL_EMPTYING || - element == EL_BD_MAGIC_WALL_FULL || - element == EL_BD_MAGIC_WALL_ACTIVE || - element == EL_BD_MAGIC_WALL_EMPTYING) && - ABS(x-jx) + ABS(y-jy) < ABS(magic_wall_x-jx) + ABS(magic_wall_y-jy)) + if (Feld[x][y] == element) { - magic_wall_x = x; - magic_wall_y = y; + ChangeDelay[x][y] = 1; + ChangeEvent[x][y] = CH_EVENT_BIT(trigger_event); + ChangeElement(x, y, page); } } } -#if USE_NEW_AMOEBA_CODE - /* new experimental amoeba growth stuff */ -#if 1 - if (!(FrameCounter % 8)) -#endif + return TRUE; +} + +static boolean CheckElementChangeExt(int x, int y, + int element, + int trigger_element, + int trigger_event, + int trigger_player, + int trigger_side, + int trigger_page) +{ + if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event)) + return FALSE; + + if (Feld[x][y] == EL_BLOCKED) { - static unsigned long random = 1684108901; + Blocked2Moving(x, y, &x, &y); + element = Feld[x][y]; + } - for (i = 0; i < level.amoeba_speed * 28 / 8; i++) - { +#if 1 + if (Feld[x][y] != element) /* check if element has already changed */ + { #if 0 - x = (random >> 10) % lev_fieldx; - y = (random >> 20) % lev_fieldy; -#else - x = RND(lev_fieldx); - y = RND(lev_fieldy); + printf("::: %d ('%s') != %d ('%s') [%d]\n", + Feld[x][y], element_info[Feld[x][y]].token_name, + element, element_info[element].token_name, + trigger_event); #endif - element = Feld[x][y]; - - if (!IS_PLAYER(x,y) && - (element == EL_EMPTY || - element == EL_SAND || - element == EL_QUICKSAND_EMPTY || - element == EL_ACID_SPLASH_LEFT || - element == EL_ACID_SPLASH_RIGHT)) - { - if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBA_WET) || - (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBA_WET) || - (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBA_WET) || - (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBA_WET)) - Feld[x][y] = EL_AMOEBA_DROP; - } - random = random * 129 + 1; - } + return FALSE; } #endif -#if 0 - if (game.explosions_delayed) -#endif +#if 1 + if (trigger_page < 0) { - game.explosions_delayed = FALSE; + boolean change_element = FALSE; + int i; - for (y=0; ycan_change && + change->events & CH_EVENT_BIT(trigger_event) && + change->trigger_side & trigger_side && + change->trigger_player & trigger_player) + { + change_element = TRUE; + trigger_page = i; + + change->actual_trigger_element = trigger_element; + change->actual_trigger_player = EL_PLAYER_1 + log_2(trigger_player); - ExplodeField[x][y] = EX_NO_EXPLOSION; + break; + } } - game.explosions_delayed = TRUE; + if (!change_element) + return FALSE; } - - if (game.magic_wall_active) + else { - if (!(game.magic_wall_time_left % 4)) - { - int element = Feld[magic_wall_x][magic_wall_y]; + struct ElementInfo *ei = &element_info[element]; + struct ElementChangeInfo *change = &ei->change_page[trigger_page]; - 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); - else - PlaySoundLevel(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE); - } + change->actual_trigger_element = trigger_element; + change->actual_trigger_player = EL_PLAYER_1; /* unused */ + } - if (game.magic_wall_time_left > 0) - { - game.magic_wall_time_left--; - if (!game.magic_wall_time_left) - { - for (y=0; y 0) - { - game.light_time_left--; + if (!(element_info[element].change_page[trigger_page].trigger_side & trigger_side)) + return FALSE; +#endif - if (game.light_time_left == 0) - RedrawAllLightSwitchesAndInvisibleElements(); - } + ChangeDelay[x][y] = 1; + ChangeEvent[x][y] = CH_EVENT_BIT(trigger_event); + ChangeElement(x, y, trigger_page); - if (game.timegate_time_left > 0) - { - game.timegate_time_left--; + return TRUE; +} - if (game.timegate_time_left == 0) - CloseAllOpenTimegates(); - } +static void PlayPlayerSound(struct PlayerInfo *player) +{ + int jx = player->jx, jy = player->jy; + int element = player->element_nr; + int last_action = player->last_action_waiting; + int action = player->action_waiting; - for (i=0; iis_waiting) { - struct PlayerInfo *player = &stored_player[i]; + if (action != last_action) + PlayLevelSoundElementAction(jx, jy, element, action); + else + PlayLevelSoundElementActionIfLoop(jx, jy, element, action); + } + else + { + if (action != last_action) + StopSound(element_info[element].sound[last_action]); - if (SHIELD_ON(player)) - { - if (player->shield_deadly_time_left) - PlaySoundLevel(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE); - else if (player->shield_normal_time_left) - PlaySoundLevel(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE); - } + if (last_action == ACTION_SLEEPING) + PlayLevelSoundElementAction(jx, jy, element, ACTION_AWAKENING); } +} - if (TimeFrames >= (1000 / GameFrameDelay)) - { - TimeFrames = 0; - TimePlayed++; +static void PlayAllPlayersSound() +{ + int i; - for (i=0; iis_waiting; + int move_dir = player->MovDir; + + player->last_action_waiting = player->action_waiting; + + if (is_waiting) + { + if (!last_waiting) /* not waiting -> waiting */ { - struct PlayerInfo *player = &stored_player[i]; + player->is_waiting = TRUE; - if (SHIELD_ON(player)) - { - player->shield_normal_time_left--; + 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); - if (player->shield_deadly_time_left > 0) - player->shield_deadly_time_left--; - } + InitPlayerGfxAnimation(player, ACTION_WAITING, player->MovDir); } - if (tape.recording || tape.playing) - DrawVideoDisplay(VIDEO_STATE_TIME_ON, TimePlayed); + if (game.player_sleeping_delay_fixed + + game.player_sleeping_delay_random > 0 && + player->anim_delay_counter == 0 && + player->post_delay_counter == 0 && + FrameCounter >= player->frame_counter_sleeping) + player->is_sleeping = TRUE; + else if (game.player_boring_delay_fixed + + game.player_boring_delay_random > 0 && + FrameCounter >= player->frame_counter_bored) + player->is_bored = TRUE; - if (TimeLeft > 0) - { - TimeLeft--; + player->action_waiting = (player->is_sleeping ? ACTION_SLEEPING : + player->is_bored ? ACTION_BORING : + ACTION_WAITING); - if (TimeLeft <= 10 && setup.time_limit) - PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, SOUND_MIDDLE); + if (player->is_sleeping) + { + if (player->num_special_action_sleeping > 0) + { + if (player->anim_delay_counter == 0 && player->post_delay_counter == 0) + { + int last_special_action = player->special_action_sleeping; + int num_special_action = player->num_special_action_sleeping; + int special_action = + (last_special_action == ACTION_DEFAULT ? ACTION_SLEEPING_1 : + last_special_action == ACTION_SLEEPING ? ACTION_SLEEPING : + last_special_action < ACTION_SLEEPING_1 + num_special_action - 1 ? + last_special_action + 1 : ACTION_SLEEPING); + int special_graphic = + el_act_dir2img(player->element_nr, special_action, move_dir); + + player->anim_delay_counter = + graphic_info[special_graphic].anim_delay_fixed + + SimpleRND(graphic_info[special_graphic].anim_delay_random); + player->post_delay_counter = + graphic_info[special_graphic].post_delay_fixed + + SimpleRND(graphic_info[special_graphic].post_delay_random); + + player->special_action_sleeping = special_action; + } - DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2); + if (player->anim_delay_counter > 0) + { + player->action_waiting = player->special_action_sleeping; + player->anim_delay_counter--; + } + else if (player->post_delay_counter > 0) + { + player->post_delay_counter--; + } + } + } + else if (player->is_bored) + { + if (player->num_special_action_bored > 0) + { + if (player->anim_delay_counter == 0 && player->post_delay_counter == 0) + { + int special_action = + ACTION_BORING_1 + SimpleRND(player->num_special_action_bored); + int special_graphic = + el_act_dir2img(player->element_nr, special_action, move_dir); + + player->anim_delay_counter = + graphic_info[special_graphic].anim_delay_fixed + + SimpleRND(graphic_info[special_graphic].anim_delay_random); + player->post_delay_counter = + graphic_info[special_graphic].post_delay_fixed + + SimpleRND(graphic_info[special_graphic].post_delay_random); + + player->special_action_bored = special_action; + } - if (!TimeLeft && setup.time_limit) - for (i=0; ianim_delay_counter > 0) + { + player->action_waiting = player->special_action_bored; + player->anim_delay_counter--; + } + else if (player->post_delay_counter > 0) + { + player->post_delay_counter--; + } + } } - else if (level.time == 0 && !AllPlayersGone) /* level without time limit */ - DrawText(DX_TIME, DY_TIME, int2str(TimePlayed, 3), FONT_TEXT_2); } - - DrawAllPlayers(); - - if (options.debug) /* calculate frames per second */ + else if (last_waiting) /* waiting -> not waiting */ { - static unsigned long fps_counter = 0; - static int fps_frames = 0; - unsigned long fps_delay_ms = Counter() - fps_counter; + player->is_waiting = FALSE; + player->is_bored = FALSE; + player->is_sleeping = FALSE; - fps_frames++; + player->frame_counter_bored = -1; + player->frame_counter_sleeping = -1; - if (fps_delay_ms >= 500) /* calculate fps every 0.5 seconds */ - { - global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms; + player->anim_delay_counter = 0; + player->post_delay_counter = 0; - fps_frames = 0; - fps_counter = Counter(); - } + player->action_waiting = ACTION_DEFAULT; - redraw_mask |= REDRAW_FPS; + player->special_action_bored = ACTION_DEFAULT; + player->special_action_sleeping = ACTION_DEFAULT; } +} +#if 1 +static byte PlayerActions(struct PlayerInfo *player, byte player_action) +{ #if 0 - if (stored_player[0].jx != stored_player[0].last_jx || - stored_player[0].jy != stored_player[0].last_jy) - printf("::: %d, %d, %d, %d, %d\n", - stored_player[0].MovDir, - stored_player[0].MovPos, - stored_player[0].GfxPos, - stored_player[0].Frame, - stored_player[0].StepFrame); + 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 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 1 - FrameCounter++; - TimeFrames++; +#if 0 + stored_player_action[player->index_nr] = 0; + num_stored_actions++; +#endif - for (i=0; iindex_nr, FrameCounter); +#endif - stored_player[i].Frame += move_frames; + if (!player->active || tape.pausing) + return 0; - if (stored_player[i].MovPos != 0) - stored_player[i].StepFrame += move_frames; - } +#if 0 + printf("::: [%d %d %d %d] [%d %d]\n", + left, right, up, down, button1, button2); #endif -} - -static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y) -{ - int min_x = x, min_y = y, max_x = x, max_y = y; - int i; - for (i=0; iindex_nr, FrameCounter); +#endif - if (!stored_player[i].active || &stored_player[i] == player) - continue; +#if 0 + /* !!! TEST !!! */ + if (player->MovPos == 0) + CheckGravityMovement(player); +#endif + if (button1) + snapped = SnapField(player, dx, dy); + else + { + if (button2) + dropped = DropElement(player); - min_x = MIN(min_x, jx); - min_y = MIN(min_y, jy); - max_x = MAX(max_x, jx); - max_y = MAX(max_y, jy); - } + moved = MovePlayer(player, dx, dy); + } - return (max_x - min_x < SCR_FIELDX && max_y - min_y < SCR_FIELDY); -} + if (tape.single_step && tape.recording && !tape.pausing) + { + if (button1 || (dropped && !moved)) + { + TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); + SnapField(player, 0, 0); /* stop snapping */ + } + } -static boolean AllPlayersInVisibleScreen() -{ - int i; + SetPlayerWaiting(player, FALSE); - for (i=0; iindex_nr] = player_action; +#endif + } + else { - int jx = stored_player[i].jx, jy = stored_player[i].jy; - - if (!stored_player[i].active) - continue; +#if 0 + printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter); +#endif - if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) - return FALSE; - } + /* no actions for this player (no input at player's configured device) */ - return TRUE; -} + DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH); + SnapField(player, 0, 0); + CheckGravityMovementWhenNotMoving(player); -void ScrollLevel(int dx, int dy) -{ - int softscroll_offset = (setup.soft_scrolling ? TILEX : 0); - int x, y; + if (player->MovPos == 0) + SetPlayerWaiting(player, TRUE); - BlitBitmap(drawto_field, drawto_field, - FX + TILEX*(dx == -1) - softscroll_offset, - FY + TILEY*(dy == -1) - softscroll_offset, - SXSIZE - TILEX*(dx!=0) + 2*softscroll_offset, - SYSIZE - TILEY*(dy!=0) + 2*softscroll_offset, - FX + TILEX*(dx == 1) - softscroll_offset, - FY + TILEY*(dy == 1) - softscroll_offset); + if (player->MovPos == 0) /* needed for tape.playing */ + player->is_moving = FALSE; - if (dx) - { - x = (dx == 1 ? BX1 : BX2); - for (y=BY1; y<=BY2; y++) - DrawScreenField(x, y); - } + player->is_dropping = FALSE; - if (dy) - { - y = (dy == 1 ? BY1 : BY2); - for (x=BX1; x<=BX2; x++) - DrawScreenField(x, y); + return 0; } - redraw_mask |= REDRAW_FIELD; -} - -static void CheckGravityMovement(struct PlayerInfo *player) -{ - if (level.gravity && !player->programmed_action) +#if 0 + if (tape.recording && num_stored_actions >= MAX_PLAYERS) { - int move_dir_vertical = player->action & (MV_UP | MV_DOWN); - int move_dir_horizontal = player->action & (MV_LEFT | MV_RIGHT); - int move_dir = - (player->last_move_dir & (MV_LEFT | MV_RIGHT) ? - (move_dir_vertical ? move_dir_vertical : move_dir_horizontal) : - (move_dir_horizontal ? move_dir_horizontal : move_dir_vertical)); - int jx = player->jx, jy = player->jy; - int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0); - int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0); - int new_jx = jx + dx, new_jy = jy + dy; - boolean field_under_player_is_free = - (IN_LEV_FIELD(jx, jy + 1) && IS_FREE(jx, jy + 1)); - boolean player_is_moving_to_valid_field = - (IN_LEV_FIELD(new_jx, new_jy) && - (Feld[new_jx][new_jy] == EL_SP_BASE || - Feld[new_jx][new_jy] == EL_SAND)); + printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter); - if (field_under_player_is_free && - !player_is_moving_to_valid_field && - !IS_WALKABLE_INSIDE(Feld[jx][jy])) - player->programmed_action = MV_DOWN; + TapeRecordAction(stored_player_action); + num_stored_actions = 0; } +#endif } -/* - MoveFigureOneStep() - ----------------------------------------------------------------------------- - 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) -*/ +#else -boolean MoveFigureOneStep(struct PlayerInfo *player, - int dx, int dy, int real_dx, int real_dy) +static void PlayerActions(struct PlayerInfo *player, byte player_action) { - int jx = player->jx, jy = player->jy; - int new_jx = jx+dx, new_jy = jy+dy; - int element; - int can_move; + 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 (!player->active || (!dx && !dy)) - return MF_NO_ACTION; + stored_player_action[player->index_nr] = 0; + num_stored_actions++; - player->MovDir = (dx < 0 ? MV_LEFT : - dx > 0 ? MV_RIGHT : - dy < 0 ? MV_UP : - dy > 0 ? MV_DOWN : MV_NO_MOVING); + printf("::: player %d [%d]\n", player->index_nr, FrameCounter); - if (!IN_LEV_FIELD(new_jx, new_jy)) - return MF_NO_ACTION; + if (!player->active || tape.pausing) + return; - if (!options.network && !AllPlayersInSight(player, new_jx, new_jy)) - return MF_NO_ACTION; + if (player_action) + { + printf("::: player %d acts [%d]\n", player->index_nr, FrameCounter); -#if 0 - element = MovingOrBlocked2Element(new_jx, new_jy); -#else - element = MovingOrBlocked2ElementIfNotLeaving(new_jx, new_jy); -#endif + if (button1) + snapped = SnapField(player, dx, dy); + else + { + if (button2) + dropped = DropElement(player); - if (DONT_RUN_INTO(element)) - { - if (element == EL_ACID && dx == 0 && dy == 1) + moved = MovePlayer(player, dx, dy); + } + + if (tape.single_step && tape.recording && !tape.pausing) { - SplashAcid(jx, jy); - Feld[jx][jy] = EL_PLAYER_1; - InitMovingField(jx, jy, MV_DOWN); - Store[jx][jy] = EL_ACID; - ContinueMoving(jx, jy); - BuryHero(player); + if (button1 || (dropped && !moved)) + { + TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); + SnapField(player, 0, 0); /* stop snapping */ + } } - else - TestIfHeroRunsIntoBadThing(jx, jy, player->MovDir); - return MF_MOVING; + stored_player_action[player->index_nr] = player_action; } + else + { + printf("::: player %d waits [%d]\n", player->index_nr, FrameCounter); - can_move = DigField(player, new_jx, new_jy, real_dx, real_dy, DF_DIG); - if (can_move != MF_MOVING) - return can_move; + /* no actions for this player (no input at player's configured device) */ - StorePlayer[jx][jy] = 0; - player->last_jx = jx; - player->last_jy = jy; - jx = player->jx = new_jx; - jy = player->jy = new_jy; - StorePlayer[jx][jy] = player->element_nr; + DigField(player, 0, 0, 0, 0, 0, 0, DF_NO_PUSH); + SnapField(player, 0, 0); + CheckGravityMovementWhenNotMoving(player); - player->MovPos = - (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value); + if (player->MovPos == 0) + InitPlayerGfxAnimation(player, ACTION_DEFAULT, player->MovDir); + + if (player->MovPos == 0) /* needed for tape.playing */ + player->is_moving = FALSE; + } - ScrollFigure(player, SCROLL_INIT); + if (tape.recording && num_stored_actions >= MAX_PLAYERS) + { + printf("::: player %d recorded [%d]\n", player->index_nr, FrameCounter); - return MF_MOVING; + TapeRecordAction(stored_player_action); + num_stored_actions = 0; + } } +#endif -boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) +void AdvanceFrameAndPlayerCounters(int player_nr) { - int jx = player->jx, jy = player->jy; - int old_jx = jx, old_jy = jy; - int moved = MF_NO_ACTION; + int i; - if (!player->active || (!dx && !dy)) - return FALSE; + /* advance frame counters (global frame counter and time frame counter) */ + FrameCounter++; + TimeFrames++; -#if 0 - if (!FrameReached(&player->move_delay, player->move_delay_value) && - !tape.playing) - return FALSE; -#else - if (!FrameReached(&player->move_delay, player->move_delay_value) && - !(tape.playing && tape.file_version < FILE_VERSION_2_0)) - return FALSE; -#endif + /* advance player counters (counters for move delay, move animation etc.) */ + for (i = 0; i < MAX_PLAYERS; i++) + { + boolean advance_player_counters = (player_nr == -1 || player_nr == i); + int move_frames = + MOVE_DELAY_NORMAL_SPEED / stored_player[i].move_delay_value; - /* remove the last programmed player action */ - player->programmed_action = 0; + if (!advance_player_counters) /* not all players may be affected */ + continue; - if (player->MovPos) - { - /* should only happen if pre-1.2 tape recordings are played */ - /* this is only for backward compatibility */ + stored_player[i].Frame += move_frames; - int original_move_delay_value = player->move_delay_value; + if (stored_player[i].MovPos != 0) + stored_player[i].StepFrame += move_frames; -#if DEBUG - printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%ld]\n", - tape.counter); +#if USE_NEW_MOVE_DELAY + if (stored_player[i].move_delay > 0) + stored_player[i].move_delay--; #endif - /* scroll remaining steps with finest movement resolution */ - player->move_delay_value = MOVE_DELAY_NORMAL_SPEED; +#if USE_NEW_PUSH_DELAY + /* due to bugs in previous versions, counter must count up, not down */ + if (stored_player[i].push_delay != -1) + stored_player[i].push_delay++; +#endif + + if (stored_player[i].drop_delay > 0) + stored_player[i].drop_delay--; + } +} + +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.warp_forward && !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 defined(NETWORK_AVALIABLE) + /* last chance to get network player actions without main loop delay */ + HandleNetworking(); +#endif + + if (game_status != GAME_MODE_PLAYING) + return; + + if (!network_player_action_received) + { + /* +#ifdef DEBUG + printf("DEBUG: failed to get network player actions in time\n"); +#endif + */ + return; + } + } + + if (tape.pausing) + return; + +#if 0 + printf("::: getting new tape action [%d]\n", FrameCounter); +#endif + + recorded_player_action = (tape.playing ? TapePlayAction() : NULL); + +#if 1 + if (recorded_player_action == NULL && tape.pausing) + return; +#endif + +#if 0 + printf("::: %d\n", stored_player[0].action); +#endif + +#if 0 + if (recorded_player_action != NULL) + for (i = 0; i < MAX_PLAYERS; i++) + stored_player[i].action = recorded_player_action[i]; +#endif + + for (i = 0; i < MAX_PLAYERS; i++) + { + summarized_player_action |= stored_player[i].action; + + if (!network_playing) + stored_player[i].effective_action = stored_player[i].action; + } + +#if defined(NETWORK_AVALIABLE) + if (network_playing) + SendToServer_MovePlayer(summarized_player_action); +#endif + + if (!options.network && !setup.team_mode) + local_player->effective_action = summarized_player_action; + +#if 1 + if (recorded_player_action != NULL) + for (i = 0; i < MAX_PLAYERS; i++) + stored_player[i].effective_action = recorded_player_action[i]; +#endif + +#if 1 + for (i = 0; i < MAX_PLAYERS; i++) + { + tape_action[i] = stored_player[i].effective_action; + + if (tape.recording && tape_action[i] && !tape.player_participates[i]) + tape.player_participates[i] = TRUE; /* player just appeared from CE */ + } + + /* only save actions from input devices, but not programmed actions */ + if (tape.recording) + TapeRecordAction(tape_action); +#endif + + for (i = 0; i < MAX_PLAYERS; i++) + { + int actual_player_action = stored_player[i].effective_action; + +#if 1 + /* !!! THIS BREAKS THE FOLLOWING TAPES: !!! + - rnd_equinox_tetrachloride 048 + - rnd_equinox_tetrachloride_ii 096 + - rnd_emanuel_schmieg 002 + - doctor_sloan_ww 001, 020 + */ + if (stored_player[i].MovPos == 0) + CheckGravityMovement(&stored_player[i]); +#endif + +#if 1 + /* overwrite programmed action with tape action */ + if (stored_player[i].programmed_action) + actual_player_action = stored_player[i].programmed_action; +#endif + +#if 0 + if (stored_player[i].programmed_action) + printf("::: %d\n", stored_player[i].programmed_action); +#endif + + if (recorded_player_action) + { +#if 0 + if (stored_player[i].programmed_action && + stored_player[i].programmed_action != recorded_player_action[i]) + printf("::: %d: %d <-> %d\n", i, + stored_player[i].programmed_action, recorded_player_action[i]); +#endif + +#if 0 + actual_player_action = recorded_player_action[i]; +#endif + } + +#if 0 + /* overwrite tape action with programmed action */ + if (stored_player[i].programmed_action) + actual_player_action = stored_player[i].programmed_action; +#endif + +#if 0 + if (i == 0) + printf("::: action: %d: %x [%d]\n", + stored_player[i].MovPos, actual_player_action, FrameCounter); +#endif + +#if 1 + PlayerActions(&stored_player[i], actual_player_action); +#else + 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 */ +#endif + + ScrollPlayer(&stored_player[i], SCROLL_GO_ON); + } + +#if 0 + if (tape.recording) + TapeRecordAction(tape_action); +#endif + + network_player_action_received = FALSE; + + ScrollScreen(NULL, SCROLL_GO_ON); + +#if 0 + FrameCounter++; + TimeFrames++; + + for (i = 0; i < MAX_PLAYERS; i++) + stored_player[i].Frame++; +#endif + +#if 1 + /* for downwards compatibility, the following code emulates a fixed bug that + occured when pushing elements (causing elements that just made their last + pushing step to already (if possible) make their first falling step in the + same game frame, which is bad); this code is also needed to use the famous + "spring push bug" which is used in older levels and might be wanted to be + used also in newer levels, but in this case the buggy pushing code is only + affecting the "spring" element and no other elements */ + +#if 1 + if (game.engine_version < VERSION_IDENT(2,2,0,7) || level.use_spring_bug) +#else + if (game.engine_version < VERSION_IDENT(2,2,0,7)) +#endif + { + for (i = 0; i < MAX_PLAYERS; i++) + { + struct PlayerInfo *player = &stored_player[i]; + int x = player->jx; + int y = player->jy; + +#if 1 + if (player->active && player->is_pushing && player->is_moving && + IS_MOVING(x, y) && + (game.engine_version < VERSION_IDENT(2,2,0,7) || + Feld[x][y] == EL_SPRING)) +#else + if (player->active && player->is_pushing && player->is_moving && + IS_MOVING(x, y)) +#endif + { + ContinueMoving(x, y); + + /* continue moving after pushing (this is actually a bug) */ + if (!IS_MOVING(x, y)) + { + Stop[x][y] = FALSE; + } + } + } + } +#endif + + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { + Changed[x][y] = CE_BITMASK_DEFAULT; + ChangeEvent[x][y] = CE_BITMASK_DEFAULT; + + /* this must be handled before main playfield loop */ + if (Feld[x][y] == EL_PLAYER_IS_LEAVING) + { + MovDelay[x][y]--; + if (MovDelay[x][y] <= 0) + RemoveField(x, y); + } + +#if DEBUG + if (ChangePage[x][y] != -1 && ChangeDelay[x][y] != 1) + { + printf("GameActions(): x = %d, y = %d: ChangePage != -1\n", x, y); + printf("GameActions(): This should never happen!\n"); + + ChangePage[x][y] = -1; + } +#endif + + Stop[x][y] = FALSE; + if (WasJustMoving[x][y] > 0) + WasJustMoving[x][y]--; + if (WasJustFalling[x][y] > 0) + WasJustFalling[x][y]--; + if (CheckCollision[x][y] > 0) + CheckCollision[x][y]--; + + GfxFrame[x][y]++; + +#if 1 + /* reset finished pushing action (not done in ContinueMoving() to allow + continous pushing animation for elements with zero push delay) */ + if (GfxAction[x][y] == ACTION_PUSHING && !IS_MOVING(x, y)) + { + ResetGfxAnimation(x, y); + DrawLevelField(x, y); + } +#endif + +#if DEBUG + if (IS_BLOCKED(x, y)) + { + int oldx, oldy; + + Blocked2Moving(x, y, &oldx, &oldy); + if (!IS_MOVING(oldx, oldy)) + { + printf("GameActions(): (BLOCKED => MOVING) context corrupted!\n"); + printf("GameActions(): BLOCKED: x = %d, y = %d\n", x, y); + printf("GameActions(): !MOVING: oldx = %d, oldy = %d\n", oldx, oldy); + printf("GameActions(): This should never happen!\n"); + } + } +#endif + } + + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { + element = Feld[x][y]; +#if 1 + graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); +#else + graphic = el2img(element); +#endif + +#if 0 + if (element == -1) + { + printf("::: %d,%d: %d [%d]\n", x, y, element, FrameCounter); + + element = graphic = 0; + } +#endif + + if (graphic_info[graphic].anim_global_sync) + GfxFrame[x][y] = FrameCounter; + + if (ANIM_MODE(graphic) == ANIM_RANDOM && + IS_NEXT_FRAME(GfxFrame[x][y], graphic)) + ResetRandomAnimationValue(x, y); + + SetRandomAnimationValue(x, y); + +#if 1 + PlayLevelSoundActionIfLoop(x, y, GfxAction[x][y]); +#endif + + if (IS_INACTIVE(element)) + { + if (IS_ANIMATED(graphic)) + DrawLevelGraphicAnimationIfNeeded(x, y, graphic); + + continue; + } + +#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] : + element_info[element].event_page_nr[CE_DELAY]); +#else + ChangeElement(x, y, element_info[element].event_page_nr[CE_DELAY]); +#endif + + element = Feld[x][y]; + graphic = el_act_dir2img(element, GfxAction[x][y], GfxDir[x][y]); + } +#endif + + if (!IS_MOVING(x, y) && (CAN_FALL(element) || CAN_MOVE(element))) + { + StartMoving(x, y); + +#if 1 + element = Feld[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", + IS_ANIMATED(graphic), IS_MOVING(x, y), Stop[x][y], + GfxAction[x][y]); +#endif +#if 0 + if (element == EL_YAMYAM) + printf("::: %d, %d, %d\n", + IS_ANIMATED(graphic), IS_MOVING(x, y), Stop[x][y]); +#endif +#endif + + if (IS_ANIMATED(graphic) && + !IS_MOVING(x, y) && + !Stop[x][y]) + { + 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_GEM(element) || element == EL_SP_INFOTRON) + EdelsteinFunkeln(x, y); + } + else if ((element == EL_ACID || + element == EL_EXIT_OPEN || + element == EL_SP_EXIT_OPEN || + element == EL_SP_TERMINAL || + element == EL_SP_TERMINAL_ACTIVE || + element == EL_EXTRA_TIME || + element == EL_SHIELD_NORMAL || + element == EL_SHIELD_DEADLY) && + IS_ANIMATED(graphic)) + DrawLevelGraphicAnimationIfNeeded(x, y, graphic); + else if (IS_MOVING(x, y)) + ContinueMoving(x, y); + else if (IS_ACTIVE_BOMB(element)) + CheckDynamite(x, y); +#if 0 + else if (element == EL_EXPLOSION && !game.explosions_delayed) + Explode(x, y, ExplodePhase[x][y], EX_TYPE_NORMAL); +#endif + else if (element == EL_AMOEBA_GROWING) + AmoebeWaechst(x, y); + else if (element == EL_AMOEBA_SHRINKING) + AmoebaDisappearing(x, y); + +#if !USE_NEW_AMOEBA_CODE + else if (IS_AMOEBALIVE(element)) + AmoebeAbleger(x, y); +#endif + + else if (element == EL_GAME_OF_LIFE || element == EL_BIOMAZE) + Life(x, y); + else if (element == EL_EXIT_CLOSED) + CheckExit(x, y); + else if (element == EL_SP_EXIT_CLOSED) + CheckExitSP(x, y); + else if (element == EL_EXPANDABLE_WALL_GROWING) + MauerWaechst(x, y); + else if (element == EL_EXPANDABLE_WALL || + element == EL_EXPANDABLE_WALL_HORIZONTAL || + element == EL_EXPANDABLE_WALL_VERTICAL || + element == EL_EXPANDABLE_WALL_ANY) + MauerAbleger(x, y); + else if (element == EL_FLAMES) + CheckForDragon(x, y); +#if 0 + else if (IS_AUTO_CHANGING(element)) + ChangeElement(x, y); +#endif + else if (element == EL_EXPLOSION) + ; /* drawing of correct explosion animation is handled separately */ + else if (IS_ANIMATED(graphic) && !IS_CHANGING(x, y)) + DrawLevelGraphicAnimationIfNeeded(x, y, graphic); + +#if 0 + /* this may take place after moving, so 'element' may have changed */ + if (IS_AUTO_CHANGING(Feld[x][y])) + ChangeElement(x, y); +#endif + + if (IS_BELT_ACTIVE(element)) + PlayLevelSoundAction(x, y, ACTION_ACTIVE); + + if (game.magic_wall_active) + { + int jx = local_player->jx, jy = local_player->jy; + + /* play the element sound at the position nearest to the player */ + if ((element == EL_MAGIC_WALL_FULL || + element == EL_MAGIC_WALL_ACTIVE || + element == EL_MAGIC_WALL_EMPTYING || + element == EL_BD_MAGIC_WALL_FULL || + element == EL_BD_MAGIC_WALL_ACTIVE || + element == EL_BD_MAGIC_WALL_EMPTYING) && + ABS(x-jx) + ABS(y-jy) < ABS(magic_wall_x-jx) + ABS(magic_wall_y-jy)) + { + magic_wall_x = x; + magic_wall_y = y; + } + } + } + +#if USE_NEW_AMOEBA_CODE + /* new experimental amoeba growth stuff */ +#if 1 + if (!(FrameCounter % 8)) +#endif + { + static unsigned long random = 1684108901; + + for (i = 0; i < level.amoeba_speed * 28 / 8; i++) + { +#if 0 + x = (random >> 10) % lev_fieldx; + y = (random >> 20) % lev_fieldy; +#else + x = RND(lev_fieldx); + y = RND(lev_fieldy); +#endif + element = Feld[x][y]; + +#if 1 + if (!IS_PLAYER(x,y) && + (element == EL_EMPTY || + CAN_GROW_INTO(element) || + element == EL_QUICKSAND_EMPTY || + element == EL_ACID_SPLASH_LEFT || + element == EL_ACID_SPLASH_RIGHT)) + { + if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBA_WET)) + Feld[x][y] = EL_AMOEBA_DROP; + } +#else + /* !!! extend EL_SAND to anything diggable (but maybe not SP_BASE) !!! */ + if (!IS_PLAYER(x,y) && + (element == EL_EMPTY || + element == EL_SAND || + element == EL_QUICKSAND_EMPTY || + element == EL_ACID_SPLASH_LEFT || + element == EL_ACID_SPLASH_RIGHT)) + { + if ((IN_LEV_FIELD(x, y-1) && Feld[x][y-1] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x-1, y) && Feld[x-1][y] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x+1, y) && Feld[x+1][y] == EL_AMOEBA_WET) || + (IN_LEV_FIELD(x, y+1) && Feld[x][y+1] == EL_AMOEBA_WET)) + Feld[x][y] = EL_AMOEBA_DROP; + } +#endif + + random = random * 129 + 1; + } + } +#endif + +#if 0 + if (game.explosions_delayed) +#endif + { + game.explosions_delayed = FALSE; + + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { + element = Feld[x][y]; + + if (ExplodeField[x][y]) + Explode(x, y, EX_PHASE_START, ExplodeField[x][y]); + else if (element == EL_EXPLOSION) + Explode(x, y, ExplodePhase[x][y], EX_TYPE_NORMAL); + + ExplodeField[x][y] = EX_TYPE_NONE; + } + + game.explosions_delayed = TRUE; + } + + if (game.magic_wall_active) + { + if (!(game.magic_wall_time_left % 4)) + { + int element = Feld[magic_wall_x][magic_wall_y]; + + if (element == EL_BD_MAGIC_WALL_FULL || + element == EL_BD_MAGIC_WALL_ACTIVE || + element == EL_BD_MAGIC_WALL_EMPTYING) + PlayLevelSound(magic_wall_x, magic_wall_y, SND_BD_MAGIC_WALL_ACTIVE); + else + PlayLevelSound(magic_wall_x, magic_wall_y, SND_MAGIC_WALL_ACTIVE); + } + + if (game.magic_wall_time_left > 0) + { + game.magic_wall_time_left--; + if (!game.magic_wall_time_left) + { + for (y = 0; y < lev_fieldy; y++) for (x = 0; x < lev_fieldx; x++) + { + element = Feld[x][y]; + + if (element == EL_MAGIC_WALL_ACTIVE || + element == EL_MAGIC_WALL_FULL) + { + Feld[x][y] = EL_MAGIC_WALL_DEAD; + DrawLevelField(x, y); + } + else if (element == EL_BD_MAGIC_WALL_ACTIVE || + element == EL_BD_MAGIC_WALL_FULL) + { + Feld[x][y] = EL_BD_MAGIC_WALL_DEAD; + DrawLevelField(x, y); + } + } + + game.magic_wall_active = FALSE; + } + } + } + + if (game.light_time_left > 0) + { + game.light_time_left--; + + if (game.light_time_left == 0) + RedrawAllLightSwitchesAndInvisibleElements(); + } + + if (game.timegate_time_left > 0) + { + game.timegate_time_left--; + + if (game.timegate_time_left == 0) + CloseAllOpenTimegates(); + } + + for (i = 0; i < MAX_PLAYERS; i++) + { + struct PlayerInfo *player = &stored_player[i]; + + if (SHIELD_ON(player)) + { + if (player->shield_deadly_time_left) + PlayLevelSound(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE); + else if (player->shield_normal_time_left) + PlayLevelSound(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE); + } + } + + if (TimeFrames >= FRAMES_PER_SECOND) + { + TimeFrames = 0; + TapeTime++; + + for (i = 0; i < MAX_PLAYERS; i++) + { + struct PlayerInfo *player = &stored_player[i]; + + if (SHIELD_ON(player)) + { + player->shield_normal_time_left--; + + if (player->shield_deadly_time_left > 0) + player->shield_deadly_time_left--; + } + } + + if (!level.use_step_counter) + { + TimePlayed++; + + if (TimeLeft > 0) + { + TimeLeft--; + + if (TimeLeft <= 10 && setup.time_limit) + PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, SOUND_MIDDLE); + + DrawGameValue_Time(TimeLeft); + + if (!TimeLeft && setup.time_limit) + for (i = 0; i < MAX_PLAYERS; i++) + KillHero(&stored_player[i]); + } + else if (level.time == 0 && !AllPlayersGone) /* level w/o time limit */ + DrawGameValue_Time(TimePlayed); + } + + if (tape.recording || tape.playing) + DrawVideoDisplay(VIDEO_STATE_TIME_ON, TapeTime); + } + + DrawAllPlayers(); + PlayAllPlayersSound(); + + if (options.debug) /* calculate frames per second */ + { + static unsigned long fps_counter = 0; + static int fps_frames = 0; + unsigned long fps_delay_ms = Counter() - fps_counter; + + fps_frames++; + + if (fps_delay_ms >= 500) /* calculate fps every 0.5 seconds */ + { + global.frames_per_second = 1000 * (float)fps_frames / fps_delay_ms; + + fps_frames = 0; + fps_counter = Counter(); + } + + redraw_mask |= REDRAW_FPS; + } + +#if 0 + if (stored_player[0].jx != stored_player[0].last_jx || + stored_player[0].jy != stored_player[0].last_jy) + printf("::: %d, %d, %d, %d, %d\n", + stored_player[0].MovDir, + stored_player[0].MovPos, + stored_player[0].GfxPos, + stored_player[0].Frame, + stored_player[0].StepFrame); +#endif + +#if USE_NEW_MOVE_DELAY + AdvanceFrameAndPlayerCounters(-1); /* advance counters for all players */ +#else + FrameCounter++; + TimeFrames++; + + for (i = 0; i < MAX_PLAYERS; i++) + { + int move_frames = + MOVE_DELAY_NORMAL_SPEED / stored_player[i].move_delay_value; + + stored_player[i].Frame += move_frames; + + if (stored_player[i].MovPos != 0) + stored_player[i].StepFrame += move_frames; + +#if USE_NEW_MOVE_DELAY + if (stored_player[i].move_delay > 0) + stored_player[i].move_delay--; +#endif + + if (stored_player[i].drop_delay > 0) + stored_player[i].drop_delay--; + } +#endif + +#if 1 + if (local_player->show_envelope != 0 && local_player->MovPos == 0) + { + ShowEnvelope(local_player->show_envelope - EL_ENVELOPE_1); + + local_player->show_envelope = 0; + } +#endif +} + +static boolean AllPlayersInSight(struct PlayerInfo *player, int x, int y) +{ + int min_x = x, min_y = y, max_x = x, max_y = y; + int i; + + for (i = 0; i < MAX_PLAYERS; i++) + { + int jx = stored_player[i].jx, jy = stored_player[i].jy; + + if (!stored_player[i].active || &stored_player[i] == player) + continue; + + min_x = MIN(min_x, jx); + min_y = MIN(min_y, jy); + max_x = MAX(max_x, jx); + max_y = MAX(max_y, jy); + } + + return (max_x - min_x < SCR_FIELDX && max_y - min_y < SCR_FIELDY); +} + +static boolean AllPlayersInVisibleScreen() +{ + int i; + + for (i = 0; i < MAX_PLAYERS; i++) + { + int jx = stored_player[i].jx, jy = stored_player[i].jy; + + if (!stored_player[i].active) + continue; + + if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) + return FALSE; + } + + return TRUE; +} + +void ScrollLevel(int dx, int dy) +{ + int softscroll_offset = (setup.soft_scrolling ? TILEX : 0); + int x, y; + + BlitBitmap(drawto_field, drawto_field, + FX + TILEX * (dx == -1) - softscroll_offset, + FY + TILEY * (dy == -1) - softscroll_offset, + SXSIZE - TILEX * (dx!=0) + 2 * softscroll_offset, + SYSIZE - TILEY * (dy!=0) + 2 * softscroll_offset, + FX + TILEX * (dx == 1) - softscroll_offset, + FY + TILEY * (dy == 1) - softscroll_offset); + + if (dx) + { + x = (dx == 1 ? BX1 : BX2); + for (y = BY1; y <= BY2; y++) + DrawScreenField(x, y); + } + + if (dy) + { + y = (dy == 1 ? BY1 : BY2); + for (x = BX1; x <= BX2; x++) + DrawScreenField(x, y); + } + + redraw_mask |= REDRAW_FIELD; +} + +#if 0 +static boolean canEnterSupaplexPort(int x, int y, int dx, int dy) +{ + int nextx = x + dx, nexty = y + dy; + int element = Feld[x][y]; + + if ((dx == -1 && + element != EL_SP_PORT_LEFT && + element != EL_SP_GRAVITY_PORT_LEFT && + element != EL_SP_PORT_HORIZONTAL && + element != EL_SP_PORT_ANY) || + (dx == +1 && + element != EL_SP_PORT_RIGHT && + element != EL_SP_GRAVITY_PORT_RIGHT && + element != EL_SP_PORT_HORIZONTAL && + element != EL_SP_PORT_ANY) || + (dy == -1 && + element != EL_SP_PORT_UP && + element != EL_SP_GRAVITY_PORT_UP && + element != EL_SP_PORT_VERTICAL && + element != EL_SP_PORT_ANY) || + (dy == +1 && + element != EL_SP_PORT_DOWN && + element != EL_SP_GRAVITY_PORT_DOWN && + element != EL_SP_PORT_VERTICAL && + element != EL_SP_PORT_ANY) || + !IN_LEV_FIELD(nextx, nexty) || + !IS_FREE(nextx, nexty)) + return FALSE; + + return TRUE; +} +#endif + +static boolean canFallDown(struct PlayerInfo *player) +{ + int jx = player->jx, jy = player->jy; + + return (IN_LEV_FIELD(jx, jy + 1) && + (IS_FREE(jx, jy + 1) || + (Feld[jx][jy + 1] == EL_ACID && player->can_fall_into_acid)) && + IS_WALKABLE_FROM(Feld[jx][jy], MV_DOWN) && + !IS_WALKABLE_INSIDE(Feld[jx][jy])); +} + +static boolean canPassField(int x, int y, int move_dir) +{ + int opposite_dir = MV_DIR_OPPOSITE(move_dir); + int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0); + int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0); + int nextx = x + dx; + int nexty = y + dy; + int element = Feld[x][y]; + + return (IS_PASSABLE_FROM(element, opposite_dir) && + !CAN_MOVE(element) && + IN_LEV_FIELD(nextx, nexty) && !IS_PLAYER(nextx, nexty) && + IS_WALKABLE_FROM(Feld[nextx][nexty], move_dir) && + (level.can_pass_to_walkable || IS_FREE(nextx, nexty))); +} + +static boolean canMoveToValidFieldWithGravity(int x, int y, int move_dir) +{ + int opposite_dir = MV_DIR_OPPOSITE(move_dir); + int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0); + int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0); + int newx = x + dx; + int newy = y + dy; +#if 0 + int nextx = newx + dx; + int nexty = newy + dy; +#endif + +#if 1 + return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) && + IS_GRAVITY_REACHABLE(Feld[newx][newy]) && +#if 0 + (!IS_SP_PORT(Feld[newx][newy]) || move_dir == MV_UP) && +#endif + (IS_DIGGABLE(Feld[newx][newy]) || + IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) || + canPassField(newx, newy, move_dir))); +#else +#if 1 + return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) && + IS_GRAVITY_REACHABLE(Feld[newx][newy]) && + (IS_DIGGABLE(Feld[newx][newy]) || + IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) || + canPassField(newx, newy, move_dir))); +#else +#if 1 + return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) && + (IS_DIGGABLE_WITH_GRAVITY(Feld[newx][newy]) || + IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) || + canPassField(newx, newy, move_dir))); +#else + return (IN_LEV_FIELD(newx, newy) && !IS_FREE_OR_PLAYER(newx, newy) && + (IS_DIGGABLE(Feld[newx][newy]) || + IS_WALKABLE_FROM(Feld[newx][newy], opposite_dir) || + (IS_PASSABLE_FROM(Feld[newx][newy], opposite_dir) && + !CAN_MOVE(Feld[newx][newy]) && + IN_LEV_FIELD(nextx, nexty) && !IS_PLAYER(nextx, nexty) && + IS_WALKABLE_FROM(Feld[nextx][nexty], move_dir) && + (level.can_pass_to_walkable || IS_FREE(nextx, nexty))))); +#endif +#endif +#endif +} + +static void CheckGravityMovement(struct PlayerInfo *player) +{ + if (game.gravity && !player->programmed_action) + { +#if 1 + int move_dir_horizontal = player->effective_action & MV_HORIZONTAL; + int move_dir_vertical = player->effective_action & MV_VERTICAL; +#else + int move_dir_horizontal = player->action & MV_HORIZONTAL; + int move_dir_vertical = player->action & MV_VERTICAL; +#endif + +#if 1 + boolean player_is_snapping = player->effective_action & JOY_BUTTON_1; +#else + boolean player_is_snapping = player->action & JOY_BUTTON_1; +#endif + + int jx = player->jx, jy = player->jy; + + boolean player_is_moving_to_valid_field = + (!player_is_snapping && + (canMoveToValidFieldWithGravity(jx, jy, move_dir_horizontal) || + canMoveToValidFieldWithGravity(jx, jy, move_dir_vertical))); + +#if 0 + int move_dir = + (player->last_move_dir & MV_HORIZONTAL ? + (move_dir_vertical ? move_dir_vertical : move_dir_horizontal) : + (move_dir_horizontal ? move_dir_horizontal : move_dir_vertical)); +#endif + +#if 0 + int opposite_dir = MV_DIR_OPPOSITE(move_dir); + int dx = (move_dir & MV_LEFT ? -1 : move_dir & MV_RIGHT ? +1 : 0); + int dy = (move_dir & MV_UP ? -1 : move_dir & MV_DOWN ? +1 : 0); + int new_jx = jx + dx, new_jy = jy + dy; + int nextx = new_jx + dx, nexty = new_jy + dy; +#endif + +#if 1 + +#if 1 + boolean player_can_fall_down = canFallDown(player); +#else + boolean player_can_fall_down = + (IN_LEV_FIELD(jx, jy + 1) && + (IS_FREE(jx, jy + 1) || + (Feld[jx][jy + 1] == EL_ACID && player->can_fall_into_acid))); +#endif + +#else + boolean player_can_fall_down = + (IN_LEV_FIELD(jx, jy + 1) && + (IS_FREE(jx, jy + 1))); +#endif + +#if 0 + boolean player_is_moving_to_valid_field = + ( +#if 1 + !player_is_snapping && +#endif + +#if 1 + IN_LEV_FIELD(new_jx, new_jy) && + (IS_DIGGABLE(Feld[new_jx][new_jy]) || + (IS_SP_PORT(Feld[new_jx][new_jy]) && + element_info[Feld[new_jx][new_jy]].access_direction & opposite_dir && + IN_LEV_FIELD(nextx, nexty) && + element_info[Feld[nextx][nexty]].access_direction & move_dir)) +#else + IN_LEV_FIELD(new_jx, new_jy) && + (Feld[new_jx][new_jy] == EL_SP_BASE || + Feld[new_jx][new_jy] == EL_SAND || + (IS_SP_PORT(Feld[new_jx][new_jy]) && + canEnterSupaplexPort(new_jx, new_jy, dx, dy))) + /* !!! extend EL_SAND to anything diggable !!! */ +#endif + ); +#endif + +#if 0 + boolean player_is_standing_on_valid_field = + (IS_WALKABLE_INSIDE(Feld[jx][jy]) || + (IS_WALKABLE(Feld[jx][jy]) && !ACCESS_FROM(Feld[jx][jy], MV_DOWN))); +#endif + +#if 0 + printf("::: checking gravity NOW [%d, %d, %d] [%d] [%d / %d] ...\n", + player_can_fall_down, + player_is_standing_on_valid_field, + player_is_moving_to_valid_field, + (player_is_moving_to_valid_field ? Feld[new_jx][new_jy] : -1), + player->effective_action, + player->can_fall_into_acid); +#endif + + if (player_can_fall_down && +#if 0 + !player_is_standing_on_valid_field && +#endif + !player_is_moving_to_valid_field) + { +#if 0 + printf("::: setting programmed_action to MV_DOWN [%d,%d - %d] ...\n", + jx, jy, FrameCounter); +#endif + + player->programmed_action = MV_DOWN; + } + } +} + +static void CheckGravityMovementWhenNotMoving(struct PlayerInfo *player) +{ +#if 1 + return CheckGravityMovement(player); +#endif + + if (game.gravity && !player->programmed_action) + { + int jx = player->jx, jy = player->jy; + boolean field_under_player_is_free = + (IN_LEV_FIELD(jx, jy + 1) && IS_FREE(jx, jy + 1)); + boolean player_is_standing_on_valid_field = + (IS_WALKABLE_INSIDE(Feld[jx][jy]) || + (IS_WALKABLE(Feld[jx][jy]) && + !(element_info[Feld[jx][jy]].access_direction & MV_DOWN))); + + if (field_under_player_is_free && !player_is_standing_on_valid_field) + player->programmed_action = MV_DOWN; + } +} + +/* + 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 MovePlayerOneStep(struct PlayerInfo *player, + int dx, int dy, int real_dx, int real_dy) +{ +#if 0 + static int trigger_sides[4][2] = + { + /* enter side leave side */ + { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* moving left */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* moving right */ + { CH_SIDE_BOTTOM, CH_SIDE_TOP }, /* moving up */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM } /* moving down */ + }; + int move_direction = (dx == -1 ? MV_LEFT : + dx == +1 ? MV_RIGHT : + dy == -1 ? MV_UP : + dy == +1 ? MV_DOWN : MV_NO_MOVING); + int enter_side = trigger_sides[MV_DIR_BIT(move_direction)][0]; + int leave_side = trigger_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; + int can_move; + + if (!player->active || (!dx && !dy)) + return MF_NO_ACTION; + + player->MovDir = (dx < 0 ? MV_LEFT : + dx > 0 ? MV_RIGHT : + dy < 0 ? MV_UP : + dy > 0 ? MV_DOWN : MV_NO_MOVING); + + if (!IN_LEV_FIELD(new_jx, new_jy)) + return MF_NO_ACTION; + + if (!options.network && !AllPlayersInSight(player, new_jx, new_jy)) + return MF_NO_ACTION; + +#if 0 + element = MovingOrBlocked2Element(new_jx, new_jy); +#else + element = MovingOrBlocked2ElementIfNotLeaving(new_jx, new_jy); +#endif + + if (DONT_RUN_INTO(element)) + { + if (element == EL_ACID && dx == 0 && dy == 1) + { + SplashAcid(new_jx, new_jy); + Feld[jx][jy] = EL_PLAYER_1; + InitMovingField(jx, jy, MV_DOWN); + Store[jx][jy] = EL_ACID; + ContinueMoving(jx, jy); + BuryHero(player); + } + else + TestIfHeroRunsIntoBadThing(jx, jy, player->MovDir); + + return MF_MOVING; + } + + can_move = DigField(player, jx, jy, new_jx, new_jy, real_dx,real_dy, DF_DIG); + if (can_move != MF_MOVING) + return can_move; + + /* check if DigField() has caused relocation of the player */ + if (player->jx != jx || player->jy != jy) + return MF_NO_ACTION; + + StorePlayer[jx][jy] = 0; + player->last_jx = jx; + player->last_jy = jy; + player->jx = new_jx; + player->jy = new_jy; + StorePlayer[new_jx][new_jy] = player->element_nr; + + player->MovPos = + (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value); + + player->step_counter++; + +#if 0 + player->drop_delay = 0; +#endif + + PlayerVisit[jx][jy] = FrameCounter; + + ScrollPlayer(player, SCROLL_INIT); + +#if 0 + if (IS_CUSTOM_ELEMENT(Feld[jx][jy])) + { + CheckTriggeredElementChangeBySide(jx, jy, Feld[jx][jy], CE_OTHER_GETS_LEFT, + leave_side); + CheckElementChangeBySide(jx,jy, Feld[jx][jy],CE_LEFT_BY_PLAYER,leave_side); + } + + if (IS_CUSTOM_ELEMENT(Feld[new_jx][new_jy])) + { + CheckTriggeredElementChangeBySide(new_jx, new_jy, Feld[new_jx][new_jy], + CE_OTHER_GETS_ENTERED, enter_side); + CheckElementChangeBySide(new_jx, new_jy, Feld[new_jx][new_jy], + CE_ENTERED_BY_PLAYER, enter_side); + } +#endif + + return MF_MOVING; +} + +boolean MovePlayer(struct PlayerInfo *player, int dx, int dy) +{ + int jx = player->jx, jy = player->jy; + int old_jx = jx, old_jy = jy; + int moved = MF_NO_ACTION; + +#if 1 + if (!player->active) + return FALSE; + + if (!dx && !dy) + { + if (player->MovPos == 0) + { + player->is_moving = FALSE; + player->is_digging = FALSE; + player->is_collecting = FALSE; + player->is_snapping = FALSE; + player->is_pushing = FALSE; + } + + return FALSE; + } +#else + if (!player->active || (!dx && !dy)) + return FALSE; +#endif + +#if 0 + if (!FrameReached(&player->move_delay, player->move_delay_value) && + !tape.playing) + return FALSE; +#else + +#if 1 + +#if 0 + printf("::: %d <= %d < %d ?\n", player->move_delay, FrameCounter, + player->move_delay + player->move_delay_value); +#endif + +#if USE_NEW_MOVE_DELAY + if (player->move_delay > 0) +#else + if (!FrameReached(&player->move_delay, player->move_delay_value)) +#endif + { +#if 0 + printf("::: can NOT move\n"); +#endif + + return FALSE; + } +#else + if (!FrameReached(&player->move_delay, player->move_delay_value) && + !(tape.playing && tape.file_version < FILE_VERSION_2_0)) + return FALSE; +#endif + +#endif + +#if 0 + printf("::: COULD move now\n"); +#endif + +#if USE_NEW_MOVE_DELAY + player->move_delay = -1; /* set to "uninitialized" value */ +#endif + + /* store if player is automatically moved to next field */ + player->is_auto_moving = (player->programmed_action != MV_NO_MOVING); + + /* remove the last programmed player action */ + player->programmed_action = 0; + + if (player->MovPos) + { + /* should only happen if pre-1.2 tape recordings are played */ + /* this is only for backward compatibility */ + + int original_move_delay_value = player->move_delay_value; + +#if DEBUG + printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%ld]\n", + tape.counter); +#endif + + /* scroll remaining steps with finest movement resolution */ + player->move_delay_value = MOVE_DELAY_NORMAL_SPEED; + + while (player->MovPos) + { + ScrollPlayer(player, SCROLL_GO_ON); + ScrollScreen(NULL, SCROLL_GO_ON); + +#if USE_NEW_MOVE_DELAY + AdvanceFrameAndPlayerCounters(player->index_nr); +#else + FrameCounter++; +#endif + + DrawAllPlayers(); + BackToFront(); + } + + player->move_delay_value = original_move_delay_value; + } + + if (player->last_move_dir & MV_HORIZONTAL) + { + if (!(moved |= MovePlayerOneStep(player, 0, dy, dx, dy))) + moved |= MovePlayerOneStep(player, dx, 0, dx, dy); + } + else + { + if (!(moved |= MovePlayerOneStep(player, dx, 0, dx, dy))) + moved |= MovePlayerOneStep(player, 0, dy, dx, dy); + } + + jx = player->jx; + jy = player->jy; + + if (moved & MF_MOVING && !ScreenMovPos && + (player == local_player || !options.network)) + { + int old_scroll_x = scroll_x, old_scroll_y = scroll_y; + int offset = (setup.scroll_delay ? 3 : 0); + + if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) + { + /* actual player has left the screen -- scroll in that direction */ + if (jx != old_jx) /* player has moved horizontally */ + scroll_x += (jx - old_jx); + else /* player has moved vertically */ + scroll_y += (jy - old_jy); + } + else + { + if (jx != old_jx) /* player has moved horizontally */ + { + if ((player->MovDir == MV_LEFT && scroll_x > jx - MIDPOSX + offset) || + (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset)) + scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset); + + /* don't scroll over playfield boundaries */ + if (scroll_x < SBX_Left || scroll_x > SBX_Right) + scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right); + + /* don't scroll more than one field at a time */ + scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x); + + /* don't scroll against the player's moving direction */ + if ((player->MovDir == MV_LEFT && scroll_x > old_scroll_x) || + (player->MovDir == MV_RIGHT && scroll_x < old_scroll_x)) + scroll_x = old_scroll_x; + } + else /* player has moved vertically */ + { + if ((player->MovDir == MV_UP && scroll_y > jy - MIDPOSY + offset) || + (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset)) + scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset); + + /* don't scroll over playfield boundaries */ + if (scroll_y < SBY_Upper || scroll_y > SBY_Lower) + scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower); + + /* don't scroll more than one field at a time */ + scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y); + + /* don't scroll against the player's moving direction */ + if ((player->MovDir == MV_UP && scroll_y > old_scroll_y) || + (player->MovDir == MV_DOWN && scroll_y < old_scroll_y)) + scroll_y = old_scroll_y; + } + } + + if (scroll_x != old_scroll_x || scroll_y != old_scroll_y) + { + if (!options.network && !AllPlayersInVisibleScreen()) + { + scroll_x = old_scroll_x; + scroll_y = old_scroll_y; + } + else + { + ScrollScreen(player, SCROLL_INIT); + ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y); + } + } + } + +#if 0 +#if 1 + InitPlayerGfxAnimation(player, ACTION_DEFAULT); +#else + if (!(moved & MF_MOVING) && !player->is_pushing) + player->Frame = 0; +#endif +#endif + + player->StepFrame = 0; + + if (moved & MF_MOVING) + { +#if 0 + printf("::: REALLY moves now\n"); +#endif + + if (old_jx != jx && old_jy == jy) + player->MovDir = (old_jx < jx ? MV_RIGHT : MV_LEFT); + else if (old_jx == jx && old_jy != jy) + player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP); + + DrawLevelField(jx, jy); /* for "crumbled sand" */ + + player->last_move_dir = player->MovDir; + player->is_moving = TRUE; +#if 1 + player->is_snapping = FALSE; +#endif - while (player->MovPos) +#if 1 + player->is_switching = FALSE; +#endif + + player->is_dropping = FALSE; + + +#if 0 + /* !!! ENABLE THIS FOR OLD VERSIONS !!! */ + +#if 1 + if (game.engine_version < VERSION_IDENT(3,1,0,0)) +#endif { - ScrollFigure(player, SCROLL_GO_ON); - ScrollScreen(NULL, SCROLL_GO_ON); - FrameCounter++; - DrawAllPlayers(); - BackToFront(); + int move_direction = player->MovDir; +#if 1 + int enter_side = MV_DIR_OPPOSITE(move_direction); + int leave_side = move_direction; +#else + static int trigger_sides[4][2] = + { + /* enter side leave side */ + { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* moving left */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* moving right */ + { CH_SIDE_BOTTOM, CH_SIDE_TOP }, /* moving up */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM } /* moving down */ + }; + int enter_side = trigger_sides[MV_DIR_BIT(move_direction)][0]; + int leave_side = trigger_sides[MV_DIR_BIT(move_direction)][1]; +#endif + int old_element = Feld[old_jx][old_jy]; + int new_element = Feld[jx][jy]; + +#if 1 + /* !!! TEST ONLY !!! */ + if (IS_CUSTOM_ELEMENT(old_element)) + CheckElementChangeByPlayer(old_jx, old_jy, old_element, + CE_LEFT_BY_PLAYER, + player->index_bit, leave_side); + + CheckTriggeredElementChangeByPlayer(old_jx, old_jy, old_element, + CE_OTHER_GETS_LEFT, + player->index_bit, leave_side); + + if (IS_CUSTOM_ELEMENT(new_element)) + CheckElementChangeByPlayer(jx, jy, new_element, CE_ENTERED_BY_PLAYER, + player->index_bit, enter_side); + + CheckTriggeredElementChangeByPlayer(jx, jy, new_element, + CE_OTHER_GETS_ENTERED, + player->index_bit, enter_side); +#endif + } +#endif - player->move_delay_value = original_move_delay_value; + + } + else + { + CheckGravityMovementWhenNotMoving(player); + + /* + player->last_move_dir = MV_NO_MOVING; + */ + player->is_moving = FALSE; + +#if USE_NEW_MOVE_STYLE + /* player is ALLOWED to move, but CANNOT move (something blocks his way) */ + /* ensure that the player is also allowed to move in the next frame */ + /* (currently, the player is forced to wait eight frames before he can try + again!!!) */ + + player->move_delay = 0; /* allow direct movement in the next frame */ +#endif + } + +#if USE_NEW_MOVE_DELAY + if (player->move_delay == -1) /* not yet initialized by DigField() */ + player->move_delay = player->move_delay_value; +#endif + + if (game.engine_version < VERSION_IDENT(3,0,7,0)) + { + TestIfHeroTouchesBadThing(jx, jy); + TestIfPlayerTouchesCustomElement(jx, jy); + } + + if (!player->active) + RemoveHero(player); + + return moved; +} + +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; + int move_stepsize = TILEX / player->move_delay_value; + + if (!player->active || !player->MovPos) + return; + + if (mode == SCROLL_INIT) + { + player->actual_frame_counter = FrameCounter; + player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); + +#if USE_NEW_BLOCK_STYLE + if (player->block_delay_value > 0 && + Feld[last_jx][last_jy] == EL_EMPTY) + { + Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; +#if 1 + MovDelay[last_jx][last_jy] = player->block_delay_value + 1; +#else + ChangeDelay[last_jx][last_jy] = player->block_last_field_delay; +#endif + } +#else +#if USE_NEW_MOVE_STYLE + if (player->block_last_field && + Feld[last_jx][last_jy] == EL_EMPTY) + Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; +#else + if (Feld[last_jx][last_jy] == EL_EMPTY) + Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; +#endif +#endif + +#if 0 + DrawPlayer(player); +#endif + + return; + } + else if (!FrameReached(&player->actual_frame_counter, 1)) + return; + + player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize; + player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); + +#if USE_NEW_BLOCK_STYLE +#else + if (!player->block_last_field && + Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING) +#if 1 + RemoveField(last_jx, last_jy); +#else + Feld[last_jx][last_jy] = EL_EMPTY; +#endif +#endif + + /* before DrawPlayer() to draw correct player graphic for this case */ + if (player->MovPos == 0) + CheckGravityMovement(player); + +#if 0 + DrawPlayer(player); /* needed here only to cleanup last field */ +#endif + + if (player->MovPos == 0) /* player reached destination field */ + { +#if 1 + if (player->move_delay_reset_counter > 0) + { + player->move_delay_reset_counter--; + + if (player->move_delay_reset_counter == 0) + { + /* continue with normal speed after quickly moving through gate */ + HALVE_PLAYER_SPEED(player); + + /* be able to make the next move without delay */ + player->move_delay = 0; + } + } +#else + if (IS_PASSABLE(Feld[last_jx][last_jy])) + { + /* continue with normal speed after quickly moving through gate */ + HALVE_PLAYER_SPEED(player); + + /* be able to make the next move without delay */ + player->move_delay = 0; + } +#endif + +#if USE_NEW_BLOCK_STYLE +#else + if (player->block_last_field && + Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING) +#if 1 + RemoveField(last_jx, last_jy); +#else + Feld[last_jx][last_jy] = EL_EMPTY; +#endif +#endif + + player->last_jx = jx; + player->last_jy = jy; + + if (Feld[jx][jy] == EL_EXIT_OPEN || + Feld[jx][jy] == EL_SP_EXIT_OPEN || + Feld[jx][jy] == EL_SP_EXIT_OPENING) /* <-- special case */ + { + DrawPlayer(player); /* needed here only to cleanup last field */ + RemoveHero(player); + + if (local_player->friends_still_needed == 0 || + IS_SP_ELEMENT(Feld[jx][jy])) + player->LevelSolved = player->GameOver = TRUE; + } + +#if 1 + /* !!! ENABLE THIS FOR NEW VERSIONS !!! */ + /* this breaks one level: "machine", level 000 */ +#if 0 + if (game.engine_version >= VERSION_IDENT(3,1,0,0)) +#endif + { + int move_direction = player->MovDir; +#if 1 + int enter_side = MV_DIR_OPPOSITE(move_direction); + int leave_side = move_direction; +#else + static int trigger_sides[4][2] = + { + /* enter side leave side */ + { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* moving left */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* moving right */ + { CH_SIDE_BOTTOM, CH_SIDE_TOP }, /* moving up */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM } /* moving down */ + }; + int enter_side = trigger_sides[MV_DIR_BIT(move_direction)][0]; + int leave_side = trigger_sides[MV_DIR_BIT(move_direction)][1]; +#endif + int old_jx = last_jx; + int old_jy = last_jy; + int old_element = Feld[old_jx][old_jy]; + int new_element = Feld[jx][jy]; + +#if 1 + /* !!! TEST ONLY !!! */ + if (IS_CUSTOM_ELEMENT(old_element)) + CheckElementChangeByPlayer(old_jx, old_jy, old_element, + CE_LEFT_BY_PLAYER, + player->index_bit, leave_side); + + CheckTriggeredElementChangeByPlayer(old_jx, old_jy, old_element, + CE_OTHER_GETS_LEFT, + player->index_bit, leave_side); + + if (IS_CUSTOM_ELEMENT(new_element)) + CheckElementChangeByPlayer(jx, jy, new_element, CE_ENTERED_BY_PLAYER, + player->index_bit, enter_side); + + CheckTriggeredElementChangeByPlayer(jx, jy, new_element, + CE_OTHER_GETS_ENTERED, + player->index_bit, enter_side); +#endif + + } +#endif + + if (game.engine_version >= VERSION_IDENT(3,0,7,0)) + { + TestIfHeroTouchesBadThing(jx, jy); + TestIfPlayerTouchesCustomElement(jx, jy); +#if 1 +#if 1 + /* needed because pushed element has not yet reached its destination, + so it would trigger a change event at its previous field location */ + if (!player->is_pushing) +#endif + TestIfElementTouchesCustomElement(jx, jy); /* for empty space */ +#endif + + if (!player->active) + RemoveHero(player); + } + + if (level.use_step_counter) + { + int i; + + TimePlayed++; + + if (TimeLeft > 0) + { + TimeLeft--; + + if (TimeLeft <= 10 && setup.time_limit) + PlaySoundStereo(SND_GAME_RUNNING_OUT_OF_TIME, SOUND_MIDDLE); + + DrawGameValue_Time(TimeLeft); + + if (!TimeLeft && setup.time_limit) + for (i = 0; i < MAX_PLAYERS; i++) + KillHero(&stored_player[i]); + } + else if (level.time == 0 && !AllPlayersGone) /* level w/o time limit */ + DrawGameValue_Time(TimePlayed); + } + + if (tape.single_step && tape.recording && !tape.pausing && + !player->programmed_action) + TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); + } +} + +void ScrollScreen(struct PlayerInfo *player, int mode) +{ + static unsigned long screen_frame_counter = 0; + + if (mode == SCROLL_INIT) + { + /* set scrolling step size according to actual player's moving speed */ + ScrollStepSize = TILEX / player->move_delay_value; + + screen_frame_counter = FrameCounter; + ScreenMovDir = player->MovDir; + ScreenMovPos = player->MovPos; + ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); + return; + } + else if (!FrameReached(&screen_frame_counter, 1)) + return; + + if (ScreenMovPos) + { + ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * ScrollStepSize; + ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); + redraw_mask |= REDRAW_FIELD; + } + else + ScreenMovDir = MV_NO_MOVING; +} + +void TestIfPlayerTouchesCustomElement(int x, int y) +{ + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + static int trigger_sides[4][2] = + { + /* center side border side */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM }, /* check top */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* check left */ + { 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; + + for (i = 0; i < NUM_DIRECTIONS; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int center_side = trigger_sides[i][0]; + int border_side = trigger_sides[i][1]; + int border_element; + + if (!IN_LEV_FIELD(xx, yy)) + continue; + + if (IS_PLAYER(x, y)) + { + struct PlayerInfo *player = PLAYERINFO(x, y); + + 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 */ + +#if 1 + /* !!! TEST ONLY !!! */ + CheckElementChangeByPlayer(xx, yy, border_element, CE_TOUCHED_BY_PLAYER, + player->index_bit, border_side); + CheckTriggeredElementChangeByPlayer(xx, yy, border_element, + CE_OTHER_GETS_TOUCHED, + player->index_bit, border_side); +#else + CheckTriggeredElementChangeByPlayer(xx, yy, border_element, + CE_OTHER_GETS_TOUCHED, + player->index_bit, border_side); + CheckElementChangeByPlayer(xx, yy, border_element, CE_TOUCHED_BY_PLAYER, + player->index_bit, border_side); +#endif + } + else if (IS_PLAYER(xx, yy)) + { + struct PlayerInfo *player = PLAYERINFO(xx, yy); + + 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 */ + } + +#if 1 + /* !!! TEST ONLY !!! */ + CheckElementChangeByPlayer(x, y, center_element, CE_TOUCHED_BY_PLAYER, + player->index_bit, center_side); + CheckTriggeredElementChangeByPlayer(x, y, center_element, + CE_OTHER_GETS_TOUCHED, + player->index_bit, center_side); +#else + CheckTriggeredElementChangeByPlayer(x, y, center_element, + CE_OTHER_GETS_TOUCHED, + player->index_bit, center_side); + CheckElementChangeByPlayer(x, y, center_element, CE_TOUCHED_BY_PLAYER, + player->index_bit, center_side); +#endif + + break; + } } +} - if (player->last_move_dir & (MV_LEFT | MV_RIGHT)) +void TestIfElementTouchesCustomElement(int x, int y) +{ + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + static int trigger_sides[4][2] = { - if (!(moved |= MoveFigureOneStep(player, 0, dy, dx, dy))) - moved |= MoveFigureOneStep(player, dx, 0, dx, dy); - } - else + /* center side border side */ + { CH_SIDE_TOP, CH_SIDE_BOTTOM }, /* check top */ + { CH_SIDE_LEFT, CH_SIDE_RIGHT }, /* check left */ + { CH_SIDE_RIGHT, CH_SIDE_LEFT }, /* check right */ + { CH_SIDE_BOTTOM, CH_SIDE_TOP } /* check bottom */ + }; + static int touch_dir[4] = { - if (!(moved |= MoveFigureOneStep(player, dx, 0, dx, dy))) - moved |= MoveFigureOneStep(player, 0, dy, dx, dy); - } - - jx = player->jx; - jy = player->jy; + MV_LEFT | MV_RIGHT, + MV_UP | MV_DOWN, + MV_UP | MV_DOWN, + MV_LEFT | MV_RIGHT + }; + boolean change_center_element = FALSE; + int center_element_change_page = 0; + int center_element = Feld[x][y]; /* should always be non-moving! */ + int border_trigger_element = EL_UNDEFINED; + int i, j; - if (moved & MF_MOVING && !ScreenMovPos && - (player == local_player || !options.network)) + for (i = 0; i < NUM_DIRECTIONS; i++) { - int old_scroll_x = scroll_x, old_scroll_y = scroll_y; - int offset = (setup.scroll_delay ? 3 : 0); - - if (!IN_VIS_FIELD(SCREENX(jx), SCREENY(jy))) - { - /* actual player has left the screen -- scroll in that direction */ - if (jx != old_jx) /* player has moved horizontally */ - scroll_x += (jx - old_jx); - else /* player has moved vertically */ - scroll_y += (jy - old_jy); - } - else - { - if (jx != old_jx) /* player has moved horizontally */ - { - if ((player->MovDir == MV_LEFT && scroll_x > jx - MIDPOSX + offset) || - (player->MovDir == MV_RIGHT && scroll_x < jx - MIDPOSX - offset)) - scroll_x = jx-MIDPOSX + (scroll_x < jx-MIDPOSX ? -offset : +offset); + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int center_side = trigger_sides[i][0]; + int border_side = trigger_sides[i][1]; + int border_element; - /* don't scroll over playfield boundaries */ - if (scroll_x < SBX_Left || scroll_x > SBX_Right) - scroll_x = (scroll_x < SBX_Left ? SBX_Left : SBX_Right); + if (!IN_LEV_FIELD(xx, yy)) + continue; - /* don't scroll more than one field at a time */ - scroll_x = old_scroll_x + SIGN(scroll_x - old_scroll_x); + 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 */ - /* don't scroll against the player's moving direction */ - if ((player->MovDir == MV_LEFT && scroll_x > old_scroll_x) || - (player->MovDir == MV_RIGHT && scroll_x < old_scroll_x)) - scroll_x = old_scroll_x; - } - else /* player has moved vertically */ + /* check for change of center element (but change it only once) */ + if (IS_CUSTOM_ELEMENT(center_element) && + HAS_ANY_CHANGE_EVENT(center_element, CE_OTHER_IS_TOUCHING) && + !change_center_element) + { + for (j = 0; j < element_info[center_element].num_change_pages; j++) { - if ((player->MovDir == MV_UP && scroll_y > jy - MIDPOSY + offset) || - (player->MovDir == MV_DOWN && scroll_y < jy - MIDPOSY - offset)) - scroll_y = jy-MIDPOSY + (scroll_y < jy-MIDPOSY ? -offset : +offset); - - /* don't scroll over playfield boundaries */ - if (scroll_y < SBY_Upper || scroll_y > SBY_Lower) - scroll_y = (scroll_y < SBY_Upper ? SBY_Upper : SBY_Lower); + struct ElementChangeInfo *change = + &element_info[center_element].change_page[j]; - /* don't scroll more than one field at a time */ - scroll_y = old_scroll_y + SIGN(scroll_y - old_scroll_y); + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && + change->trigger_side & border_side && +#if 1 + IS_EQUAL_OR_IN_GROUP(border_element, change->trigger_element) +#else + change->trigger_element == border_element +#endif + ) + { + change_center_element = TRUE; + center_element_change_page = j; + border_trigger_element = border_element; - /* don't scroll against the player's moving direction */ - if ((player->MovDir == MV_UP && scroll_y > old_scroll_y) || - (player->MovDir == MV_DOWN && scroll_y < old_scroll_y)) - scroll_y = old_scroll_y; + break; + } } } - if (scroll_x != old_scroll_x || scroll_y != old_scroll_y) + /* check for change of border element */ + if (IS_CUSTOM_ELEMENT(border_element) && + HAS_ANY_CHANGE_EVENT(border_element, CE_OTHER_IS_TOUCHING)) { - if (!options.network && !AllPlayersInVisibleScreen()) - { - scroll_x = old_scroll_x; - scroll_y = old_scroll_y; - } - else + for (j = 0; j < element_info[border_element].num_change_pages; j++) { - ScrollScreen(player, SCROLL_INIT); - ScrollLevel(old_scroll_x - scroll_x, old_scroll_y - scroll_y); - } - } - } + struct ElementChangeInfo *change = + &element_info[border_element].change_page[j]; -#if 0 + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && + change->trigger_side & center_side && #if 1 - InitPlayerGfxAnimation(player, ACTION_DEFAULT); + IS_EQUAL_OR_IN_GROUP(center_element, change->trigger_element) #else - if (!(moved & MF_MOVING) && !player->Pushing) - player->Frame = 0; + change->trigger_element == center_element #endif + ) + { +#if 0 + printf("::: border_element %d, %d\n", x, y); #endif - player->StepFrame = 0; - - if (moved & MF_MOVING) - { - if (old_jx != jx && old_jy == jy) - player->MovDir = (old_jx < jx ? MV_RIGHT : MV_LEFT); - else if (old_jx == jx && old_jy != jy) - player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP); - - DrawLevelField(jx, jy); /* for "crumbled sand" */ - - player->last_move_dir = player->MovDir; - player->is_moving = TRUE; + CheckElementChangeByPage(xx, yy, border_element, center_element, + CE_OTHER_IS_TOUCHING, j); + break; + } + } + } } - else + + if (change_center_element) { - CheckGravityMovement(player); +#if 0 + printf("::: center_element %d, %d\n", x, y); +#endif - /* - player->last_move_dir = MV_NO_MOVING; - */ - player->is_moving = FALSE; + CheckElementChangeByPage(x, y, center_element, border_trigger_element, + CE_OTHER_IS_TOUCHING, center_element_change_page); } - - TestIfHeroTouchesBadThing(jx, jy); - - if (!player->active) - RemoveHero(player); - - return moved; } -void ScrollFigure(struct PlayerInfo *player, int mode) +void TestIfElementHitsCustomElement(int x, int y, int direction) { - int jx = player->jx, jy = player->jy; - int last_jx = player->last_jx, last_jy = player->last_jy; - int move_stepsize = TILEX / player->move_delay_value; + int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); + int hitx = x + dx, hity = y + dy; + int hitting_element = Feld[x][y]; + int touched_element; +#if 0 + boolean object_hit = (IN_LEV_FIELD(hitx, hity) && + !IS_FREE(hitx, hity) && + (!IS_MOVING(hitx, hity) || + MovDir[hitx][hity] != direction || + ABS(MovPos[hitx][hity]) <= TILEY / 2)); +#endif - if (!player->active || !player->MovPos) + if (IN_LEV_FIELD(hitx, hity) && IS_FREE(hitx, hity)) return; - if (mode == SCROLL_INIT) - { - player->actual_frame_counter = FrameCounter; - player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); - - if (Feld[last_jx][last_jy] == EL_EMPTY) - Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; - - DrawPlayer(player); - return; - } - else if (!FrameReached(&player->actual_frame_counter, 1)) +#if 0 + if (IN_LEV_FIELD(hitx, hity) && !object_hit) return; +#endif - player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize; - player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); + touched_element = (IN_LEV_FIELD(hitx, hity) ? + MovingOrBlocked2Element(hitx, hity) : EL_STEELWALL); - if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING) - Feld[last_jx][last_jy] = EL_EMPTY; + CheckElementChangeBySide(x, y, hitting_element, touched_element, + CE_HITTING_SOMETHING, direction); - /* before DrawPlayer() to draw correct player graphic for this case */ - if (player->MovPos == 0) - CheckGravityMovement(player); + if (IN_LEV_FIELD(hitx, hity)) + { + int opposite_direction = MV_DIR_OPPOSITE(direction); + int hitting_side = direction; + int touched_side = opposite_direction; +#if 0 + int touched_element = MovingOrBlocked2Element(hitx, hity); +#endif +#if 1 + boolean object_hit = (!IS_MOVING(hitx, hity) || + MovDir[hitx][hity] != direction || + ABS(MovPos[hitx][hity]) <= TILEY / 2); - DrawPlayer(player); + object_hit = TRUE; +#endif - if (player->MovPos == 0) - { - if (IS_PASSABLE(Feld[last_jx][last_jy])) + if (object_hit) { - /* continue with normal speed after quickly moving through gate */ - HALVE_PLAYER_SPEED(player); + int i; - /* be able to make the next move without delay */ - player->move_delay = 0; - } + CheckElementChangeBySide(hitx, hity, touched_element, hitting_element, + CE_HIT_BY_SOMETHING, opposite_direction); - player->last_jx = jx; - player->last_jy = jy; + if (IS_CUSTOM_ELEMENT(hitting_element) && + HAS_ANY_CHANGE_EVENT(hitting_element, CE_OTHER_IS_HITTING)) + { + for (i = 0; i < element_info[hitting_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[hitting_element].change_page[i]; - if (Feld[jx][jy] == EL_EXIT_OPEN || - Feld[jx][jy] == EL_SP_EXIT_OPEN) - { - RemoveHero(player); + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_HITTING) && + change->trigger_side & touched_side && + +#if 1 + IS_EQUAL_OR_IN_GROUP(touched_element, change->trigger_element) +#else + change->trigger_element == touched_element +#endif + ) + { + CheckElementChangeByPage(x, y, hitting_element, touched_element, + CE_OTHER_IS_HITTING, i); + break; + } + } + } - if (local_player->friends_still_needed == 0 || - Feld[jx][jy] == EL_SP_EXIT_OPEN) - player->LevelSolved = player->GameOver = TRUE; - } + if (IS_CUSTOM_ELEMENT(touched_element) && + HAS_ANY_CHANGE_EVENT(touched_element, CE_OTHER_GETS_HIT)) + { + for (i = 0; i < element_info[touched_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[touched_element].change_page[i]; - if (tape.single_step && tape.recording && !tape.pausing && - !player->programmed_action) - TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_GETS_HIT) && + change->trigger_side & hitting_side && +#if 1 + IS_EQUAL_OR_IN_GROUP(hitting_element, change->trigger_element) +#else + change->trigger_element == hitting_element +#endif + ) + { + CheckElementChangeByPage(hitx, hity, touched_element, + hitting_element, CE_OTHER_GETS_HIT, i); + break; + } + } + } + } } } -void ScrollScreen(struct PlayerInfo *player, int mode) +#if 0 +void TestIfElementSmashesCustomElement(int x, int y, int direction) { - static unsigned long screen_frame_counter = 0; - - if (mode == SCROLL_INIT) - { - /* set scrolling step size according to actual player's moving speed */ - ScrollStepSize = TILEX / player->move_delay_value; + int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); + int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); + int hitx = x + dx, hity = y + dy; + int hitting_element = Feld[x][y]; + int touched_element; +#if 0 + boolean object_hit = (IN_LEV_FIELD(hitx, hity) && + !IS_FREE(hitx, hity) && + (!IS_MOVING(hitx, hity) || + MovDir[hitx][hity] != direction || + ABS(MovPos[hitx][hity]) <= TILEY / 2)); +#endif - screen_frame_counter = FrameCounter; - ScreenMovDir = player->MovDir; - ScreenMovPos = player->MovPos; - ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); + if (IN_LEV_FIELD(hitx, hity) && IS_FREE(hitx, hity)) return; - } - else if (!FrameReached(&screen_frame_counter, 1)) + +#if 0 + if (IN_LEV_FIELD(hitx, hity) && !object_hit) return; +#endif - if (ScreenMovPos) + touched_element = (IN_LEV_FIELD(hitx, hity) ? + MovingOrBlocked2Element(hitx, hity) : EL_STEELWALL); + + CheckElementChangeBySide(x, y, hitting_element, touched_element, + EP_CAN_SMASH_EVERYTHING, direction); + + if (IN_LEV_FIELD(hitx, hity)) { - ScreenMovPos += (ScreenMovPos > 0 ? -1 : 1) * ScrollStepSize; - ScreenGfxPos = ScrollStepSize * (ScreenMovPos / ScrollStepSize); - redraw_mask |= REDRAW_FIELD; + int opposite_direction = MV_DIR_OPPOSITE(direction); + int hitting_side = direction; + int touched_side = opposite_direction; +#if 0 + int touched_element = MovingOrBlocked2Element(hitx, hity); +#endif +#if 1 + boolean object_hit = (!IS_MOVING(hitx, hity) || + MovDir[hitx][hity] != direction || + ABS(MovPos[hitx][hity]) <= TILEY / 2); + + object_hit = TRUE; +#endif + + if (object_hit) + { + int i; + + CheckElementChangeBySide(hitx, hity, touched_element, hitting_element, + CE_SMASHED_BY_SOMETHING, opposite_direction); + + if (IS_CUSTOM_ELEMENT(hitting_element) && + HAS_ANY_CHANGE_EVENT(hitting_element, CE_OTHER_IS_SMASHING)) + { + for (i = 0; i < element_info[hitting_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[hitting_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_SMASHING) && + change->trigger_side & touched_side && + +#if 1 + IS_EQUAL_OR_IN_GROUP(touched_element, change->trigger_element) +#else + change->trigger_element == touched_element +#endif + ) + { + CheckElementChangeByPage(x, y, hitting_element, touched_element, + CE_OTHER_IS_SMASHING, i); + break; + } + } + } + + if (IS_CUSTOM_ELEMENT(touched_element) && + HAS_ANY_CHANGE_EVENT(touched_element, CE_OTHER_GETS_SMASHED)) + { + for (i = 0; i < element_info[touched_element].num_change_pages; i++) + { + struct ElementChangeInfo *change = + &element_info[touched_element].change_page[i]; + + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_GETS_SMASHED) && + change->trigger_side & hitting_side && +#if 1 + IS_EQUAL_OR_IN_GROUP(hitting_element, change->trigger_element) +#else + change->trigger_element == hitting_element +#endif + ) + { + CheckElementChangeByPage(hitx, hity, touched_element, + hitting_element, CE_OTHER_GETS_SMASHED,i); + break; + } + } + } + } } - else - ScreenMovDir = MV_NO_MOVING; } +#endif void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) { int i, kill_x = -1, kill_y = -1; + int bad_element = -1; static int test_xy[4][2] = { { 0, -1 }, @@ -5822,12 +10590,13 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) MV_DOWN }; - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { int test_x, test_y, test_move_dir, test_element; test_x = good_x + test_xy[i][0]; test_y = good_y + test_xy[i][1]; + if (!IN_LEV_FIELD(test_x, test_y)) continue; @@ -5848,6 +10617,8 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) { kill_x = test_x; kill_y = test_y; + bad_element = test_element; + break; } } @@ -5858,10 +10629,18 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) { struct PlayerInfo *player = PLAYERINFO(good_x, good_y); +#if 1 + if (player->shield_deadly_time_left > 0 && + !IS_INDESTRUCTIBLE(bad_element)) + Bang(kill_x, kill_y); + else if (!PLAYER_ENEMY_PROTECTED(good_x, good_y)) + KillHero(player); +#else if (player->shield_deadly_time_left > 0) Bang(kill_x, kill_y); - else if (!PLAYER_PROTECTED(good_x, good_y)) + else if (!PLAYER_ENEMY_PROTECTED(good_x, good_y)) KillHero(player); +#endif } else Bang(good_x, good_y); @@ -5879,6 +10658,13 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_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, @@ -5890,7 +10676,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir) if (bad_element == EL_EXPLOSION) /* skip just exploding bad things */ return; - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { int test_x, test_y, test_move_dir, test_element; @@ -5918,6 +10704,12 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir) 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; @@ -5937,28 +10729,18 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir) { 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 1 + if (player->shield_deadly_time_left > 0 && + !IS_INDESTRUCTIBLE(bad_element)) + Bang(bad_x, bad_y); + else if (!PLAYER_ENEMY_PROTECTED(kill_x, kill_y)) + KillHero(player); +#else if (player->shield_deadly_time_left > 0) Bang(bad_x, bad_y); - else if (!PLAYER_PROTECTED(kill_x, kill_y)) + else if (!PLAYER_ENEMY_PROTECTED(kill_x, kill_y)) KillHero(player); +#endif } else Bang(kill_x, kill_y); @@ -6006,7 +10788,7 @@ void TestIfBadThingTouchesOtherBadThing(int bad_x, int bad_y) { 0, +1 } }; - for (i=0; i<4; i++) + for (i = 0; i < NUM_DIRECTIONS; i++) { int x, y, element; @@ -6047,9 +10829,15 @@ void KillHero(struct PlayerInfo *player) BuryHero(player); } -static void KillHeroUnlessProtected(int x, int y) +static void KillHeroUnlessEnemyProtected(int x, int y) +{ + if (!PLAYER_ENEMY_PROTECTED(x, y)) + KillHero(PLAYERINFO(x, y)); +} + +static void KillHeroUnlessExplosionProtected(int x, int y) { - if (!PLAYER_PROTECTED(x, y)) + if (!PLAYER_EXPLOSION_PROTECTED(x, y)) KillHero(PLAYERINFO(x, y)); } @@ -6060,8 +10848,12 @@ void BuryHero(struct PlayerInfo *player) if (!player->active) return; - PlaySoundLevel(jx, jy, SND_CLASS_PLAYER_DYING); - PlaySoundLevel(jx, jy, SND_GAME_LOSING); +#if 1 + PlayLevelSoundElementAction(jx, jy, player->element_nr, ACTION_DYING); +#else + PlayLevelSound(jx, jy, SND_CLASS_PLAYER_DYING); +#endif + PlayLevelSound(jx, jy, SND_GAME_LOSING); player->GameOver = TRUE; RemoveHero(player); @@ -6078,7 +10870,7 @@ void RemoveHero(struct PlayerInfo *player) if (!ExplodeField[jx][jy]) StorePlayer[jx][jy] = 0; - for (i=0; ijx, jy = player->jy; +#if 0 + boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0,0)); +#endif + boolean is_player = (IS_PLAYER(oldx, oldy) || mode != DF_DIG); + boolean player_was_pushing = player->is_pushing; + int jx = oldx, jy = oldy; int dx = x - jx, dy = y - jy; + int nextx = x + dx, nexty = y + dy; int move_direction = (dx == -1 ? MV_LEFT : dx == +1 ? MV_RIGHT : dy == -1 ? MV_UP : dy == +1 ? MV_DOWN : MV_NO_MOVING); + int opposite_direction = MV_DIR_OPPOSITE(move_direction); +#if 1 + int dig_side = MV_DIR_OPPOSITE(move_direction); +#else + static int trigger_sides[4] = + { + CH_SIDE_RIGHT, /* moving left */ + CH_SIDE_LEFT, /* moving right */ + CH_SIDE_BOTTOM, /* moving up */ + CH_SIDE_TOP, /* moving down */ + }; + int dig_side = trigger_sides[MV_DIR_BIT(move_direction)]; +#endif + int old_element = Feld[jx][jy]; int element; - if (player->MovPos == 0) + if (is_player) /* function can also be called by EL_PENGUIN */ { - player->is_digging = FALSE; - player->is_collecting = FALSE; - } + if (player->MovPos == 0) + { + player->is_digging = FALSE; + player->is_collecting = FALSE; + } - if (player->MovPos == 0) /* last pushing move finished */ - player->Pushing = FALSE; + if (player->MovPos == 0) /* last pushing move finished */ + player->is_pushing = FALSE; - if (mode == DF_NO_PUSH) /* player just stopped pushing */ - { - player->Switching = FALSE; - player->push_delay = 0; + if (mode == DF_NO_PUSH) /* player just stopped pushing */ + { + player->is_switching = FALSE; +#if USE_NEW_PUSH_DELAY + player->push_delay = -1; +#else + player->push_delay = 0; +#endif - return MF_NO_ACTION; + return MF_NO_ACTION; + } } if (IS_MOVING(x, y) || IS_PLAYER(x, y)) return MF_NO_ACTION; +#if 0 + #if 0 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; @@ -6189,402 +11015,45 @@ int DigField(struct PlayerInfo *player, return MF_NO_ACTION; /* tube has no opening in this direction */ } - element = Feld[x][y]; - -#if 1 - if (mode == DF_SNAP && !IS_SNAPPABLE(element) && - game.engine_version >= VERSION_IDENT(2,2,0)) - return MF_NO_ACTION; -#endif - - switch (element) - { - case EL_EMPTY: - case EL_SAND: - case EL_INVISIBLE_SAND: - case EL_INVISIBLE_SAND_ACTIVE: - case EL_TRAP: - case EL_SP_BASE: - case EL_SP_BUGGY_BASE: - case EL_SP_BUGGY_BASE_ACTIVATING: - RemoveField(x, y); -#if 1 - if (mode != DF_SNAP && element != EL_EMPTY) - { - GfxElement[x][y] = (CAN_BE_CRUMBLED(element) ? EL_SAND : element); - player->is_digging = TRUE; - } -#endif - PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING); - break; - - case EL_EMERALD: - case EL_BD_DIAMOND: - case EL_EMERALD_YELLOW: - case EL_EMERALD_RED: - case EL_EMERALD_PURPLE: - case EL_DIAMOND: - case EL_SP_INFOTRON: - case EL_PEARL: - case EL_CRYSTAL: - RemoveField(x, y); -#if 1 - if (mode != DF_SNAP) - { - GfxElement[x][y] = element; - player->is_collecting = TRUE; - } -#endif - local_player->gems_still_needed -= (element == EL_DIAMOND ? 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); - DrawText(DX_EMERALDS, DY_EMERALDS, - int2str(local_player->gems_still_needed, 3), FONT_TEXT_2); - PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); - break; - - case EL_SPEED_PILL: - RemoveField(x, y); - player->move_delay_value = MOVE_DELAY_HIGH_SPEED; - PlaySoundLevel(x, y, SND_SPEED_PILL_COLLECTING); - break; - - case EL_ENVELOPE: - Feld[x][y] = EL_EMPTY; - PlaySoundLevel(x, y, SND_ENVELOPE_COLLECTING); - break; - - case EL_EXTRA_TIME: - RemoveField(x, y); - if (level.time > 0) - { - TimeLeft += 10; - DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2); - } - PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, SOUND_MIDDLE); - break; - - case EL_SHIELD_NORMAL: - RemoveField(x, y); - player->shield_normal_time_left += 10; - PlaySoundLevel(x, y, SND_SHIELD_NORMAL_COLLECTING); - break; - - case EL_SHIELD_DEADLY: - RemoveField(x, y); - player->shield_normal_time_left += 10; - player->shield_deadly_time_left += 10; - PlaySoundLevel(x, y, SND_SHIELD_DEADLY_COLLECTING); - break; - - case EL_DYNAMITE: - case EL_SP_DISK_RED: - RemoveField(x, y); - player->dynamite++; - player->use_disk_red_graphic = (element == EL_SP_DISK_RED); - RaiseScoreElement(EL_DYNAMITE); - DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), - FONT_TEXT_2); - PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); - break; - - case EL_DYNABOMB_INCREASE_NUMBER: - RemoveField(x, y); - player->dynabomb_count++; - player->dynabombs_left++; - RaiseScoreElement(EL_DYNAMITE); - PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_NUMBER_COLLECTING); - break; - - case EL_DYNABOMB_INCREASE_SIZE: - RemoveField(x, y); - player->dynabomb_size++; - RaiseScoreElement(EL_DYNAMITE); - PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_SIZE_COLLECTING); - break; - - case EL_DYNABOMB_INCREASE_POWER: - RemoveField(x, y); - player->dynabomb_xl = TRUE; - RaiseScoreElement(EL_DYNAMITE); - PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_POWER_COLLECTING); - break; - - case EL_KEY_1: - case EL_KEY_2: - case EL_KEY_3: - case EL_KEY_4: - { - int key_nr = element - EL_KEY_1; - int graphic = el2edimg(element); - - RemoveField(x, y); - player->key[key_nr] = TRUE; - RaiseScoreElement(element); - DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - graphic); - DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - graphic); - PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING); - break; - } - - case EL_EM_KEY_1: - case EL_EM_KEY_2: - case EL_EM_KEY_3: - case EL_EM_KEY_4: - { - int key_nr = element - EL_EM_KEY_1; - int graphic = el2edimg(EL_KEY_1 + key_nr); - - RemoveField(x, y); - player->key[key_nr] = TRUE; - RaiseScoreElement(element); - DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - graphic); - DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - graphic); - PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING); - break; - } - - 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; - - case EL_SP_TERMINAL: - { - int xx, yy; - - PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVATING); - - for (yy=0; yySwitching) - { - player->Switching = TRUE; - ToggleBeltSwitch(x, y); - PlaySoundLevel(x, y, SND_CLASS_CONVEYOR_BELT_SWITCH_ACTIVATING); - } - return MF_ACTION; - break; - - case EL_SWITCHGATE_SWITCH_UP: - case EL_SWITCHGATE_SWITCH_DOWN: - if (!player->Switching) - { - player->Switching = TRUE; - ToggleSwitchgateSwitch(x, y); - PlaySoundLevel(x, y, SND_CLASS_SWITCHGATE_SWITCH_ACTIVATING); - } - return MF_ACTION; - break; - - case EL_LIGHT_SWITCH: - case EL_LIGHT_SWITCH_ACTIVE: - if (!player->Switching) - { - player->Switching = TRUE; - ToggleLightSwitch(x, y); - PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ? - SND_LIGHT_SWITCH_ACTIVATING : - SND_LIGHT_SWITCH_DEACTIVATING); - } - return MF_ACTION; - break; - - case EL_TIMEGATE_SWITCH: - ActivateTimegateSwitch(x, y); - PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVATING); - - return MF_ACTION; - break; - - 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; - - /* the following elements cannot be pushed by "snapping" */ - case EL_ROCK: - case EL_BOMB: - case EL_DX_SUPABOMB: - case EL_NUT: - case EL_TIME_ORB_EMPTY: - case EL_SP_ZONK: - case EL_SP_DISK_ORANGE: - case EL_SPRING: - if (mode == DF_SNAP) - return MF_NO_ACTION; - - /* no "break" -- fall through to next case */ - - /* the following elements can be pushed by "snapping" */ - case EL_BD_ROCK: - if (dy) - return MF_NO_ACTION; - - player->Pushing = TRUE; - -#if 0 - if (element == EL_ROCK) - printf("::: wanna push [%d] [%d]\n", - FrameCounter, player->push_delay_value); -#endif - - if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy)) - return MF_NO_ACTION; - - if (!checkDiagonalPushing(player, x, y, real_dx, real_dy)) - return MF_NO_ACTION; - - if (player->push_delay == 0) - player->push_delay = FrameCounter; -#if 0 - if (!FrameReached(&player->push_delay, player->push_delay_value) && - !tape.playing && - element != EL_SPRING) - return MF_NO_ACTION; #else - if (!FrameReached(&player->push_delay, player->push_delay_value) && - !(tape.playing && tape.file_version < FILE_VERSION_2_0) && - element != EL_SPRING) - return MF_NO_ACTION; -#endif - - if (mode == DF_SNAP) - { - InitMovingField(x, y, move_direction); - ContinueMoving(x, y); - } - else - { - RemoveField(x, y); - Feld[x + dx][y + dy] = element; - } - - if (element == EL_SPRING) - { - Feld[x + dx][y + dy] = EL_SPRING; - MovDir[x + dx][y + dy] = move_direction; - } - player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8)); + if (IS_TUBE(Back[jx][jy]) && game.engine_version >= VERSION_IDENT(2,2,0,0)) + old_element = Back[jx][jy]; - DrawLevelField(x + dx, y + dy); - PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); - break; - - case EL_GATE_1: - case EL_GATE_2: - case EL_GATE_3: - case EL_GATE_4: - if (!player->key[element - EL_GATE_1]) - return MF_NO_ACTION; - break; - - case EL_GATE_1_GRAY: - case EL_GATE_2_GRAY: - case EL_GATE_3_GRAY: - case EL_GATE_4_GRAY: - if (!player->key[element - EL_GATE_1_GRAY]) - return MF_NO_ACTION; - break; +#endif - case EL_EM_GATE_1: - case EL_EM_GATE_2: - case EL_EM_GATE_3: - case EL_EM_GATE_4: - if (!player->key[element - EL_EM_GATE_1]) - return MF_NO_ACTION; - if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) - return MF_NO_ACTION; + if (IS_WALKABLE(old_element) && !ACCESS_FROM(old_element, move_direction)) + return MF_NO_ACTION; /* field has no opening in this direction */ - /* automatically move to the next field with double speed */ - player->programmed_action = move_direction; - DOUBLE_PLAYER_SPEED(player); + if (IS_PASSABLE(old_element) && !ACCESS_FROM(old_element,opposite_direction)) + return MF_NO_ACTION; /* field has no opening in this direction */ - PlaySoundLevel(x, y, SND_CLASS_GATE_PASSING); - break; + element = Feld[x][y]; - case EL_EM_GATE_1_GRAY: - case EL_EM_GATE_2_GRAY: - case EL_EM_GATE_3_GRAY: - case EL_EM_GATE_4_GRAY: - if (!player->key[element - EL_EM_GATE_1_GRAY]) - return MF_NO_ACTION; - if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) - return MF_NO_ACTION; + if (!is_player && !IS_COLLECTIBLE(element)) /* penguin cannot collect it */ + return MF_NO_ACTION; - /* automatically move to the next field with double speed */ - player->programmed_action = move_direction; - DOUBLE_PLAYER_SPEED(player); + if (mode == DF_SNAP && !IS_SNAPPABLE(element) && + game.engine_version >= VERSION_IDENT(2,2,0,0)) + return MF_NO_ACTION; #if 1 - PlaySoundLevelAction(x, y, ACTION_PASSING); -#else - PlaySoundLevel(x, y, SND_GATE_PASSING); -#endif - break; - - case EL_SWITCHGATE_OPEN: - case EL_TIMEGATE_OPEN: - if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) - return MF_NO_ACTION; - - /* automatically move to the next field with double speed */ - player->programmed_action = move_direction; - DOUBLE_PLAYER_SPEED(player); + if (game.gravity && is_player && !player->is_auto_moving && + canFallDown(player) && move_direction != MV_DOWN && + !canMoveToValidFieldWithGravity(jx, jy, move_direction)) + return MF_NO_ACTION; /* player cannot walk here due to gravity */ +#endif - PlaySoundLevelElementAction(x, y, element, ACTION_PASSING); - break; +#if 0 + if (element == EL_EMPTY_SPACE && + game.gravity && !player->is_auto_moving && + canFallDown(player) && move_direction != MV_DOWN) + return MF_NO_ACTION; /* player cannot walk here due to gravity */ +#endif + switch (element) + { +#if 0 case EL_SP_PORT_LEFT: case EL_SP_PORT_RIGHT: case EL_SP_PORT_UP: @@ -6596,6 +11065,10 @@ int DigField(struct PlayerInfo *player, case EL_SP_GRAVITY_PORT_RIGHT: case EL_SP_GRAVITY_PORT_UP: case EL_SP_GRAVITY_PORT_DOWN: +#if 1 + if (!canEnterSupaplexPort(x, y, dx, dy)) + return MF_NO_ACTION; +#else if ((dx == -1 && element != EL_SP_PORT_LEFT && element != EL_SP_GRAVITY_PORT_LEFT && @@ -6616,17 +11089,41 @@ int DigField(struct PlayerInfo *player, element != EL_SP_GRAVITY_PORT_DOWN && element != EL_SP_PORT_VERTICAL && element != EL_SP_PORT_ANY) || - !IN_LEV_FIELD(x + dx, y + dy) || - !IS_FREE(x + dx, y + dy)) + !IN_LEV_FIELD(nextx, nexty) || + !IS_FREE(nextx, nexty)) return MF_NO_ACTION; +#endif + + if (element == EL_SP_GRAVITY_PORT_LEFT || + element == EL_SP_GRAVITY_PORT_RIGHT || + element == EL_SP_GRAVITY_PORT_UP || + element == EL_SP_GRAVITY_PORT_DOWN) + game.gravity = !game.gravity; /* automatically move to the next field with double speed */ player->programmed_action = move_direction; +#if 1 + if (player->move_delay_reset_counter == 0) + { + player->move_delay_reset_counter = 2; /* two double speed steps */ + + DOUBLE_PLAYER_SPEED(player); + } +#else + player->move_delay_reset_counter = 2; + DOUBLE_PLAYER_SPEED(player); +#endif + +#if 0 + printf("::: passing port %d,%d [%d]\n", x, y, FrameCounter); +#endif - PlaySoundLevel(x, y, SND_CLASS_SP_PORT_PASSING); + PlayLevelSound(x, y, SND_CLASS_SP_PORT_PASSING); break; +#endif +#if 0 case EL_TUBE_ANY: case EL_TUBE_VERTICAL: case EL_TUBE_HORIZONTAL: @@ -6666,233 +11163,654 @@ int DigField(struct PlayerInfo *player, 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_PASSING); + PlayLevelSound(x, y, SND_CLASS_TUBE_WALKING); } break; +#endif - case EL_EXIT_CLOSED: - case EL_SP_EXIT_CLOSED: - case EL_EXIT_OPENING: - return MF_NO_ACTION; - break; + default: - case EL_EXIT_OPEN: - case EL_SP_EXIT_OPEN: - if (mode == DF_SNAP) - return MF_NO_ACTION; +#if 1 + if (IS_WALKABLE(element) && ACCESS_FROM(element, opposite_direction)) +#else + if (IS_WALKABLE(element)) +#endif + { + int sound_element = SND_ELEMENT(element); + int sound_action = ACTION_WALKING; - if (element == EL_EXIT_OPEN) - PlaySoundLevel(x, y, SND_CLASS_EXIT_PASSING); - else - PlaySoundLevel(x, y, SND_CLASS_SP_EXIT_PASSING); +#if 0 + if (!ACCESS_FROM(element, opposite_direction)) + return MF_NO_ACTION; /* field not accessible from this direction */ +#endif - break; +#if 0 + if (element == EL_EMPTY_SPACE && + game.gravity && !player->is_auto_moving && + canFallDown(player) && move_direction != MV_DOWN) + return MF_NO_ACTION; /* player cannot walk here due to gravity */ +#endif - 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; + if (IS_GATE(element)) + { + if (!player->key[element - EL_GATE_1]) + return MF_NO_ACTION; + } + else if (IS_GATE_GRAY(element)) + { + if (!player->key[element - EL_GATE_1_GRAY]) + return MF_NO_ACTION; + } + else if (element == EL_EXIT_OPEN || + element == EL_SP_EXIT_OPEN || + element == EL_SP_EXIT_OPENING) + { + sound_action = ACTION_PASSING; /* player is passing exit */ + } + else if (element == EL_EMPTY) + { + sound_action = ACTION_MOVING; /* nothing to walk on */ + } - 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; + /* play sound from background or player, whatever is available */ + if (element_info[sound_element].sound[sound_action] != SND_UNDEFINED) + PlayLevelSoundElementAction(x, y, sound_element, sound_action); + else + PlayLevelSoundElementAction(x, y, player->element_nr, sound_action); - case EL_SOKOBAN_FIELD_EMPTY: - break; + break; + } +#if 1 + else if (IS_PASSABLE(element) && canPassField(x, y, move_direction)) +#else + else if (IS_PASSABLE(element)) +#endif + { +#if 0 + if (!canPassField(x, y, move_direction)) + return MF_NO_ACTION; +#else - case EL_SOKOBAN_OBJECT: - case EL_SOKOBAN_FIELD_FULL: - case EL_SATELLITE: - case EL_SP_DISK_YELLOW: - case EL_BALLOON: - if (mode == DF_SNAP) - return MF_NO_ACTION; +#if 0 +#if 1 + if (!IN_LEV_FIELD(nextx, nexty) || IS_PLAYER(nextx, nexty) || + !IS_WALKABLE_FROM(Feld[nextx][nexty], move_direction) || + (!level.can_pass_to_walkable && !IS_FREE(nextx, nexty))) + return MF_NO_ACTION; +#else + if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) + return MF_NO_ACTION; +#endif +#endif - player->Pushing = TRUE; +#if 1 + if (!ACCESS_FROM(element, opposite_direction)) + return MF_NO_ACTION; /* field not accessible from this direction */ +#else + if (IS_CUSTOM_ELEMENT(element) && + !ACCESS_FROM(element, opposite_direction)) + return MF_NO_ACTION; /* field not accessible from this direction */ +#endif - if (!IN_LEV_FIELD(x+dx, y+dy) - || (!IS_FREE(x+dx, y+dy) - && (Feld[x+dx][y+dy] != EL_SOKOBAN_FIELD_EMPTY - || !IS_SB_ELEMENT(element)))) - return MF_NO_ACTION; +#if 1 + if (CAN_MOVE(element)) /* only fixed elements can be passed! */ + return MF_NO_ACTION; +#endif - if (!checkDiagonalPushing(player, x, y, real_dx, real_dy)) - return MF_NO_ACTION; +#endif - if (player->push_delay == 0) - player->push_delay = FrameCounter; -#if 0 - if (!FrameReached(&player->push_delay, player->push_delay_value) && - !tape.playing && element != EL_BALLOON) - return MF_NO_ACTION; + if (IS_EM_GATE(element)) + { + if (!player->key[element - EL_EM_GATE_1]) + return MF_NO_ACTION; + } + else if (IS_EM_GATE_GRAY(element)) + { + if (!player->key[element - EL_EM_GATE_1_GRAY]) + return MF_NO_ACTION; + } + else if (IS_SP_PORT(element)) + { + if (element == EL_SP_GRAVITY_PORT_LEFT || + element == EL_SP_GRAVITY_PORT_RIGHT || + element == EL_SP_GRAVITY_PORT_UP || + element == EL_SP_GRAVITY_PORT_DOWN) + game.gravity = !game.gravity; + else if (element == EL_SP_GRAVITY_ON_PORT_LEFT || + element == EL_SP_GRAVITY_ON_PORT_RIGHT || + element == EL_SP_GRAVITY_ON_PORT_UP || + element == EL_SP_GRAVITY_ON_PORT_DOWN) + game.gravity = TRUE; + else if (element == EL_SP_GRAVITY_OFF_PORT_LEFT || + element == EL_SP_GRAVITY_OFF_PORT_RIGHT || + element == EL_SP_GRAVITY_OFF_PORT_UP || + element == EL_SP_GRAVITY_OFF_PORT_DOWN) + game.gravity = FALSE; + } + + /* automatically move to the next field with double speed */ + player->programmed_action = move_direction; +#if 1 + if (player->move_delay_reset_counter == 0) + { + player->move_delay_reset_counter = 2; /* two double speed steps */ + + DOUBLE_PLAYER_SPEED(player); + } #else - if (!FrameReached(&player->push_delay, player->push_delay_value) && - !(tape.playing && tape.file_version < FILE_VERSION_2_0) && - element != EL_BALLOON) - return MF_NO_ACTION; + player->move_delay_reset_counter = 2; + + DOUBLE_PLAYER_SPEED(player); #endif - if (IS_SB_ELEMENT(element)) + PlayLevelSoundAction(x, y, ACTION_PASSING); + + break; + } + else if (IS_DIGGABLE(element)) { - if (element == EL_SOKOBAN_FIELD_FULL) + RemoveField(x, y); + + if (mode != DF_SNAP) { - Feld[x][y] = EL_SOKOBAN_FIELD_EMPTY; - local_player->sokobanfields_still_needed++; +#if 1 + GfxElement[x][y] = GFX_ELEMENT(element); +#else + GfxElement[x][y] = + (GFX_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element)); +#endif + player->is_digging = TRUE; } - else - RemoveField(x, y); - if (Feld[x+dx][y+dy] == EL_SOKOBAN_FIELD_EMPTY) + PlayLevelSoundElementAction(x, y, element, ACTION_DIGGING); + + CheckTriggeredElementChangeByPlayer(x, y, element,CE_OTHER_GETS_DIGGED, + player->index_bit, dig_side); + +#if 1 + if (mode == DF_SNAP) + TestIfElementTouchesCustomElement(x, y); /* for empty space */ +#endif + + break; + } + else if (IS_COLLECTIBLE(element)) + { + RemoveField(x, y); + + if (is_player && mode != DF_SNAP) + { + GfxElement[x][y] = element; + player->is_collecting = TRUE; + } + + if (element == EL_SPEED_PILL) + player->move_delay_value = MOVE_DELAY_HIGH_SPEED; + else if (element == EL_EXTRA_TIME && level.time > 0) + { + TimeLeft += 10; + DrawGameValue_Time(TimeLeft); + } + else if (element == EL_SHIELD_NORMAL || element == EL_SHIELD_DEADLY) + { + player->shield_normal_time_left += 10; + if (element == EL_SHIELD_DEADLY) + player->shield_deadly_time_left += 10; + } + else if (element == EL_DYNAMITE || element == EL_SP_DISK_RED) + { + if (player->inventory_size < MAX_INVENTORY_SIZE) + player->inventory_element[player->inventory_size++] = element; + + DrawGameValue_Dynamite(local_player->inventory_size); + } + else if (element == EL_DYNABOMB_INCREASE_NUMBER) + { + player->dynabomb_count++; + player->dynabombs_left++; + } + else if (element == EL_DYNABOMB_INCREASE_SIZE) + { + player->dynabomb_size++; + } + else if (element == EL_DYNABOMB_INCREASE_POWER) + { + player->dynabomb_xl = TRUE; + } + else if ((element >= EL_KEY_1 && element <= EL_KEY_4) || + (element >= EL_EM_KEY_1 && element <= EL_EM_KEY_4)) + { + int key_nr = (element >= EL_KEY_1 && element <= EL_KEY_4 ? + element - EL_KEY_1 : element - EL_EM_KEY_1); + + player->key[key_nr] = TRUE; + + DrawGameValue_Keys(player); + + redraw_mask |= REDRAW_DOOR_1; + } + else if (IS_ENVELOPE(element)) { - Feld[x+dx][y+dy] = EL_SOKOBAN_FIELD_FULL; - local_player->sokobanfields_still_needed--; - if (element == EL_SOKOBAN_OBJECT) #if 1 - PlaySoundLevelAction(x+dx, y+dy, ACTION_FILLING); + player->show_envelope = element; #else - PlaySoundLevel(x, y, SND_CLASS_SOKOBAN_FIELD_FILLING); + ShowEnvelope(element - EL_ENVELOPE_1); #endif + } + else if (IS_DROPPABLE(element) || + IS_THROWABLE(element)) /* can be collected and dropped */ + { + int i; + + if (element_info[element].collect_count == 0) + player->inventory_infinite_element = element; else + for (i = 0; i < element_info[element].collect_count; i++) + if (player->inventory_size < MAX_INVENTORY_SIZE) + player->inventory_element[player->inventory_size++] = element; + + DrawGameValue_Dynamite(local_player->inventory_size); + } + else if (element_info[element].collect_count > 0) + { + local_player->gems_still_needed -= + element_info[element].collect_count; + if (local_player->gems_still_needed < 0) + local_player->gems_still_needed = 0; + + DrawGameValue_Emeralds(local_player->gems_still_needed); + } + + RaiseScoreElement(element); + PlayLevelSoundElementAction(x, y, element, ACTION_COLLECTING); + + if (is_player) + CheckTriggeredElementChangeByPlayer(x, y, element, + CE_OTHER_GETS_COLLECTED, + player->index_bit, dig_side); + +#if 1 + if (mode == DF_SNAP) + TestIfElementTouchesCustomElement(x, y); /* for empty space */ +#endif + + break; + } + else if (IS_PUSHABLE(element)) + { + if (mode == DF_SNAP && element != EL_BD_ROCK) + return MF_NO_ACTION; + + if (CAN_FALL(element) && dy) + return MF_NO_ACTION; + + if (CAN_FALL(element) && IN_LEV_FIELD(x, y + 1) && IS_FREE(x, y + 1) && + !(element == EL_SPRING && level.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 - PlaySoundLevelAction(x+dx, y+dy, ACTION_PUSHING); + /* do not push elements already moving away faster than player */ + if (CAN_MOVE(element) && MovDir[x][y] == move_direction && + ABS(getElementMoveStepsize(x, y)) > MOVE_STEPSIZE_NORMAL) + return MF_NO_ACTION; #else - PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING); + if (element == EL_SPRING && MovDir[x][y] != MV_NO_MOVING) + return MF_NO_ACTION; #endif + +#if 1 + +#if 1 + if (game.engine_version >= VERSION_IDENT(3,1,0,0)) + { + if (player->push_delay_value == -1 || !player_was_pushing) + player->push_delay_value = GET_NEW_PUSH_DELAY(element); } - else + else if (game.engine_version >= VERSION_IDENT(3,0,7,1)) { - Feld[x+dx][y+dy] = EL_SOKOBAN_OBJECT; - if (element == EL_SOKOBAN_FIELD_FULL) -#if 1 - PlaySoundLevelAction(x+dx, y+dy, ACTION_EMPTYING); + if (player->push_delay_value == -1) + player->push_delay_value = GET_NEW_PUSH_DELAY(element); + } #else - PlaySoundLevel(x, y, SND_SOKOBAN_FIELD_EMPTYING); + if (game.engine_version >= VERSION_IDENT(3,0,7,1)) + { + if (player->push_delay_value == -1 || !player_was_pushing) + player->push_delay_value = GET_NEW_PUSH_DELAY(element); + } #endif - else -#if 1 - PlaySoundLevelAction(x+dx, y+dy, ACTION_PUSHING); + 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 + +#if 0 + printf("::: push delay: %ld -> %ld [%d, %d] [%d / %d] [%d '%s': %d]\n", + player->push_delay, player->push_delay_value, + FrameCounter, game.engine_version, + player_was_pushing, player->is_pushing, + element, element_info[element].token_name, + GET_NEW_PUSH_DELAY(element)); +#endif + + player->is_pushing = TRUE; + + if (!(IN_LEV_FIELD(nextx, nexty) && + (IS_FREE(nextx, nexty) || + (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY && + IS_SB_ELEMENT(element))))) + return MF_NO_ACTION; + + if (!checkDiagonalPushing(player, x, y, real_dx, real_dy)) + return MF_NO_ACTION; + +#if USE_NEW_PUSH_DELAY + +#if 0 + if ( (player->push_delay == -1) != (player->push_delay2 == 0) ) + printf("::: ALERT: %d, %d [%d / %d]\n", + player->push_delay, player->push_delay2, + FrameCounter, FrameCounter / 50); +#endif + + if (player->push_delay == -1) /* new pushing; restart delay */ + player->push_delay = 0; +#else + if (player->push_delay == 0) /* new pushing; restart delay */ + player->push_delay = FrameCounter; +#endif + +#if USE_NEW_PUSH_DELAY +#if 0 + if ( (player->push_delay > 0) != (!xxx_fr) ) + printf("::: PUSH BUG! %d, (%d -> %d) %d [%d / %d]\n", + player->push_delay, + xxx_pdv2, player->push_delay2, player->push_delay_value, + FrameCounter, FrameCounter / 50); +#endif + +#if 0 + if (player->push_delay > 0 && + !(tape.playing && tape.file_version < FILE_VERSION_2_0) && + element != EL_SPRING && element != EL_BALLOON) +#else + /* !!! */ + if (player->push_delay < player->push_delay_value && + !(tape.playing && tape.file_version < FILE_VERSION_2_0) && + element != EL_SPRING && element != EL_BALLOON) +#endif + +#else + if (!FrameReached(&player->push_delay, player->push_delay_value) && + !(tape.playing && tape.file_version < FILE_VERSION_2_0) && + element != EL_SPRING && element != EL_BALLOON) +#endif + { + /* make sure that there is no move delay before next try to push */ +#if USE_NEW_MOVE_DELAY + if (game.engine_version >= VERSION_IDENT(3,0,7,1)) + player->move_delay = 0; #else - PlaySoundLevel(x, y, SND_SOKOBAN_OBJECT_PUSHING); + if (game.engine_version >= VERSION_IDENT(3,0,7,1)) + player->move_delay = INITIAL_MOVE_DELAY_OFF; #endif + + return MF_NO_ACTION; } - } - else - { - RemoveField(x, y); - Feld[x+dx][y+dy] = element; - PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); - } - player->push_delay_value = (element == EL_BALLOON ? 0 : 2); +#if 0 + printf("::: NOW PUSHING... [%d]\n", FrameCounter); +#endif - DrawLevelField(x, y); - DrawLevelField(x + dx, y + dy); + if (IS_SB_ELEMENT(element)) + { + if (element == EL_SOKOBAN_FIELD_FULL) + { + Back[x][y] = EL_SOKOBAN_FIELD_EMPTY; + local_player->sokobanfields_still_needed++; + } - if (IS_SB_ELEMENT(element) && - local_player->sokobanfields_still_needed == 0 && - game.emulation == EMU_SOKOBAN) - { - player->LevelSolved = player->GameOver = TRUE; - PlaySoundLevel(x, y, SND_GAME_SOKOBAN_SOLVING); - } + if (Feld[nextx][nexty] == EL_SOKOBAN_FIELD_EMPTY) + { + Back[nextx][nexty] = EL_SOKOBAN_FIELD_EMPTY; + local_player->sokobanfields_still_needed--; + } + + Feld[x][y] = EL_SOKOBAN_OBJECT; + + if (Back[x][y] == Back[nextx][nexty]) + PlayLevelSoundAction(x, y, ACTION_PUSHING); + else if (Back[x][y] != 0) + PlayLevelSoundElementAction(x, y, EL_SOKOBAN_FIELD_FULL, + ACTION_EMPTYING); + else + 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; + PlayLevelSound(x, y, SND_GAME_SOKOBAN_SOLVING); + } + } + else + PlayLevelSoundElementAction(x, y, element, ACTION_PUSHING); + + InitMovingField(x, y, move_direction); + GfxAction[x][y] = ACTION_PUSHING; - break; + if (mode == DF_SNAP) + ContinueMoving(x, y); + else + MovPos[x][y] = (dx != 0 ? dx : dy); - case EL_PENGUIN: - case EL_PIG: - case EL_DRAGON: - break; + Pushed[x][y] = TRUE; + Pushed[nextx][nexty] = TRUE; - default: + 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 (IS_WALKABLE(element)) - { - break; - } - else if (IS_DIGGABLE(element)) - { - RemoveField(x, y); #if 1 - if (mode != DF_SNAP) - { - GfxElement[x][y] = - (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element)); - player->is_digging = TRUE; - } + /* check for element change _after_ element has been pushed! */ +#else + +#if 1 + /* !!! TEST ONLY !!! */ + CheckElementChangeByPlayer(x, y, element, CE_PUSHED_BY_PLAYER, + player->index_bit, dig_side); + CheckTriggeredElementChangeByPlayer(x, y, element,CE_OTHER_GETS_PUSHED, + player->index_bit, dig_side); +#else + CheckTriggeredElementChangeByPlayer(x, y, element,CE_OTHER_GETS_PUSHED, + player->index_bit, dig_side); + CheckElementChangeByPlayer(x, y, element, CE_PUSHED_BY_PLAYER, + player->index_bit, dig_side); +#endif #endif - PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING); break; } - else if (IS_COLLECTIBLE(element)) + else if (IS_SWITCHABLE(element)) { - RemoveField(x, y); -#if 1 - if (mode != DF_SNAP) + if (PLAYER_SWITCHING(player, x, y)) { - GfxElement[x][y] = element; - player->is_collecting = TRUE; + CheckTriggeredElementChangeByPlayer(x,y, element, + CE_OTHER_GETS_PRESSED, + player->index_bit, dig_side); + + return MF_ACTION; } -#endif - PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); - break; - } - else if (IS_PUSHABLE(element)) - { - if (mode == DF_SNAP) - return MF_NO_ACTION; + player->is_switching = TRUE; + player->switch_x = x; + player->switch_y = y; - if (CAN_FALL(element) && dy) - return MF_NO_ACTION; + PlayLevelSoundElementAction(x, y, element, ACTION_ACTIVATING); - if (!player->Pushing && - game.engine_version >= RELEASE_IDENT(2,2,0,7)) - player->push_delay_value = GET_NEW_PUSH_DELAY(element); + if (element == EL_ROBOT_WHEEL) + { + Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE; + ZX = x; + ZY = y; - player->Pushing = TRUE; + DrawLevelField(x, y); + } + else if (element == EL_SP_TERMINAL) + { + int xx, yy; - if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) - return MF_NO_ACTION; + 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; + } + } + else if (IS_BELT_SWITCH(element)) + { + ToggleBeltSwitch(x, y); + } + else if (element == EL_SWITCHGATE_SWITCH_UP || + element == EL_SWITCHGATE_SWITCH_DOWN) + { + ToggleSwitchgateSwitch(x, y); + } + else if (element == EL_LIGHT_SWITCH || + element == EL_LIGHT_SWITCH_ACTIVE) + { + ToggleLightSwitch(x, y); - if (!checkDiagonalPushing(player, x, y, real_dx, real_dy)) - return MF_NO_ACTION; +#if 0 + 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); + } + else if (element == EL_BALLOON_SWITCH_LEFT || + element == EL_BALLOON_SWITCH_RIGHT || + element == EL_BALLOON_SWITCH_UP || + element == EL_BALLOON_SWITCH_DOWN || + element == 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); + } + else if (element == EL_LAMP) + { + Feld[x][y] = EL_LAMP_ACTIVE; + local_player->lights_still_needed--; - if (player->push_delay == 0) /* new pushing; restart delay */ - player->push_delay = FrameCounter; + DrawLevelField(x, y); + } + else if (element == EL_TIME_ORB_FULL) + { + Feld[x][y] = EL_TIME_ORB_EMPTY; + TimeLeft += 10; + DrawGameValue_Time(TimeLeft); - if (!FrameReached(&player->push_delay, player->push_delay_value) && - !(tape.playing && tape.file_version < FILE_VERSION_2_0)) - return MF_NO_ACTION; + DrawLevelField(x, y); - RemoveField(x, y); - Feld[x + dx][y + dy] = element; +#if 0 + PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MIDDLE); +#endif + } + + CheckTriggeredElementChangeByPlayer(x, y, element, + CE_OTHER_IS_SWITCHING, + player->index_bit, dig_side); + + CheckTriggeredElementChangeByPlayer(x,y, element,CE_OTHER_GETS_PRESSED, + player->index_bit, dig_side); + + return MF_ACTION; + } + else + { + if (!PLAYER_SWITCHING(player, x, y)) + { + player->is_switching = TRUE; + player->switch_x = x; + player->switch_y = y; #if 1 - if (game.engine_version < RELEASE_IDENT(2,2,0,7)) - player->push_delay_value = GET_NEW_PUSH_DELAY(element); + /* !!! TEST ONLY !!! */ + CheckElementChangeByPlayer(x, y, element, CE_SWITCHED, + player->index_bit, dig_side); + CheckTriggeredElementChangeByPlayer(x, y, element, + CE_OTHER_IS_SWITCHING, + player->index_bit, dig_side); #else - player->push_delay_value = 2 + RND(8); + CheckTriggeredElementChangeByPlayer(x, y, element, + CE_OTHER_IS_SWITCHING, + player->index_bit, dig_side); + CheckElementChangeByPlayer(x, y, element, CE_SWITCHED, + player->index_bit, dig_side); #endif + } - DrawLevelField(x + dx, y + dy); - PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); - - break; +#if 1 + /* !!! TEST ONLY !!! (this breaks "machine", level 000) */ + CheckElementChangeByPlayer(x, y, element, CE_PRESSED_BY_PLAYER, + player->index_bit, dig_side); + CheckTriggeredElementChangeByPlayer(x,y, element,CE_OTHER_GETS_PRESSED, + player->index_bit, dig_side); +#else + CheckTriggeredElementChangeByPlayer(x,y, element,CE_OTHER_GETS_PRESSED, + player->index_bit, dig_side); + CheckElementChangeByPlayer(x, y, element, CE_PRESSED_BY_PLAYER, + player->index_bit, dig_side); +#endif } return MF_NO_ACTION; } +#if USE_NEW_PUSH_DELAY + player->push_delay = -1; +#else player->push_delay = 0; +#endif if (Feld[x][y] != element) /* really digged/collected something */ player->is_collecting = !player->is_digging; @@ -6904,9 +11822,18 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) { int jx = player->jx, jy = player->jy; int x = jx + dx, y = jy + dy; + int snap_direction = (dx == -1 ? MV_LEFT : + dx == +1 ? MV_RIGHT : + dy == -1 ? MV_UP : + dy == +1 ? MV_DOWN : MV_NO_MOVING); - if (player->MovPos && game.engine_version >= VERSION_IDENT(2,2,0)) +#if 0 + if (player->MovPos != 0) + return FALSE; +#else + if (player->MovPos != 0 && game.engine_version >= VERSION_IDENT(2,2,0,0)) return FALSE; +#endif if (!player->active || !IN_LEV_FIELD(x, y)) return FALSE; @@ -6917,12 +11844,13 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) 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; } @@ -6930,93 +11858,271 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) return FALSE; } - if (player->snapped) + if (player->is_snapping) return FALSE; - player->MovDir = (dx < 0 ? MV_LEFT : - dx > 0 ? MV_RIGHT : - dy < 0 ? MV_UP : - dy > 0 ? MV_DOWN : MV_NO_MOVING); + player->MovDir = snap_direction; + +#if 1 + if (player->MovPos == 0) +#endif + { + player->is_moving = FALSE; + player->is_digging = FALSE; + player->is_collecting = FALSE; + } - if (DigField(player, x, y, 0, 0, DF_SNAP) == MF_NO_ACTION) + player->is_dropping = FALSE; + + if (DigField(player, jx, jy, x, y, 0, 0, DF_SNAP) == MF_NO_ACTION) return FALSE; - player->snapped = TRUE; - player->is_digging = FALSE; - player->is_collecting = FALSE; + player->is_snapping = TRUE; + +#if 1 + if (player->MovPos == 0) +#endif + { + player->is_moving = FALSE; + player->is_digging = FALSE; + player->is_collecting = FALSE; + } + +#if 1 + if (player->MovPos != 0) /* prevent graphic bugs in versions < 2.2.0 */ + DrawLevelField(player->last_jx, player->last_jy); +#endif DrawLevelField(x, y); + +#if 0 BackToFront(); +#endif return TRUE; } -boolean PlaceBomb(struct PlayerInfo *player) +boolean DropElement(struct PlayerInfo *player) { - int jx = player->jx, jy = player->jy; - int element; + int old_element, new_element; + int dropx = player->jx, dropy = player->jy; + int drop_direction = player->MovDir; +#if 1 + int drop_side = drop_direction; +#else + static int trigger_sides[4] = + { + CH_SIDE_LEFT, /* dropping left */ + CH_SIDE_RIGHT, /* dropping right */ + CH_SIDE_TOP, /* dropping up */ + CH_SIDE_BOTTOM, /* dropping down */ + }; + int drop_side = trigger_sides[MV_DIR_BIT(drop_direction)]; +#endif + int drop_element = (player->inventory_size > 0 ? + player->inventory_element[player->inventory_size - 1] : + player->inventory_infinite_element != EL_UNDEFINED ? + player->inventory_infinite_element : + player->dynabombs_left > 0 ? + EL_DYNABOMB_PLAYER_1_ACTIVE + player->index_nr : + EL_UNDEFINED); + + if (IS_THROWABLE(drop_element)) + { + dropx += GET_DX_FROM_DIR(drop_direction); + dropy += GET_DY_FROM_DIR(drop_direction); + + if (!IN_LEV_FIELD(dropx, dropy)) + return FALSE; + } - if (!player->active || player->MovPos) + old_element = Feld[dropx][dropy]; /* old element at dropping position */ + new_element = drop_element; /* default: no change when dropping */ + + /* check if player is active, not moving and ready to drop */ + if (!player->active || player->MovPos || player->drop_delay > 0) return FALSE; - element = Feld[jx][jy]; + /* check if player has anything that can be dropped */ +#if 1 + if (new_element == EL_UNDEFINED) + return FALSE; +#else + if (player->inventory_size == 0 && + player->inventory_infinite_element == EL_UNDEFINED && + player->dynabombs_left == 0) + return FALSE; +#endif - if ((player->dynamite == 0 && player->dynabombs_left == 0) || - IS_ACTIVE_BOMB(element) || element == EL_EXPLOSION) + /* check if anything can be dropped at the current position */ + if (IS_ACTIVE_BOMB(old_element) || old_element == EL_EXPLOSION) return FALSE; -#if 0 - if (element != EL_EMPTY) + /* collected custom elements can only be dropped on empty fields */ +#if 1 + if (IS_CUSTOM_ELEMENT(new_element) && old_element != EL_EMPTY) + return FALSE; +#else + if (player->inventory_size > 0 && + IS_CUSTOM_ELEMENT(player->inventory_element[player->inventory_size - 1]) + && old_element != EL_EMPTY) return FALSE; #endif - if (element != EL_EMPTY) + if (old_element != EL_EMPTY) + Back[dropx][dropy] = old_element; /* store old element on this field */ + + ResetGfxAnimation(dropx, dropy); + ResetRandomAnimationValue(dropx, dropy); + + if (player->inventory_size > 0 || + player->inventory_infinite_element != EL_UNDEFINED) { + if (player->inventory_size > 0) + { + player->inventory_size--; + #if 0 - Store[jx][jy] = element; + new_element = player->inventory_element[player->inventory_size]; +#endif + + DrawGameValue_Dynamite(local_player->inventory_size); + + if (new_element == EL_DYNAMITE) + new_element = EL_DYNAMITE_ACTIVE; + else if (new_element == EL_SP_DISK_RED) + new_element = EL_SP_DISK_RED_ACTIVE; + } + + Feld[dropx][dropy] = new_element; + + if (IN_SCR_FIELD(SCREENX(dropx), SCREENY(dropy))) + DrawGraphicThruMask(SCREENX(dropx), SCREENY(dropy), + el2img(Feld[dropx][dropy]), 0); + + PlayLevelSoundAction(dropx, dropy, ACTION_DROPPING); + +#if 1 + /* needed if previous element just changed to "empty" in the last frame */ + Changed[dropx][dropy] = 0; /* allow another change */ +#endif + +#if 1 + /* !!! TEST ONLY !!! */ + CheckElementChangeByPlayer(dropx, dropy, new_element, CE_DROPPED_BY_PLAYER, + player->index_bit, drop_side); + CheckTriggeredElementChangeByPlayer(dropx, dropy, new_element, + CE_OTHER_GETS_DROPPED, + player->index_bit, drop_side); #else - Back[jx][jy] = element; + CheckTriggeredElementChangeByPlayer(dropx, dropy, new_element, + CE_OTHER_GETS_DROPPED, + player->index_bit, drop_side); + CheckElementChangeByPlayer(dropx, dropy, new_element, CE_DROPPED_BY_PLAYER, + player->index_bit, drop_side); #endif + + TestIfElementTouchesCustomElement(dropx, dropy); + } + else /* player is dropping a dyna bomb */ + { + player->dynabombs_left--; + +#if 0 + new_element = EL_DYNABOMB_PLAYER_1_ACTIVE + player->index_nr; +#endif + + Feld[dropx][dropy] = new_element; + + if (IN_SCR_FIELD(SCREENX(dropx), SCREENY(dropy))) + DrawGraphicThruMask(SCREENX(dropx), SCREENY(dropy), + el2img(Feld[dropx][dropy]), 0); + + PlayLevelSoundAction(dropx, dropy, ACTION_DROPPING); } - MovDelay[jx][jy] = 96; - ResetGfxAnimation(jx, jy); - ResetRandomAnimationValue(jx, jy); - if (player->dynamite) +#if 1 + + if (Feld[dropx][dropy] == new_element) /* uninitialized unless CE change */ + { +#if 1 + InitField_WithBug1(dropx, dropy, FALSE); +#else + InitField(dropx, dropy, FALSE); + if (CAN_MOVE(Feld[dropx][dropy])) + InitMovDir(dropx, dropy); +#endif + } + + new_element = Feld[dropx][dropy]; /* element might have changed */ + + if (IS_CUSTOM_ELEMENT(new_element) && CAN_MOVE(new_element) && + element_info[new_element].move_pattern == MV_WHEN_DROPPED) { - Feld[jx][jy] = (player->use_disk_red_graphic ? EL_SP_DISK_RED_ACTIVE : - EL_DYNAMITE_ACTIVE); - player->dynamite--; +#if 0 + int move_stepsize = element_info[new_element].move_stepsize; +#endif + int move_direction, nextx, nexty; + + if (element_info[new_element].move_direction_initial == MV_START_AUTOMATIC) + MovDir[dropx][dropy] = drop_direction; + + move_direction = MovDir[dropx][dropy]; + nextx = dropx + GET_DX_FROM_DIR(move_direction); + nexty = dropy + GET_DY_FROM_DIR(move_direction); + +#if 1 + Changed[dropx][dropy] = 0; /* allow another change */ + CheckCollision[dropx][dropy] = 2; +#else - DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), - FONT_TEXT_2); - if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) + if (IN_LEV_FIELD_AND_IS_FREE(nextx, nexty)) + { +#if 0 + WasJustMoving[dropx][dropy] = 3; +#else +#if 1 + InitMovingField(dropx, dropy, move_direction); + ContinueMoving(dropx, dropy); +#endif +#endif + } +#if 0 + /* !!! commented out from 3.1.0-4 to 3.1.0-5 !!! */ + else { + Changed[dropx][dropy] = 0; /* allow another change */ + #if 1 - DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0); + TestIfElementHitsCustomElement(dropx, dropy, move_direction); #else - if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(SCREENX(jx), SCREENY(jy), IMG_SP_DISK_RED, 0); - else - DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), IMG_DYNAMITE_ACTIVE, 0); + CheckElementChangeBySide(dropx, dropy, new_element, touched_element, + CE_HITTING_SOMETHING, move_direction); #endif } +#endif + +#endif - PlaySoundLevelAction(jx, jy, ACTION_DROPPING); +#if 0 + player->drop_delay = 2 * TILEX / move_stepsize + 1; +#endif } - else - { - Feld[jx][jy] = - EL_DYNABOMB_PLAYER_1_ACTIVE + (player->element_nr - EL_PLAYER_1); - player->dynabombs_left--; - if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) - DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0); +#if 0 + player->drop_delay = 8 + 8 + 8; +#endif + +#if 1 + player->drop_delay = GET_NEW_DROP_DELAY(drop_element); +#endif + +#endif + + player->is_dropping = TRUE; - PlaySoundLevelAction(jx, jy, ACTION_DROPPING); - } return TRUE; } @@ -7028,21 +12134,18 @@ boolean PlaceBomb(struct PlayerInfo *player) static int *loop_sound_frame = NULL; static int *loop_sound_volume = NULL; -void InitPlaySoundLevel() +void InitPlayLevelSound() { int num_sounds = getSoundListSize(); - if (loop_sound_frame != NULL) - free(loop_sound_frame); + checked_free(loop_sound_frame); + checked_free(loop_sound_volume); - if (loop_sound_volume != NULL) - free(loop_sound_volume); - - loop_sound_frame = checked_calloc(num_sounds * sizeof(int)); + loop_sound_frame = checked_calloc(num_sounds * sizeof(int)); 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; @@ -7087,48 +12190,66 @@ static void PlaySoundLevel(int x, int y, int nr) 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]; + int sound_effect = element_info[SND_ELEMENT(element)].sound[action]; if (sound_effect != SND_UNDEFINED) - PlaySoundLevel(x, y, sound_effect); + PlayLevelSound(x, y, sound_effect); +} + +static void PlayLevelSoundElementActionIfLoop(int x, int y, int element, + int action) +{ + int sound_effect = element_info[SND_ELEMENT(element)].sound[action]; + + if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect)) + PlayLevelSound(x, y, sound_effect); } -static void PlaySoundLevelActionIfLoop(int x, int y, int action) +static void PlayLevelSoundActionIfLoop(int x, int y, int action) { - int sound_effect = element_info[Feld[x][y]].sound[action]; + int sound_effect = element_info[SND_ELEMENT(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]; + int sound_effect = element_info[SND_ELEMENT(Feld[x][y])].sound[action]; if (sound_effect != SND_UNDEFINED && IS_LOOP_SOUND(sound_effect)) - StopSoundExt(sound_effect, SND_CTRL_STOP_SOUND); + StopSound(sound_effect); +} + +static void PlayLevelMusic() +{ + if (levelset.music[level_nr] != MUS_UNDEFINED) + PlayMusic(levelset.music[level_nr]); /* from config file */ + else + PlayMusic(MAP_NOCONF_MUSIC(level_nr)); /* from music dir */ } void RaiseScore(int value) { local_player->score += value; - DrawText(DX_SCORE, DY_SCORE, int2str(local_player->score, 5), FONT_TEXT_2); + + DrawGameValue_Score(local_player->score); } void RaiseScoreElement(int element) @@ -7176,6 +12297,7 @@ void RaiseScoreElement(int element) RaiseScore(level.score[SC_NUT]); break; case EL_DYNAMITE: + case EL_SP_DISK_RED: case EL_DYNABOMB_INCREASE_NUMBER: case EL_DYNABOMB_INCREASE_SIZE: case EL_DYNABOMB_INCREASE_POWER: @@ -7195,6 +12317,7 @@ void RaiseScoreElement(int element) RaiseScore(level.score[SC_KEY]); break; default: + RaiseScore(element_info[element].collect_score); break; } } @@ -7207,7 +12330,7 @@ void RequestQuitGame(boolean ask_if_really_quit) Request("Do you really want to quit the game ?", REQ_ASK | REQ_STAY_CLOSED)) { -#if defined(PLATFORM_UNIX) +#if defined(NETWORK_AVALIABLE) if (options.network) SendToServer_StopPlaying(); else @@ -7219,7 +12342,19 @@ void RequestQuitGame(boolean ask_if_really_quit) } else { + +#if 1 + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOff(TRUE); +#endif + OpenDoor(DOOR_OPEN_1 | DOOR_COPY_BACK); + +#if 1 + if (tape.playing && tape.deactivate_display) + TapeDeactivateDisplayOn(); +#endif + } } @@ -7284,7 +12419,7 @@ void CreateGameButtons() { int i; - for (i=0; i