X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=4ea608c3ac6f45538768a1b56453e62c0a73db78;hb=5ec67e956f52fc441582d30b4748d44febdbeed6;hp=c1e87624b867bf3a92a53e976a1cbbd0bee2cd48;hpb=ac4c028b525860750de315d626730ac493f56944;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index c1e87624..4ea608c3 100644 --- a/src/game.c +++ b/src/game.c @@ -14,9 +14,9 @@ #include "libgame/libgame.h" #include "game.h" +#include "init.h" #include "tools.h" #include "screens.h" -#include "init.h" #include "files.h" #include "tape.h" #include "network.h" @@ -91,6 +91,60 @@ #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_MOVE_DELAY(e) ( (element_info[e].move_delay_fixed) + \ + RND(element_info[e].move_delay_random)) + +#define ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (condition) || \ + (DONT_COLLIDE_WITH(e) && \ + IS_FREE_OR_PLAYER(x, y)))) + +#define ELEMENT_CAN_ENTER_FIELD_GENERIC_2(x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + (condition))) + +#define ELEMENT_CAN_ENTER_FIELD(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, 1) + +#define ELEMENT_CAN_ENTER_FIELD_OR_ACID(e, x, y) \ + ELEMENT_CAN_ENTER_FIELD_GENERIC(e, x, y, (Feld[x][y] == EL_ACID)) + +#define ELEMENT_CAN_ENTER_FIELD_OR_ACID_2(x, y) \ + ELEMENT_CAN_ENTER_FIELD_GENERIC_2(x, y, (Feld[x][y] == EL_ACID)) + +#define ENEMY_CAN_ENTER_FIELD(x, y) (IN_LEV_FIELD(x, y) && IS_FREE(x, y)) + +#define YAMYAM_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + Feld[x][y] == EL_DIAMOND)) + +#define DARK_YAMYAM_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + IS_FOOD_DARK_YAMYAM(Feld[x][y]))) + +#define PACMAN_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE_OR_PLAYER(x, y) || \ + IS_AMOEBOID(Feld[x][y]))) + +#define PIG_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + IS_FOOD_PIG(Feld[x][y]))) + +#define PENGUIN_CAN_ENTER_FIELD(x, y) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || \ + IS_FOOD_PENGUIN(Feld[x][y]) || \ + Feld[x][y] == EL_EXIT_OPEN || \ + Feld[x][y] == EL_ACID)) + +#define MOLE_CAN_ENTER_FIELD(x, y, condition) \ + (IN_LEV_FIELD(x, y) && (IS_FREE(x, y) || (condition))) + +#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)) + /* game button identifiers */ #define GAME_CTRL_ID_STOP 0 #define GAME_CTRL_ID_PAUSE 1 @@ -109,6 +163,10 @@ static void CloseAllOpenTimegates(void); static void CheckGravityMovement(struct PlayerInfo *); static void KillHeroUnlessProtected(int, int); +static void CheckTriggeredElementChange(int, int); +static void CheckPlayerElementChange(int, int, int, int); +static void ChangeElementDoIt(int, int, int); + static void PlaySoundLevel(int, int, int); static void PlaySoundLevelNearest(int, int, int); static void PlaySoundLevelAction(int, int, int); @@ -154,43 +212,154 @@ struct ChangingElementInfo static struct ChangingElementInfo changing_element_list[] = { - { EL_NUT_BREAKING, EL_EMERALD, 6, NULL, NULL, NULL }, - { EL_PEARL_BREAKING, EL_EMPTY, 8, NULL, NULL, NULL }, - { EL_EXIT_OPENING, EL_EXIT_OPEN, 29, NULL, NULL, NULL }, - - { EL_SWITCHGATE_OPENING, EL_SWITCHGATE_OPEN, 29, NULL, NULL, NULL }, - { EL_SWITCHGATE_CLOSING, EL_SWITCHGATE_CLOSED, 29, NULL, NULL, NULL }, - - { EL_TIMEGATE_OPENING, EL_TIMEGATE_OPEN, 29, NULL, NULL, NULL }, - { EL_TIMEGATE_CLOSING, EL_TIMEGATE_CLOSED, 29, NULL, NULL, NULL }, - - { EL_ACID_SPLASH_LEFT, EL_EMPTY, 8, NULL, NULL, NULL }, - { EL_ACID_SPLASH_RIGHT, EL_EMPTY, 8, NULL, NULL, NULL }, - - { EL_SP_BUGGY_BASE, EL_SP_BUGGY_BASE_ACTIVATING, 0, - InitBuggyBase, NULL, NULL }, - { EL_SP_BUGGY_BASE_ACTIVATING,EL_SP_BUGGY_BASE_ACTIVE, 0, - InitBuggyBase, NULL, NULL }, - { EL_SP_BUGGY_BASE_ACTIVE, EL_SP_BUGGY_BASE, 0, - InitBuggyBase, WarnBuggyBase, NULL }, - - { EL_TRAP, EL_TRAP_ACTIVE, 0, - InitTrap, NULL, ActivateTrap }, - { EL_TRAP_ACTIVE, EL_TRAP, 31, - NULL, ChangeActiveTrap, NULL }, - - { EL_ROBOT_WHEEL_ACTIVE, EL_ROBOT_WHEEL, 0, - InitRobotWheel, RunRobotWheel, StopRobotWheel }, + { + EL_NUT_BREAKING, + EL_EMERALD, + 6, + NULL, + NULL, + NULL + }, + { + EL_PEARL_BREAKING, + EL_EMPTY, + 8, + NULL, + NULL, + NULL + }, + { + EL_EXIT_OPENING, + EL_EXIT_OPEN, + 29, + NULL, + NULL, + NULL + }, + { + EL_SWITCHGATE_OPENING, + EL_SWITCHGATE_OPEN, + 29, + NULL, + NULL, + NULL + }, + { + EL_SWITCHGATE_CLOSING, + EL_SWITCHGATE_CLOSED, + 29, + NULL, + NULL, + NULL + }, + { + EL_TIMEGATE_OPENING, + EL_TIMEGATE_OPEN, + 29, + NULL, + NULL, + NULL + }, + { + EL_TIMEGATE_CLOSING, + EL_TIMEGATE_CLOSED, + 29, + NULL, + NULL, + NULL + }, - { EL_TIMEGATE_SWITCH_ACTIVE, EL_TIMEGATE_SWITCH, 0, - InitTimegateWheel, RunTimegateWheel, NULL }, + { + EL_ACID_SPLASH_LEFT, + EL_EMPTY, + 8, + NULL, + NULL, + NULL + }, + { + EL_ACID_SPLASH_RIGHT, + EL_EMPTY, + 8, + NULL, + NULL, + NULL + }, + { + EL_SP_BUGGY_BASE, + EL_SP_BUGGY_BASE_ACTIVATING, + 0, + InitBuggyBase, + NULL, + NULL + }, + { + EL_SP_BUGGY_BASE_ACTIVATING, + EL_SP_BUGGY_BASE_ACTIVE, + 0, + InitBuggyBase, + NULL, + NULL + }, + { + EL_SP_BUGGY_BASE_ACTIVE, + EL_SP_BUGGY_BASE, + 0, + InitBuggyBase, + WarnBuggyBase, + NULL + }, + { + EL_TRAP, + EL_TRAP_ACTIVE, + 0, + InitTrap, + NULL, + ActivateTrap + }, + { + EL_TRAP_ACTIVE, + EL_TRAP, + 31, + NULL, + ChangeActiveTrap, + NULL + }, + { + EL_ROBOT_WHEEL_ACTIVE, + EL_ROBOT_WHEEL, + 0, + InitRobotWheel, + RunRobotWheel, + StopRobotWheel + }, + { + EL_TIMEGATE_SWITCH_ACTIVE, + EL_TIMEGATE_SWITCH, + 0, + InitTimegateWheel, + RunTimegateWheel, + NULL + }, - { EL_UNDEFINED, EL_UNDEFINED, -1, NULL } + { + EL_UNDEFINED, + EL_UNDEFINED, + -1, + NULL, + NULL, + NULL + } }; static struct ChangingElementInfo changing_element[MAX_NUM_ELEMENTS]; +static unsigned long trigger_events[MAX_NUM_ELEMENTS]; #define IS_AUTO_CHANGING(e) (changing_element[e].base_element != EL_UNDEFINED) +#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 TRIGGERS_BY_COLLECTING(e) (trigger_events[e] & CE_OTHER_COLLECTING) void GetPlayerConfig() @@ -266,7 +435,9 @@ static int getBeltDirFromBeltSwitchElement(int element) static void InitField(int x, int y, boolean init_game) { - switch (Feld[x][y]) + int element = Feld[x][y]; + + switch (element) { case EL_SP_MURPHY: if (init_game) @@ -463,6 +634,8 @@ static void InitField(int x, int y, boolean init_game) break; default: + if (IS_CUSTOM_ELEMENT(element) && CAN_MOVE(element)) + InitMovDir(x, y); break; } } @@ -500,9 +673,13 @@ static void InitGameEngine() { 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); + /* 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", @@ -520,30 +697,6 @@ static void InitGameEngine() game.initial_move_delay_value = (level.double_speed ? MOVE_DELAY_HIGH_SPEED : MOVE_DELAY_NORMAL_SPEED); - /* dynamically adjust element properties according to game engine version */ - { - static int ep_em_slippery_wall[] = - { - EL_STEELWALL, - EL_WALL, - EL_EXPANDABLE_WALL, - EL_EXPANDABLE_WALL_HORIZONTAL, - EL_EXPANDABLE_WALL_VERTICAL, - EL_EXPANDABLE_WALL_ANY - }; - static int ep_em_slippery_wall_num = SIZEOF_ARRAY_INT(ep_em_slippery_wall); - - /* special EM style gems behaviour */ - for (i=0; i VERSION_IDENT(2,0,1))); - } - /* initialize changing elements information */ for (i=0; isuccessor; + changing_element[element].change_delay = (change->delay_fixed * + change->delay_frames); + } + + /* initialize trigger events information */ + for (i=0; iactual_frame_counter = 0; player->last_move_dir = MV_NO_MOVING; - player->is_moving = FALSE; player->is_moving = FALSE; player->is_waiting = FALSE; @@ -699,7 +878,7 @@ void InitGame() AllPlayersGone = FALSE; - game.yam_content_nr = 0; + game.yamyam_content_nr = 0; game.magic_wall_active = FALSE; game.magic_wall_time_left = 0; game.light_time_left = 0; @@ -723,6 +902,7 @@ void InitGame() { Feld[x][y] = Ur[x][y]; MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; + ChangeDelay[x][y] = 0; Store[x][y] = Store2[x][y] = StorePlayer[x][y] = Back[x][y] = 0; AmoebaNr[x][y] = 0; JustStopped[x][y] = 0; @@ -941,7 +1121,7 @@ void InitGame() if (setup.sound_music) PlayMusic(level_nr); - KeyboardAutoRepeatOff(); + KeyboardAutoRepeatOffUnlessAutoplay(); if (options.debug) { @@ -1027,30 +1207,66 @@ void InitMovDir(int x, int y) break; default: - MovDir[x][y] = 1 << RND(4); - if (element != EL_BUG && - element != EL_SPACESHIP && - element != EL_BD_BUTTERFLY && - element != EL_BD_FIREFLY) - break; - - for (i=0; i<4; i++) + if (IS_CUSTOM_ELEMENT(element)) { - 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_direction_initial != MV_NO_MOVING) + MovDir[x][y] = element_info[element].move_direction_initial; + else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS) + MovDir[x][y] = 1 << RND(4); + else if (element_info[element].move_pattern == MV_HORIZONTAL) + MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT); + else if (element_info[element].move_pattern == MV_VERTICAL) + MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN); + else if (element_info[element].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) { - if (element == EL_BUG || element == EL_BD_BUTTERFLY) + for (i=0; i<4; i++) { - MovDir[x][y] = direction[0][i]; - break; + 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) + MovDir[x][y] = direction[0][i]; + else + MovDir[x][y] = direction[1][i]; + + break; + } } - else if (element == EL_SPACESHIP || element == EL_BD_FIREFLY || - element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) + } + } + else + { + MovDir[x][y] = 1 << RND(4); + + if (element != EL_BUG && + element != EL_SPACESHIP && + element != EL_BD_BUTTERFLY && + element != EL_BD_FIREFLY) + break; + + for (i=0; i<4; i++) + { + int x1 = x + xy[i][0]; + int y1 = y + xy[i][1]; + + if (!IN_LEV_FIELD(x1, y1) || !IS_FREE(x1, y1)) { - MovDir[x][y] = direction[1][i]; - break; + if (element == EL_BUG || element == EL_BD_BUTTERFLY) + { + MovDir[x][y] = direction[0][i]; + break; + } + else if (element == EL_SPACESHIP || element == EL_BD_FIREFLY || + element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) + { + MovDir[x][y] = direction[1][i]; + break; + } } } } @@ -1176,7 +1392,7 @@ void GameWon() if ((hi_pos = NewHiScore()) >= 0) { - game_status = HALLOFFAME; + game_status = GAME_MODE_SCORES; DrawHallOfFame(hi_pos); if (raise_level) { @@ -1186,7 +1402,7 @@ void GameWon() } else { - game_status = MAINMENU; + game_status = GAME_MODE_MAIN; if (raise_level) { level_nr++; @@ -1288,8 +1504,10 @@ static void ResetGfxAnimation(int x, int 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]) ResetGfxAnimation(x, y); @@ -1382,6 +1600,7 @@ static void RemoveField(int x, int y) MovPos[x][y] = 0; MovDir[x][y] = 0; MovDelay[x][y] = 0; + ChangeDelay[x][y] = 0; } void RemoveMovingField(int x, int y) @@ -1418,6 +1637,7 @@ void RemoveMovingField(int x, int y) 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; + ChangeDelay[oldx][oldy] = ChangeDelay[newx][newy] = 0; GfxAction[oldx][oldy] = GfxAction[newx][newy] = ACTION_DEFAULT; DrawLevelField(oldx, oldy); @@ -1517,7 +1737,7 @@ 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++) + for (y = ey - 1; y <= ey + 1; y++) for(x = ex - 1; x <= ex + 1; x++) { int element; @@ -1534,11 +1754,16 @@ void Explode(int ex, int ey, int phase, int mode) RemoveMovingField(x, y); } +#if 1 + if (IS_EXPLOSION_PROOF(element)) + continue; +#else if ((IS_INDESTRUCTIBLE(element) && (game.engine_version < VERSION_IDENT(2,2,0) || (!IS_WALKABLE_OVER(element) && !IS_WALKABLE_UNDER(element)))) || element == EL_FLAMES) continue; +#endif if (IS_PLAYER(x, y) && SHIELD_ON(PLAYERINFO(x, y))) { @@ -1592,10 +1817,14 @@ void Explode(int ex, int ey, int phase, int mode) Store[x][y] = EL_BD_DIAMOND; else if (center_element == EL_SP_ELECTRON) Store[x][y] = EL_SP_INFOTRON; - else if (center_element == EL_YAMYAM) - Store[x][y] = level.yam_content[game.yam_content_nr][x-ex+1][y-ey+1]; 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]; else if (element == EL_WALL_EMERALD) Store[x][y] = EL_EMERALD; else if (element == EL_WALL_DIAMOND) @@ -1629,7 +1858,11 @@ void Explode(int ex, int ey, int phase, int mode) } Feld[x][y] = EL_EXPLOSION; +#if 1 + GfxElement[x][y] = center_element; +#else GfxElement[x][y] = EL_UNDEFINED; +#endif MovDir[x][y] = MovPos[x][y] = 0; AmoebaNr[x][y] = 0; ExplodePhase[x][y] = 1; @@ -1637,7 +1870,8 @@ void Explode(int ex, int ey, int phase, int mode) } if (center_element == EL_YAMYAM) - game.yam_content_nr = (game.yam_content_nr + 1) % level.num_yam_contents; + game.yamyam_content_nr = + (game.yamyam_content_nr + 1) % level.num_yamyam_contents; return; } @@ -1667,7 +1901,7 @@ void Explode(int ex, int ey, int phase, int mode) if (IS_PLAYER(x, y)) KillHeroUnlessProtected(x, y); - else if (IS_EXPLOSIVE(element)) + else if (CAN_EXPLODE_BY_FIRE(element)) { Feld[x][y] = Store2[x][y]; Store2[x][y] = 0; @@ -1683,14 +1917,15 @@ void Explode(int ex, int ey, int phase, int mode) element = Feld[x][y] = Store[x][y]; Store[x][y] = Store2[x][y] = 0; + GfxElement[x][y] = EL_UNDEFINED; 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; + MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = ChangeDelay[x][y] = 0; InitField(x, y, FALSE); - if (CAN_MOVE(element) || COULD_MOVE(element)) + if (CAN_MOVE(element)) InitMovDir(x, y); DrawLevelField(x, y); @@ -1699,16 +1934,20 @@ void Explode(int ex, int ey, int phase, int mode) } else if (phase >= delay && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) { +#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 int frame = getGraphicAnimationFrame(graphic, phase - delay); if (phase == delay) DrawLevelFieldCrumbledSand(x, y); - if (IS_WALKABLE_OVER(Back[x][y])) + if (IS_WALKABLE_OVER(Back[x][y]) && Back[x][y] != EL_EMPTY) { DrawLevelElement(x, y, Back[x][y]); DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame); @@ -1779,10 +2018,22 @@ void Bang(int x, int y) { int element = Feld[x][y]; + if (IS_PLAYER(x, y)) + { + struct PlayerInfo *player = PLAYERINFO(x, y); + + element = Feld[x][y] = (player->use_murphy_graphic ? EL_SP_MURPHY : + player->element_nr); + } + +#if 1 + PlaySoundLevelAction(x, y, ACTION_EXPLODING); +#else if (game.emulation == EMU_SUPAPLEX) PlaySoundLevel(x, y, SND_SP_ELEMENT_EXPLODING); else PlaySoundLevel(x, y, SND_ELEMENT_EXPLODING); +#endif #if 0 if (IS_PLAYER(x, y)) /* remove objects that might cause smaller explosion */ @@ -1824,6 +2075,8 @@ void Bang(int x, int y) Explode(x, y, EX_PHASE_START, EX_NORMAL); break; } + + CheckTriggeredElementChange(element, CE_OTHER_EXPLODING); } void SplashAcid(int x, int y) @@ -1847,26 +2100,6 @@ void SplashAcid(int x, int y) } } -static int ChangeElementOnPlayfield(int element_old, int element_new) -{ - int x, y; - int num_changes = 0; - - for(y=0; y 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_GEM(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 = IN_LEV_FIELD_AND_IS_FREE(left_x, left_y); + boolean can_turn_right = IN_LEV_FIELD_AND_IS_FREE(right_x, right_y); + boolean can_move_on = IN_LEV_FIELD_AND_IS_FREE(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 (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 (!IS_FREE(xx, yy)) MovDir[x][y] = old_move_dir; 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(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(left_x, left_y, + IS_AMOEBOID(Feld[left_x][left_y]))); + + boolean can_turn_right = + (MOLE_CAN_ENTER_FIELD(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); @@ -2659,9 +2864,9 @@ 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 (MovDir[x][y] & MV_HORIZONTAL && + (!IN_LEV_FIELD_AND_IS_FREE(move_x, move_y) || + IN_LEV_FIELD_AND_IS_FREE(x, y + 1))) MovDir[x][y] = MV_NO_MOVING; MovDelay[x][y] = 0; @@ -2689,7 +2894,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; @@ -2716,8 +2922,8 @@ void TurnRound(int x, int y) for (i=0; i<4; i++) { - int ex = x + xy[i%4][0]; - int ey = y + xy[i%4][1]; + int ex = x + xy[i % 4][0]; + int ey = y + xy[i % 4][1]; if (IN_LEV_FIELD(ex, ey) && Feld[ex][ey] == EL_EXIT_OPEN) { @@ -2729,116 +2935,256 @@ void TurnRound(int x, int y) } MovDir[x][y] = MV_NO_MOVING; - if (attr_xx) + else if (attr_x > x) MovDir[x][y] |= (AllPlayersGone ? MV_LEFT : MV_RIGHT); - if (attr_yy) + else if (attr_y > y) MovDir[x][y] |= (AllPlayersGone ? MV_UP : MV_DOWN); if (element == EL_ROBOT) { int newx, newy; - if ((MovDir[x][y]&(MV_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN))) - MovDir[x][y] &= (RND(2) ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); + if (MovDir[x][y] & MV_HORIZONTAL && MovDir[x][y] & MV_VERTICAL) + MovDir[x][y] &= (RND(2) ? MV_HORIZONTAL : MV_VERTICAL); 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_LEFT|MV_RIGHT)) && (MovDir[x][y]&(MV_UP|MV_DOWN))) + 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_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); + 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 (PENGUIN_CAN_ENTER_FIELD(newx, newy)) return; MovDir[x][y] = - new_move_dir & (!first_horiz ? (MV_LEFT|MV_RIGHT) : (MV_UP|MV_DOWN)); + 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 (PENGUIN_CAN_ENTER_FIELD(newx, newy)) return; MovDir[x][y] = old_move_dir; return; } } - } -} + else /* (element == EL_SATELLITE) */ + { + int newx, newy; -static boolean JustBeingPushed(int x, int y) -{ - int i; + MovDelay[x][y] = 1; - for (i=0; iactive && player->Pushing && player->MovPos) - { - int next_jx = player->jx + (player->jx - player->last_jx); - int next_jy = player->jy + (player->jy - player->last_jy); + MovDir[x][y] = + new_move_dir & (first_horiz ? MV_HORIZONTAL : MV_VERTICAL); + Moving2Blocked(x, y, &newx, &newy); - if (x == next_jx && y == next_jy) - return TRUE; + if (ELEMENT_CAN_ENTER_FIELD_OR_ACID_2(newx, newy)) + return; + + MovDir[x][y] = + new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL); + Moving2Blocked(x, y, &newx, &newy); + + if (ELEMENT_CAN_ENTER_FIELD_OR_ACID_2(newx, newy)) + return; + + MovDir[x][y] = old_move_dir; + return; + } } } + else if (element_info[element].move_pattern == MV_ALL_DIRECTIONS) + { + boolean can_turn_left = ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y); + boolean can_turn_right = ELEMENT_CAN_ENTER_FIELD(element, right_x,right_y); - return FALSE; -} + 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); + else if (can_turn_right) + MovDir[x][y] = (RND(2) ? right_dir : back_dir); + else + MovDir[x][y] = back_dir; -void StartMoving(int x, int y) -{ - static boolean use_spring_bug = TRUE; - boolean started_moving = FALSE; /* some elements can fall _and_ move */ - int element = Feld[x][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) + { + if (element_info[element].move_pattern & old_move_dir) + MovDir[x][y] = back_dir; + else if (element_info[element].move_pattern == MV_HORIZONTAL) + MovDir[x][y] = (RND(2) ? MV_LEFT : MV_RIGHT); + else if (element_info[element].move_pattern == MV_VERTICAL) + MovDir[x][y] = (RND(2) ? MV_UP : MV_DOWN); - if (Stop[x][y]) - return; + MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); + } + else if (element_info[element].move_pattern & MV_ANY_DIRECTION) + { + MovDir[x][y] = element_info[element].move_pattern; + MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); + } + else if (element_info[element].move_pattern == MV_ALONG_LEFT_SIDE) + { + if (ELEMENT_CAN_ENTER_FIELD(element, left_x, left_y)) + MovDir[x][y] = left_dir; + else if (!ELEMENT_CAN_ENTER_FIELD(element, move_x, move_y)) + MovDir[x][y] = right_dir; - GfxAction[x][y] = ACTION_DEFAULT; + 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) + { + if (ELEMENT_CAN_ENTER_FIELD(element, right_x, right_y)) + MovDir[x][y] = right_dir; + else if (!ELEMENT_CAN_ENTER_FIELD(element, move_x, move_y)) + MovDir[x][y] = left_dir; - if (CAN_FALL(element) && y < lev_fieldy - 1) + 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) { - if ((x>0 && IS_PLAYER(x-1, y)) || (xjx, jy = player->jy; + + if (!player->active) + continue; + + if (attr_x == -1 || + ABS(jx - x) + ABS(jy - y) < ABS(attr_x - x) + ABS(attr_y - y)) + { + attr_x = jx; + attr_y = jy; + } + } + } + + MovDir[x][y] = MV_NO_MOVING; + if (attr_x < x) + MovDir[x][y] |= (move_away ? MV_RIGHT : MV_LEFT); + else if (attr_x > x) + MovDir[x][y] |= (move_away ? MV_LEFT : MV_RIGHT); + if (attr_y < y) + MovDir[x][y] |= (move_away ? MV_DOWN : MV_UP); + else if (attr_y > y) + MovDir[x][y] |= (move_away ? MV_UP : MV_DOWN); + + MovDelay[x][y] = GET_NEW_MOVE_DELAY(element); + + 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 (ELEMENT_CAN_ENTER_FIELD_OR_ACID(element, newx, newy)) + return; + + MovDir[x][y] = + new_move_dir & (!first_horiz ? MV_HORIZONTAL : MV_VERTICAL); + Moving2Blocked(x, y, &newx, &newy); + + if (ELEMENT_CAN_ENTER_FIELD_OR_ACID(element, newx, newy)) + return; + + MovDir[x][y] = old_move_dir; + } + } +} + +static boolean JustBeingPushed(int x, int y) +{ + int i; + + for (i=0; iactive && player->Pushing && player->MovPos) + { + int next_jx = player->jx + (player->jx - player->last_jx); + int next_jy = player->jy + (player->jy - player->last_jy); + + if (x == next_jx && y == next_jy) + return TRUE; + } + } + + return FALSE; +} + +void StartMoving(int x, int y) +{ + boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0)); + 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 (CAN_FALL(element) && y < lev_fieldy - 1) + { + if ((x>0 && IS_PLAYER(x-1, y)) || (x 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) && !JustStopped[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) && !JustStopped[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)); + (IS_FREE(x-1, y + 1) || Feld[x-1][y + 1] == EL_ACID)); boolean right = (x0 && IS_FREE(x-1, y)); boolean right_is_free = (xPushing && player->MovPos != 0); +#else + boolean pushing = (player != NULL && player->Pushing && player->is_moving); +#endif + +#if 0 + if (player && player->is_moving && player->MovPos == 0) + printf("::: !!!\n"); +#endif if (element == EL_AMOEBA_DROP || element == EL_AMOEBA_DROPPING) step /= 2; @@ -3409,6 +3817,8 @@ void ContinueMoving(int x, int y) 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)) @@ -3417,10 +3827,31 @@ void ContinueMoving(int x, int y) MovPos[x][y] += step; +#if 1 + if (pushing) /* special case: moving object pushed by player */ +#if 1 + MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos)); +#else + MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->GfxPos)); +#endif +#endif + +#if 0 + if (element == EL_SPRING) + printf("::: spring moves %d [%d: %d, %d, %d/%d]\n", + MovPos[x][y], + pushing, + (player?player->Pushing:-42), + (player?player->is_moving:-42), + (player?player->MovPos:-42), + (player?player->GfxPos:-42)); +#endif + if (ABS(MovPos[x][y]) >= TILEX) /* object reached its destination */ { Feld[x][y] = EL_EMPTY; Feld[newx][newy] = element; + MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */ if (element == EL_MOLE) { @@ -3500,6 +3931,9 @@ void ContinueMoving(int x, int y) MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; MovDelay[newx][newy] = 0; + /* copy element change control values to new field */ + ChangeDelay[newx][newy] = ChangeDelay[x][y]; + /* copy animation control values to new field */ GfxFrame[newx][newy] = GfxFrame[x][y]; GfxAction[newx][newy] = GfxAction[x][y]; /* keep action one frame */ @@ -3526,8 +3960,14 @@ void ContinueMoving(int x, int y) DrawLevelField(x, y); DrawLevelField(newx, newy); - Stop[newx][newy] = TRUE; - JustStopped[newx][newy] = 3; +#if 0 + if (game.engine_version >= RELEASE_IDENT(2,2,0,7) || !pushing) +#endif + Stop[newx][newy] = TRUE; /* ignore this element until the next frame */ +#if 1 + if (!pushing) +#endif + JustStopped[newx][newy] = 3; if (DONT_TOUCH(element)) /* object may be nasty to player or others */ { @@ -3538,9 +3978,15 @@ void ContinueMoving(int x, int y) else if (element == EL_PENGUIN) TestIfFriendTouchesBadThing(newx, newy); +#if 1 + if (CAN_FALL(element) && direction == MV_DOWN && + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) + Impact(x, newy); +#else if (CAN_SMASH(element) && direction == MV_DOWN && - (newy == lev_fieldy-1 || !IS_FREE(x, newy+1))) + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) Impact(x, newy); +#endif } else /* still moving on */ { @@ -4038,7 +4484,7 @@ void Life(int ax, int ay) 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) @@ -4054,7 +4500,7 @@ static void StopRobotWheel(int x, int y) static void InitTimegateWheel(int x, int y) { - MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; + ChangeDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; } static void RunTimegateWheel(int x, int y) @@ -4188,22 +4634,22 @@ void MauerWaechst(int x, int y) { if (MovDir[x][y] == MV_LEFT) { - if (IN_LEV_FIELD(x - 1, y) && IS_MAUER(Feld[x - 1][y])) + if (IN_LEV_FIELD(x - 1, y) && IS_WALL(Feld[x - 1][y])) DrawLevelField(x - 1, y); } else if (MovDir[x][y] == MV_RIGHT) { - if (IN_LEV_FIELD(x + 1, y) && IS_MAUER(Feld[x + 1][y])) + if (IN_LEV_FIELD(x + 1, y) && IS_WALL(Feld[x + 1][y])) DrawLevelField(x + 1, y); } else if (MovDir[x][y] == MV_UP) { - if (IN_LEV_FIELD(x, y - 1) && IS_MAUER(Feld[x][y - 1])) + if (IN_LEV_FIELD(x, y - 1) && IS_WALL(Feld[x][y - 1])) DrawLevelField(x, y - 1); } else { - if (IN_LEV_FIELD(x, y + 1) && IS_MAUER(Feld[x][y + 1])) + if (IN_LEV_FIELD(x, y + 1) && IS_WALL(Feld[x][y + 1])) DrawLevelField(x, y + 1); } @@ -4302,13 +4748,13 @@ void MauerAbleger(int ax, int ay) if (element == EL_EXPANDABLE_WALL && (links_frei || rechts_frei)) DrawLevelField(ax, ay); - if (!IN_LEV_FIELD(ax, ay-1) || IS_MAUER(Feld[ax][ay-1])) + if (!IN_LEV_FIELD(ax, ay-1) || IS_WALL(Feld[ax][ay-1])) oben_massiv = TRUE; - if (!IN_LEV_FIELD(ax, ay+1) || IS_MAUER(Feld[ax][ay+1])) + if (!IN_LEV_FIELD(ax, ay+1) || IS_WALL(Feld[ax][ay+1])) unten_massiv = TRUE; - if (!IN_LEV_FIELD(ax-1, ay) || IS_MAUER(Feld[ax-1][ay])) + if (!IN_LEV_FIELD(ax-1, ay) || IS_WALL(Feld[ax-1][ay])) links_massiv = TRUE; - if (!IN_LEV_FIELD(ax+1, ay) || IS_MAUER(Feld[ax+1][ay])) + if (!IN_LEV_FIELD(ax+1, ay) || IS_WALL(Feld[ax+1][ay])) rechts_massiv = TRUE; if (((oben_massiv && unten_massiv) || @@ -4380,7 +4826,7 @@ static void InitBuggyBase(int x, int y) int element = Feld[x][y]; int activating_delay = FRAMES_PER_SECOND / 4; - MovDelay[x][y] = + ChangeDelay[x][y] = (element == EL_SP_BUGGY_BASE ? 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND) - activating_delay : element == EL_SP_BUGGY_BASE_ACTIVATING ? @@ -4415,7 +4861,7 @@ static void WarnBuggyBase(int x, int y) static void InitTrap(int x, int y) { - MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); + ChangeDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); } static void ActivateTrap(int x, int y) @@ -4432,13 +4878,67 @@ static void ChangeActiveTrap(int x, int y) DrawLevelFieldCrumbledSand(x, y); } +static void ChangeElementDoIt(int x, int y, int element_new) +{ + CheckTriggeredElementChange(Feld[x][y], CE_OTHER_CHANGING); + + RemoveField(x, y); + Feld[x][y] = element_new; + + ResetGfxAnimation(x, y); + ResetRandomAnimationValue(x, y); + + InitField(x, y, FALSE); + if (CAN_MOVE(Feld[x][y])) + InitMovDir(x, y); + + DrawLevelField(x, y); + + if (CAN_BE_CRUMBLED(Feld[x][y])) + { + int sx = SCREENX(x), sy = SCREENY(y); + static int xy[4][2] = + { + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; + int i; + + for(i=0; i<4; i++) + { + int xx = x + xy[i][0]; + int yy = y + xy[i][1]; + int sxx = sx + xy[i][0]; + int syy = sy + xy[i][1]; + + if (!IN_LEV_FIELD(xx, yy) || + !IN_SCR_FIELD(sxx, syy) || + !CAN_BE_CRUMBLED(Feld[xx][yy]) || + IS_MOVING(xx, yy)) + continue; + + DrawLevelField(xx, yy); + } + } +} + static void ChangeElement(int x, int y) { int element = Feld[x][y]; - if (MovDelay[x][y] == 0) /* initialize element change */ + if (ChangeDelay[x][y] == 0) /* initialize element change */ { - MovDelay[x][y] = changing_element[element].change_delay + 1; + ChangeDelay[x][y] = changing_element[element].change_delay + 1; + + if (IS_CUSTOM_ELEMENT(element) && HAS_CHANGE_EVENT(element, CE_DELAY)) + { + int max_random_delay = element_info[element].change.delay_random; + int delay_frames = element_info[element].change.delay_frames; + + ChangeDelay[x][y] += RND(max_random_delay * delay_frames); + } ResetGfxAnimation(x, y); ResetRandomAnimationValue(x, y); @@ -4447,30 +4947,72 @@ static void ChangeElement(int x, int y) changing_element[element].pre_change_function(x, y); } - MovDelay[x][y]--; + ChangeDelay[x][y]--; - if (MovDelay[x][y] != 0) /* continue element change */ + if (ChangeDelay[x][y] != 0) /* continue element change */ { - if (IS_ANIMATED(el2img(element))) - DrawLevelElementAnimationIfNeeded(x, y, element); + int graphic = el_act_dir2img(element, GfxAction[x][y], MovDir[x][y]); + + if (IS_ANIMATED(graphic)) + DrawLevelGraphicAnimationIfNeeded(x, y, graphic); if (changing_element[element].change_function) changing_element[element].change_function(x, y); } else /* finish element change */ { - Feld[x][y] = changing_element[element].next_element; + int next_element = changing_element[element].next_element; - ResetGfxAnimation(x, y); - ResetRandomAnimationValue(x, y); + if (IS_MOVING(x, y)) /* never change a running system ;-) */ + { + ChangeDelay[x][y] = 1; /* try change after next move step */ - DrawLevelField(x, y); + return; + } + + if (next_element != EL_UNDEFINED) + ChangeElementDoIt(x, y, next_element); + else + ChangeElementDoIt(x, y, element_info[element].change.successor); if (changing_element[element].post_change_function) changing_element[element].post_change_function(x, y); } } +static void CheckTriggeredElementChange(int trigger_element, int trigger_event) +{ + int i, x, y; + + if (!(trigger_events[trigger_element] & CH_EVENT_BIT(trigger_event))) + return; + + for (i=0; ijx; + int y = player->jy; + + if (player->active && player->Pushing && player->is_moving && + IS_MOVING(x, y)) + { + 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; yactive) return; +#if 1 + PlaySoundLevelElementAction(jx, jy, player->element_nr, ACTION_DYING); +#else PlaySoundLevel(jx, jy, SND_CLASS_PLAYER_DYING); +#endif PlaySoundLevel(jx, jy, SND_GAME_LOSING); player->GameOver = TRUE; @@ -5708,17 +6330,31 @@ void RemoveHero(struct PlayerInfo *player) ExitY = ZY = jy; } -#if 0 /* checkDiagonalPushing() ----------------------------------------------------------------------------- check if diagonal input device direction results in pushing of object + (by checking if the alternative direction is walkable, diggable, ...) */ -static boolean checkDiagonalPushing(int x, int y, int real_dx, int real_dy) +static boolean checkDiagonalPushing(struct PlayerInfo *player, + int x, int y, int real_dx, int real_dy) { + int jx, jy, dx, dy, xx, yy; + + if (real_dx == 0 || real_dy == 0) /* no diagonal direction => push */ + return TRUE; + + /* diagonal direction: check alternative direction */ + jx = player->jx; + jy = player->jy; + dx = x - jx; + dy = y - jy; + xx = jx + (dx == 0 ? real_dx : 0); + yy = jy + (dy == 0 ? real_dy : 0); + + return (!IN_LEV_FIELD(xx, yy) || IS_SOLID_FOR_PUSHING(Feld[xx][yy])); } -#endif /* DigField() @@ -5744,22 +6380,36 @@ int DigField(struct PlayerInfo *player, player->is_collecting = FALSE; } - if (player->MovPos == 0) + if (player->MovPos == 0) /* last pushing move finished */ player->Pushing = FALSE; - if (mode == DF_NO_PUSH) + if (mode == DF_NO_PUSH) /* player just stopped pushing */ { player->Switching = FALSE; player->push_delay = 0; + return MF_NO_ACTION; } if (IS_MOVING(x, y) || IS_PLAYER(x, y)) + { +#if 0 + if (FrameCounter == 437) + printf("::: ---> IS_MOVING %d\n", MovDir[x][y]); +#endif + return MF_NO_ACTION; + } - if (IS_TUBE(Feld[jx][jy])) +#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))) +#endif { int i = 0; + int tube_element = (IS_TUBE(Feld[jx][jy]) ? Feld[jx][jy] : Back[jx][jy]); int tube_leave_directions[][2] = { { EL_TUBE_ANY, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN }, @@ -5776,7 +6426,7 @@ int DigField(struct PlayerInfo *player, { -1, MV_LEFT | MV_RIGHT | MV_UP | MV_DOWN } }; - while (tube_leave_directions[i][0] != Feld[jx][jy]) + while (tube_leave_directions[i][0] != tube_element) { i++; if (tube_leave_directions[i][0] == -1) /* should not happen */ @@ -5789,9 +6439,21 @@ int DigField(struct PlayerInfo *player, 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) { +#if 0 case EL_EMPTY: + PlaySoundLevelElementAction(x, y, player->element_nr, ACTION_MOVING); + break; +#endif + +#if 0 case EL_SAND: case EL_INVISIBLE_SAND: case EL_INVISIBLE_SAND_ACTIVE: @@ -5800,15 +6462,16 @@ int DigField(struct PlayerInfo *player, 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; +#endif case EL_EMERALD: case EL_BD_DIAMOND: @@ -5820,13 +6483,13 @@ int DigField(struct PlayerInfo *player, 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); @@ -5836,18 +6499,31 @@ int DigField(struct PlayerInfo *player, DrawText(DX_EMERALDS, DY_EMERALDS, int2str(local_player->gems_still_needed, 3), FONT_TEXT_2); PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_SPEED_PILL: RemoveField(x, y); player->move_delay_value = MOVE_DELAY_HIGH_SPEED; +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_SPEED_PILL_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; +#if 0 case EL_ENVELOPE: Feld[x][y] = EL_EMPTY; +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_ENVELOPE_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; +#endif case EL_EXTRA_TIME: RemoveField(x, y); @@ -5856,20 +6532,35 @@ int DigField(struct PlayerInfo *player, TimeLeft += 10; DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FONT_TEXT_2); } +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundStereo(SND_EXTRA_TIME_COLLECTING, SOUND_MIDDLE); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_SHIELD_NORMAL: RemoveField(x, y); player->shield_normal_time_left += 10; +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_SHIELD_NORMAL_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_SHIELD_DEADLY: RemoveField(x, y); player->shield_normal_time_left += 10; player->shield_deadly_time_left += 10; +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_SHIELD_DEADLY_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_DYNAMITE: @@ -5881,6 +6572,7 @@ int DigField(struct PlayerInfo *player, DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FONT_TEXT_2); PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_DYNABOMB_INCREASE_NUMBER: @@ -5888,21 +6580,36 @@ int DigField(struct PlayerInfo *player, player->dynabomb_count++; player->dynabombs_left++; RaiseScoreElement(EL_DYNAMITE); +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_NUMBER_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_DYNABOMB_INCREASE_SIZE: RemoveField(x, y); player->dynabomb_size++; RaiseScoreElement(EL_DYNAMITE); +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_SIZE_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_DYNABOMB_INCREASE_POWER: RemoveField(x, y); player->dynabomb_xl = TRUE; RaiseScoreElement(EL_DYNAMITE); +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_DYNABOMB_INCREASE_POWER_COLLECTING); +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; case EL_KEY_1: @@ -5912,8 +6619,6 @@ int DigField(struct PlayerInfo *player, { int key_nr = element - EL_KEY_1; int graphic = el2edimg(element); - int element_old, element_new; - int num_changes; RemoveField(x, y); player->key[key_nr] = TRUE; @@ -5922,35 +6627,12 @@ int DigField(struct PlayerInfo *player, graphic); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, graphic); +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING); - - element_old = EL_GATE_1_CLOSED + key_nr; - element_new = EL_GATE_1_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - element_old = EL_GATE_1_GRAY_CLOSED + key_nr; - element_new = EL_GATE_1_GRAY_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - if (game.engine_version < VERSION_IDENT(2,2,0)) - { - element_old = EL_EM_GATE_1_CLOSED + key_nr; - element_new = EL_EM_GATE_1_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - element_old = EL_EM_GATE_1_GRAY_CLOSED + key_nr; - element_new = EL_EM_GATE_1_GRAY_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - } - +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; } @@ -5961,8 +6643,6 @@ int DigField(struct PlayerInfo *player, { int key_nr = element - EL_EM_KEY_1; int graphic = el2edimg(EL_KEY_1 + key_nr); - int element_old, element_new; - int num_changes; RemoveField(x, y); player->key[key_nr] = TRUE; @@ -5971,35 +6651,12 @@ int DigField(struct PlayerInfo *player, graphic); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, graphic); +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); +#else PlaySoundLevel(x, y, SND_CLASS_KEY_COLLECTING); - - element_old = EL_EM_GATE_1_CLOSED + key_nr; - element_new = EL_EM_GATE_1_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - element_old = EL_EM_GATE_1_GRAY_CLOSED + key_nr; - element_new = EL_EM_GATE_1_GRAY_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - if (game.engine_version < VERSION_IDENT(2,2,0)) - { - element_old = EL_GATE_1_CLOSED + key_nr; - element_new = EL_GATE_1_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - - element_old = EL_GATE_1_GRAY_CLOSED + key_nr; - element_new = EL_GATE_1_GRAY_OPEN + key_nr; - num_changes = ChangeElementOnPlayfield(element_old, element_new); - if (num_changes > 0) - PlaySoundLevelElementAction(x, y, element_old, ACTION_OPENING); - } - +#endif + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); break; } @@ -6124,17 +6781,26 @@ int DigField(struct PlayerInfo *player, 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 (real_dy) - { - if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_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 + printf("want push... %d [%d]\n", FrameCounter, player->push_delay_value); +#endif + #if 0 if (!FrameReached(&player->push_delay, player->push_delay_value) && !tape.playing && @@ -6154,50 +6820,61 @@ int DigField(struct PlayerInfo *player, } else { +#if 1 + InitMovingField(x, y, (dx < 0 ? MV_LEFT : + dx > 0 ? MV_RIGHT : + dy < 0 ? MV_UP : MV_DOWN)); + MovPos[x][y] = (dx != 0 ? dx : dy); +#else RemoveField(x, y); Feld[x + dx][y + dy] = element; +#endif } +#if 0 + printf("pushing %d/%d ... %d [%d]\n", dx, dy, + FrameCounter, player->push_delay_value); +#endif + +#if 0 if (element == EL_SPRING) { Feld[x + dx][y + dy] = EL_SPRING; MovDir[x + dx][y + dy] = move_direction; } +#endif player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8)); DrawLevelField(x + dx, y + dy); PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); + + CheckTriggeredElementChange(element, CE_OTHER_PUSHING); + break; - case EL_GATE_1_OPEN: - case EL_GATE_2_OPEN: - case EL_GATE_3_OPEN: - case EL_GATE_4_OPEN: -#if 0 + 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; -#endif break; - case EL_GATE_1_GRAY_OPEN: - case EL_GATE_2_GRAY_OPEN: - case EL_GATE_3_GRAY_OPEN: - case EL_GATE_4_GRAY_OPEN: -#if 0 + 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; -#endif break; - case EL_EM_GATE_1_OPEN: - case EL_EM_GATE_2_OPEN: - case EL_EM_GATE_3_OPEN: - case EL_EM_GATE_4_OPEN: -#if 0 + 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; -#endif if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) return MF_NO_ACTION; @@ -6205,21 +6882,15 @@ int DigField(struct PlayerInfo *player, player->programmed_action = move_direction; DOUBLE_PLAYER_SPEED(player); -#if 1 - PlaySoundLevelAction(x, y, ACTION_PASSING); -#else PlaySoundLevel(x, y, SND_CLASS_GATE_PASSING); -#endif break; - case EL_EM_GATE_1_GRAY_OPEN: - case EL_EM_GATE_2_GRAY_OPEN: - case EL_EM_GATE_3_GRAY_OPEN: - case EL_EM_GATE_4_GRAY_OPEN: -#if 0 + 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; -#endif if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) return MF_NO_ACTION; @@ -6366,8 +7037,10 @@ int DigField(struct PlayerInfo *player, return MF_ACTION; break; +#if 0 case EL_SOKOBAN_FIELD_EMPTY: break; +#endif case EL_SOKOBAN_OBJECT: case EL_SOKOBAN_FIELD_FULL: @@ -6385,16 +7058,8 @@ int DigField(struct PlayerInfo *player, || !IS_SB_ELEMENT(element)))) return MF_NO_ACTION; - if (dx && real_dy) - { - if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) - return MF_NO_ACTION; - } - else if (dy && real_dx) - { - if (IN_LEV_FIELD(jx+real_dx, jy) && !IS_SOLID(Feld[jx+real_dx][jy])) - 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; @@ -6473,6 +7138,8 @@ int DigField(struct PlayerInfo *player, PlaySoundLevel(x, y, SND_GAME_SOKOBAN_SOLVING); } + CheckTriggeredElementChange(element, CE_OTHER_PUSHING); + break; case EL_PENGUIN: @@ -6481,7 +7148,46 @@ int DigField(struct PlayerInfo *player, break; default: - if (IS_PUSHABLE(element)) + + if (IS_WALKABLE(element)) + { + PlaySoundLevelElementAction(x, y, player->element_nr, ACTION_MOVING); + break; + } + else if (IS_DIGGABLE(element)) + { + RemoveField(x, y); + + if (mode != DF_SNAP) + { + GfxElement[x][y] = + (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element)); + player->is_digging = TRUE; + } + + PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING); + + break; + } + else if (IS_COLLECTIBLE(element)) + { + RemoveField(x, y); + + if (mode != DF_SNAP) + { + GfxElement[x][y] = element; + player->is_collecting = TRUE; + } + + RaiseScoreElement(element); + + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); + + CheckTriggeredElementChange(element, CE_OTHER_COLLECTING); + + break; + } + else if (IS_PUSHABLE(element)) { if (mode == DF_SNAP) return MF_NO_ACTION; @@ -6489,39 +7195,54 @@ int DigField(struct PlayerInfo *player, if (CAN_FALL(element) && dy) return MF_NO_ACTION; + if (!player->Pushing && + game.engine_version >= RELEASE_IDENT(2,2,0,7)) + player->push_delay_value = GET_NEW_PUSH_DELAY(element); + player->Pushing = TRUE; - if (!IN_LEV_FIELD(x+dx, y+dy) || !IS_FREE(x+dx, y+dy)) + if (!IN_LEV_FIELD(x + dx, y + dy) || !IS_FREE(x + dx, y + dy)) return MF_NO_ACTION; - if (dx && real_dy) - { - if (IN_LEV_FIELD(jx, jy+real_dy) && !IS_SOLID(Feld[jx][jy+real_dy])) - return MF_NO_ACTION; - } - else if (dy && real_dx) - { - if (IN_LEV_FIELD(jx+real_dx, jy) && !IS_SOLID(Feld[jx+real_dx][jy])) - return MF_NO_ACTION; - } + if (!checkDiagonalPushing(player, x, y, real_dx, real_dy)) + return MF_NO_ACTION; - if (player->push_delay == 0) + if (player->push_delay == 0) /* new pushing; restart delay */ player->push_delay = FrameCounter; if (!FrameReached(&player->push_delay, player->push_delay_value) && !(tape.playing && tape.file_version < FILE_VERSION_2_0)) return MF_NO_ACTION; +#if 1 + InitMovingField(x, y, (dx < 0 ? MV_LEFT : + dx > 0 ? MV_RIGHT : + dy < 0 ? MV_UP : MV_DOWN)); + MovPos[x][y] = (dx != 0 ? dx : dy); +#else RemoveField(x, y); Feld[x + dx][y + dy] = element; +#endif +#if 1 + if (game.engine_version < RELEASE_IDENT(2,2,0,7)) + player->push_delay_value = GET_NEW_PUSH_DELAY(element); +#else player->push_delay_value = 2 + RND(8); +#endif DrawLevelField(x + dx, y + dy); PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); + CheckTriggeredElementChange(element, CE_OTHER_PUSHING); + CheckPlayerElementChange(x + dx, y + dy, element, CE_PUSHED_BY_PLAYER); + break; } + else + { + CheckPlayerElementChange(x, y, element, CE_PRESSED_BY_PLAYER); + } return MF_NO_ACTION; } @@ -6539,6 +7260,9 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) int jx = player->jx, jy = player->jy; int x = jx + dx, y = jy + dy; + if (player->MovPos && game.engine_version >= VERSION_IDENT(2,2,0)) + return FALSE; + if (!player->active || !IN_LEV_FIELD(x, y)) return FALSE; @@ -6569,7 +7293,7 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) dy < 0 ? MV_UP : dy > 0 ? MV_DOWN : MV_NO_MOVING); - if (!DigField(player, x, y, 0, 0, DF_SNAP)) + if (DigField(player, x, y, 0, 0, DF_SNAP) == MF_NO_ACTION) return FALSE; player->snapped = TRUE; @@ -6596,6 +7320,11 @@ boolean PlaceBomb(struct PlayerInfo *player) IS_ACTIVE_BOMB(element) || element == EL_EXPLOSION) return FALSE; +#if 0 + if (element != EL_EMPTY) + return FALSE; +#endif + if (element != EL_EMPTY) { #if 0 @@ -6766,17 +7495,26 @@ void RaiseScoreElement(int element) case EL_EMERALD_YELLOW: case EL_EMERALD_RED: case EL_EMERALD_PURPLE: + case EL_SP_INFOTRON: RaiseScore(level.score[SC_EMERALD]); break; case EL_DIAMOND: RaiseScore(level.score[SC_DIAMOND]); break; + case EL_CRYSTAL: + RaiseScore(level.score[SC_CRYSTAL]); + break; + case EL_PEARL: + RaiseScore(level.score[SC_PEARL]); + break; case EL_BUG: case EL_BD_BUTTERFLY: + case EL_SP_ELECTRON: RaiseScore(level.score[SC_BUG]); break; case EL_SPACESHIP: case EL_BD_FIREFLY: + case EL_SP_SNIKSNAK: RaiseScore(level.score[SC_SPACESHIP]); break; case EL_YAMYAM: @@ -6793,8 +7531,18 @@ void RaiseScoreElement(int element) RaiseScore(level.score[SC_NUT]); break; case EL_DYNAMITE: + case EL_DYNABOMB_INCREASE_NUMBER: + case EL_DYNABOMB_INCREASE_SIZE: + case EL_DYNABOMB_INCREASE_POWER: RaiseScore(level.score[SC_DYNAMITE]); break; + case EL_SHIELD_NORMAL: + case EL_SHIELD_DEADLY: + RaiseScore(level.score[SC_SHIELD]); + break; + case EL_EXTRA_TIME: + RaiseScore(level.score[SC_TIME_BONUS]); + break; case EL_KEY_1: case EL_KEY_2: case EL_KEY_3: @@ -6802,6 +7550,7 @@ void RaiseScoreElement(int element) RaiseScore(level.score[SC_KEY]); break; default: + RaiseScore(element_info[element].score); break; } } @@ -6820,7 +7569,7 @@ void RequestQuitGame(boolean ask_if_really_quit) else #endif { - game_status = MAINMENU; + game_status = GAME_MODE_MAIN; DrawMainMenu(); } } @@ -6981,7 +7730,7 @@ static void HandleGameButtons(struct GadgetInfo *gi) { int id = gi->custom_id; - if (game_status != PLAYING) + if (game_status != GAME_MODE_PLAYING) return; switch (id)