X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=d4a70eae1d5daabc145386e0cec4b801566d5084;hb=bc1e7fc2edb32a410dfa7cf098933010d5014761;hp=71aab9a62cb17f5557c41e8933796f4acc6bd28b;hpb=5e616edfe5f101927d2ff3f7a14d2c65897de3cc;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index 71aab9a6..d4a70eae 100644 --- a/src/game.c +++ b/src/game.c @@ -32,12 +32,12 @@ #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 @@ -161,6 +161,11 @@ /* forward declaration for internal use */ +static boolean MovePlayerOneStep(struct PlayerInfo *, int, int, int, int); +static boolean MovePlayer(struct PlayerInfo *, int, int); +static void ScrollPlayer(struct PlayerInfo *, int); +static void ScrollScreen(struct PlayerInfo *, int); + static void InitBeltMovement(void); static void CloseAllOpenTimegates(void); static void CheckGravityMovement(struct PlayerInfo *); @@ -169,6 +174,7 @@ static void KillHeroUnlessProtected(int, int); static void TestIfPlayerTouchesCustomElement(int, int); static void TestIfElementTouchesCustomElement(int, int); +static void ChangeElement(int, int, int); static boolean CheckTriggeredElementSideChange(int, int, int, int, int); static boolean CheckTriggeredElementChange(int, int, int, int); static boolean CheckElementSideChange(int, int, int, int, int, int); @@ -251,6 +257,22 @@ static struct ChangingElementInfo change_delay_list[] = 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, @@ -879,7 +901,7 @@ static void InitGameEngine() for (j=0; j < ei->num_change_pages; j++) { - if (!ei->change_page->can_change) + if (!ei->change_page[j].can_change) continue; if (ei->change_page[j].events & CH_EVENT_BIT(CE_BY_OTHER_ACTION)) @@ -1016,6 +1038,9 @@ void InitGame() player->Frame = 0; player->StepFrame = 0; + player->switch_x = -1; + player->switch_y = -1; + player->use_murphy_graphic = FALSE; player->use_disk_red_graphic = FALSE; @@ -1083,8 +1108,11 @@ 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; + game.envelope_active = FALSE; + for (i=0; i<4; i++) { game.belt_dir[i] = MV_NO_MOVING; @@ -1101,6 +1129,7 @@ void InitGame() Feld[x][y] = level.field[x][y]; MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; Store[x][y] = Store2[x][y] = StorePlayer[x][y] = Back[x][y] = 0; AmoebaNr[x][y] = 0; JustStopped[x][y] = 0; @@ -1666,11 +1695,15 @@ void GameWon() } /* close exit door after last player */ - if (Feld[ExitX][ExitY] == EL_EXIT_OPEN && AllPlayersGone) + if ((Feld[ExitX][ExitY] == EL_EXIT_OPEN || + Feld[ExitX][ExitY] == EL_SP_EXIT_OPEN) && AllPlayersGone) { - Feld[ExitX][ExitY] = EL_EXIT_CLOSING; + int element = Feld[ExitX][ExitY]; - PlaySoundLevelElementAction(ExitX, ExitY, EL_EXIT_OPEN, ACTION_CLOSING); + Feld[ExitX][ExitY] = (element == EL_EXIT_OPEN ? EL_EXIT_CLOSING : + EL_SP_EXIT_CLOSING); + + PlaySoundLevelElementAction(ExitX, ExitY, element, ACTION_CLOSING); } /* Hero disappears */ @@ -1912,6 +1945,7 @@ static void RemoveField(int x, int y) AmoebaNr[x][y] = 0; ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; Pushed[x][y] = FALSE; GfxElement[x][y] = EL_UNDEFINED; @@ -2025,21 +2059,32 @@ void RelocatePlayer(int x, int y, int element) { struct PlayerInfo *player = &stored_player[element - EL_PLAYER_1]; +#if 1 + RemoveField(x, y); /* temporarily remove newly placed player */ + DrawLevelField(x, y); +#endif + if (player->present) { while (player->MovPos) { - ScrollFigure(player, SCROLL_GO_ON); + ScrollPlayer(player, SCROLL_GO_ON); ScrollScreen(NULL, SCROLL_GO_ON); FrameCounter++; - DrawAllPlayers(); + + DrawPlayer(player); + BackToFront(); + Delay(GAME_FRAME_DELAY); } - RemoveField(player->jx, player->jy); - DrawLevelField(player->jx, player->jy); + DrawPlayer(player); /* needed here only to cleanup last field */ + DrawLevelField(player->jx, player->jy); /* remove player graphic */ + + player->is_moving = FALSE; } + Feld[x][y] = element; InitPlayerField(x, y, element, TRUE); if (player == local_player) @@ -2071,7 +2116,7 @@ void RelocatePlayer(int x, int y, int element) ScrollLevel(dx, dy); DrawAllPlayers(); - /* scroll in to steps of half tile size to make things smoother */ + /* scroll in two steps of half tile size to make things smoother */ BlitBitmap(drawto_field, window, fx, fy, SXSIZE, SYSIZE, SX, SY); FlushDisplay(); Delay(GAME_FRAME_DELAY); @@ -2321,10 +2366,10 @@ void Explode(int ex, int ey, int phase, int mode) if (GfxElement[x][y] == EL_UNDEFINED) { - printf("\n\n\n"); + 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\n"); + printf("\n\n"); GfxElement[x][y] = EL_EMPTY; } @@ -2369,7 +2414,10 @@ void Explode(int ex, int ey, int phase, int mode) element = Feld[x][y] = Back[x][y]; Back[x][y] = 0; - MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = ChangeDelay[x][y] = 0; + MovDir[x][y] = MovPos[x][y] = MovDelay[x][y] = 0; + ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; + InitField(x, y, FALSE); if (CAN_MOVE(element)) InitMovDir(x, y); @@ -2377,7 +2425,7 @@ void Explode(int ex, int ey, int phase, int mode) TestIfElementTouchesCustomElement(x, y); - if (CAN_BE_CRUMBLED(element)) + if (GFX_CRUMBLED(element)) DrawLevelFieldCrumbledSandNeighbours(x, y); if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present) @@ -2477,7 +2525,11 @@ void Bang(int x, int y) int element = Feld[x][y]; #endif +#if 1 + if (IS_PLAYER(x, y) && !PLAYER_PROTECTED(x, y)) +#else if (IS_PLAYER(x, y)) +#endif { struct PlayerInfo *player = PLAYERINFO(x, y); @@ -3089,6 +3141,11 @@ void Impact(int x, int y) else { CheckElementChange(x, y + 1, smashed, CE_SMASHED); + + CheckTriggeredElementSideChange(x, y + 1, smashed, CH_SIDE_TOP, + CE_OTHER_IS_SWITCHING); + CheckElementSideChange(x, y + 1, smashed, CH_SIDE_TOP, + CE_SWITCHED, -1); } } else @@ -3647,6 +3704,13 @@ void TurnRound(int x, int y) MovDir[x][y] = old_move_dir; } } + else if (element_info[element].move_pattern == MV_WHEN_PUSHED) + { + if (!IN_LEV_FIELD_AND_IS_FREE(move_x, move_y)) + MovDir[x][y] = MV_NO_MOVING; + + MovDelay[x][y] = 0; + } } static boolean JustBeingPushed(int x, int y) @@ -3828,6 +3892,15 @@ void StartMoving(int x, int y) #endif } #if 1 + +#if 0 + /* TEST: bug where player gets not killed by falling rock ... */ + else if (CAN_SMASH(element) && + (Feld[x][y + 1] == EL_BLOCKED || + IS_PLAYER(x, y + 1)) && + JustStopped[x][y] && !Pushed[x][y + 1]) + +#else #if 1 else if (game.engine_version < RELEASE_IDENT(2,2,0,7) && CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED && @@ -3836,6 +3909,8 @@ void StartMoving(int x, int y) else if (CAN_SMASH(element) && Feld[x][y + 1] == EL_BLOCKED && JustStopped[x][y]) #endif +#endif + { /* calling "Impact()" here is not only completely unneccessary (because it already gets called from "ContinueMoving()" in @@ -3946,11 +4021,16 @@ void StartMoving(int x, int y) { int 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 0 #if 0 @@ -4199,6 +4279,11 @@ 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 @@ -4212,6 +4297,7 @@ void StartMoving(int x, int y) Feld[newx1][newy1] = EL_FLAMES; if (IN_LEV_FIELD(newx2, newy2) && Feld[newx2][newy2] == EL_EMPTY) Feld[newx2][newy2] = EL_FLAMES; + return; } } @@ -4346,158 +4432,172 @@ void ContinueMoving(int x, int y) if (pushed) /* special case: moving object pushed by player */ MovPos[x][y] = SIGN(MovPos[x][y]) * (TILEX - ABS(PLAYERINFO(x,y)->MovPos)); - if (ABS(MovPos[x][y]) >= TILEX) /* object reached its destination */ + if (ABS(MovPos[x][y]) < TILEX) { - Feld[x][y] = EL_EMPTY; - Feld[newx][newy] = element; - MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */ + DrawLevelField(x, y); - if (element == EL_MOLE) - { - Feld[x][y] = EL_SAND; + return; /* element is still moving */ + } - DrawLevelFieldCrumbledSandNeighbours(x, y); - } - else if (element == EL_QUICKSAND_FILLING) - { - element = Feld[newx][newy] = get_next_element(element); - Store[newx][newy] = Store[x][y]; - } - else if (element == EL_QUICKSAND_EMPTYING) - { - Feld[x][y] = get_next_element(element); - element = Feld[newx][newy] = Store[x][y]; - } - else if (element == EL_MAGIC_WALL_FILLING) - { - element = Feld[newx][newy] = get_next_element(element); - if (!game.magic_wall_active) - element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD; - Store[newx][newy] = Store[x][y]; - } - else if (element == EL_MAGIC_WALL_EMPTYING) - { - Feld[x][y] = get_next_element(element); - if (!game.magic_wall_active) - Feld[x][y] = EL_MAGIC_WALL_DEAD; - element = Feld[newx][newy] = Store[x][y]; - } - else if (element == EL_BD_MAGIC_WALL_FILLING) - { - element = Feld[newx][newy] = get_next_element(element); - if (!game.magic_wall_active) - element = Feld[newx][newy] = EL_BD_MAGIC_WALL_DEAD; - Store[newx][newy] = Store[x][y]; - } - else if (element == EL_BD_MAGIC_WALL_EMPTYING) - { - Feld[x][y] = get_next_element(element); - if (!game.magic_wall_active) - Feld[x][y] = EL_BD_MAGIC_WALL_DEAD; - element = Feld[newx][newy] = Store[x][y]; - } - else if (element == EL_AMOEBA_DROPPING) - { - Feld[x][y] = get_next_element(element); - element = Feld[newx][newy] = Store[x][y]; - } - else if (element == EL_SOKOBAN_OBJECT) - { - if (Back[x][y]) - Feld[x][y] = Back[x][y]; + /* element reached destination field */ - if (Back[newx][newy]) - Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL; + Feld[x][y] = EL_EMPTY; + Feld[newx][newy] = element; + MovPos[x][y] = 0; /* force "not moving" for "crumbled sand" */ - Back[x][y] = Back[newx][newy] = 0; - } - else if (Store[x][y] == EL_ACID) - { - element = Feld[newx][newy] = EL_ACID; - } + if (element == EL_MOLE) + { + Feld[x][y] = EL_SAND; - Store[x][y] = 0; - MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; - MovDelay[newx][newy] = 0; + DrawLevelFieldCrumbledSandNeighbours(x, y); + } + else if (element == EL_QUICKSAND_FILLING) + { + element = Feld[newx][newy] = get_next_element(element); + Store[newx][newy] = Store[x][y]; + } + else if (element == EL_QUICKSAND_EMPTYING) + { + Feld[x][y] = get_next_element(element); + element = Feld[newx][newy] = Store[x][y]; + } + else if (element == EL_MAGIC_WALL_FILLING) + { + element = Feld[newx][newy] = get_next_element(element); + if (!game.magic_wall_active) + element = Feld[newx][newy] = EL_MAGIC_WALL_DEAD; + Store[newx][newy] = Store[x][y]; + } + else if (element == EL_MAGIC_WALL_EMPTYING) + { + Feld[x][y] = get_next_element(element); + if (!game.magic_wall_active) + Feld[x][y] = EL_MAGIC_WALL_DEAD; + element = Feld[newx][newy] = Store[x][y]; + } + else if (element == EL_BD_MAGIC_WALL_FILLING) + { + element = Feld[newx][newy] = get_next_element(element); + if (!game.magic_wall_active) + element = Feld[newx][newy] = EL_BD_MAGIC_WALL_DEAD; + Store[newx][newy] = Store[x][y]; + } + else if (element == EL_BD_MAGIC_WALL_EMPTYING) + { + Feld[x][y] = get_next_element(element); + if (!game.magic_wall_active) + Feld[x][y] = EL_BD_MAGIC_WALL_DEAD; + element = Feld[newx][newy] = Store[x][y]; + } + else if (element == EL_AMOEBA_DROPPING) + { + Feld[x][y] = get_next_element(element); + element = Feld[newx][newy] = Store[x][y]; + } + else if (element == EL_SOKOBAN_OBJECT) + { + if (Back[x][y]) + Feld[x][y] = Back[x][y]; - /* copy element change control values to new field */ - ChangeDelay[newx][newy] = ChangeDelay[x][y]; -#if 1 - Changed[newx][newy] = Changed[x][y]; - ChangeEvent[newx][newy] = ChangeEvent[x][y]; + if (Back[newx][newy]) + Feld[newx][newy] = EL_SOKOBAN_FIELD_FULL; - ChangeDelay[x][y] = 0; - Changed[x][y] = CE_BITMASK_DEFAULT; - ChangeEvent[x][y] = CE_BITMASK_DEFAULT; -#endif + Back[x][y] = Back[newx][newy] = 0; + } + else if (Store[x][y] == EL_ACID) + { + element = Feld[newx][newy] = EL_ACID; + } - /* 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 */ + Store[x][y] = 0; + MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; + MovDelay[newx][newy] = 0; - Pushed[x][y] = Pushed[newx][newy] = FALSE; + /* 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]; - ResetGfxAnimation(x, y); /* reset animation values for old field */ + ChangeDelay[x][y] = 0; + ChangePage[x][y] = -1; + Changed[x][y] = CE_BITMASK_DEFAULT; + ChangeEvent[x][y] = CE_BITMASK_DEFAULT; + + /* copy animation control values to new field */ + GfxFrame[newx][newy] = GfxFrame[x][y]; + GfxAction[newx][newy] = GfxAction[x][y]; /* keep action one frame */ + GfxRandom[newx][newy] = GfxRandom[x][y]; /* keep same random value */ + + Pushed[x][y] = Pushed[newx][newy] = FALSE; + + ResetGfxAnimation(x, y); /* reset animation values for old field */ #if 0 - /* 2.1.1 (does not work correctly for spring) */ - if (!CAN_MOVE(element)) - MovDir[newx][newy] = 0; + /* 2.1.1 (does not work correctly for spring) */ + if (!CAN_MOVE(element)) + MovDir[newx][newy] = 0; #else #if 0 - /* (does not work for falling objects that slide horizontally) */ - if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN) - MovDir[newx][newy] = 0; + /* (does not work for falling objects that slide horizontally) */ + if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN) + MovDir[newx][newy] = 0; #else - /* - if (!CAN_MOVE(element) || - (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN)) - MovDir[newx][newy] = 0; - */ + /* + if (!CAN_MOVE(element) || + (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN)) + MovDir[newx][newy] = 0; + */ - if (!CAN_MOVE(element) || - (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)) - MovDir[newx][newy] = 0; + if (!CAN_MOVE(element) || + (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN)) + MovDir[newx][newy] = 0; #endif #endif - DrawLevelField(x, y); - DrawLevelField(newx, newy); + DrawLevelField(x, y); + DrawLevelField(newx, newy); - Stop[newx][newy] = TRUE; /* ignore this element until the next frame */ + Stop[newx][newy] = TRUE; /* ignore this element until the next frame */ - if (!pushed) /* special case: moving object pushed by player */ - JustStopped[newx][newy] = 3; + /* prevent pushed element from moving on in pushed direction */ + if (pushed && CAN_MOVE(element) && + element_info[element].move_pattern & MV_ANY_DIRECTION && + !(element_info[element].move_pattern & MovDir[newx][newy])) + TurnRound(newx, newy); - 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 (!pushed) /* special case: moving object pushed by player */ + JustStopped[newx][newy] = 3; - if (CAN_FALL(element) && direction == MV_DOWN && - (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) - Impact(x, newy); + 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 (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) - CheckElementChange(newx, newy, element, CE_COLLISION); + if (CAN_FALL(element) && direction == MV_DOWN && + (newy == lev_fieldy - 1 || !IS_FREE(x, newy + 1))) + Impact(x, newy); #if 1 - TestIfElementTouchesCustomElement(x, y); /* for empty space */ + TestIfElementTouchesCustomElement(x, y); /* for empty space */ #endif - TestIfPlayerTouchesCustomElement(newx, newy); - TestIfElementTouchesCustomElement(newx, newy); - } - else /* still moving on */ - { - DrawLevelField(x, y); - } +#if 0 + if (ChangePage[newx][newy] != -1) /* delayed change */ + ChangeElement(newx, newy, ChangePage[newx][newy]); +#endif + + if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) + CheckElementSideChange(newx, newy, Feld[newx][newy], direction, + CE_COLLISION, -1); + + TestIfPlayerTouchesCustomElement(newx, newy); + TestIfElementTouchesCustomElement(newx, newy); } int AmoebeNachbarNr(int ax, int ay) @@ -5053,7 +5153,10 @@ 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); } @@ -5415,7 +5518,7 @@ static void ChangeElementNowExt(int x, int y, int target_element) DrawLevelField(x, y); - if (CAN_BE_CRUMBLED(Feld[x][y])) + if (GFX_CRUMBLED(Feld[x][y])) DrawLevelFieldCrumbledSandNeighbours(x, y); TestIfBadThingTouchesHero(x, y); @@ -5522,6 +5625,8 @@ static boolean ChangeElementNow(int x, int y, int element, int page) if (IS_MOVING(ex, ey) || IS_BLOCKED(ex, ey)) RemoveMovingField(ex, ey); + ChangeEvent[ex][ey] = ChangeEvent[x][y]; + ChangeElementNowExt(ex, ey, change->content[xx][yy]); something_has_changed = TRUE; @@ -5549,16 +5654,20 @@ static boolean ChangeElementNow(int x, int y, int element, int page) static void ChangeElement(int x, int y, int page) { int element = MovingOrBlocked2Element(x, y); - struct ElementChangeInfo *change = &element_info[element].change_page[page]; + struct ElementInfo *ei = &element_info[element]; + struct ElementChangeInfo *change = &ei->change_page[page]; +#if 0 #ifdef DEBUG if (!CAN_CHANGE(element)) { - printf("\n\n\n"); - printf("ChangeElement(): element = %d\n", element); - printf("Explode(): This should never happen!\n"); - printf("\n\n\n"); + 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 #endif if (ChangeDelay[x][y] == 0) /* initialize element change */ @@ -5587,9 +5696,16 @@ static void ChangeElement(int x, int y, int page) } else /* finish element change */ { + if (ChangePage[x][y] != -1) /* remember page from delayed change */ + { + page = ChangePage[x][y]; + ChangePage[x][y] = -1; + } + if (IS_MOVING(x, y)) /* never change a running system ;-) */ { ChangeDelay[x][y] = 1; /* try change after next move step */ + ChangePage[x][y] = page; /* remember page to use for change */ return; } @@ -5617,17 +5733,17 @@ static boolean CheckTriggeredElementSideChange(int lx, int ly, int element = EL_CUSTOM_START + i; boolean change_element = FALSE; - int page; + int page = 0; - if (!CAN_CHANGE(element) || - !HAS_ANY_CHANGE_EVENT(element, trigger_event)) + if (!CAN_CHANGE(element) || !HAS_ANY_CHANGE_EVENT(element, trigger_event)) continue; for (j=0; j < element_info[element].num_change_pages; j++) { struct ElementChangeInfo *change = &element_info[element].change_page[j]; - if (change->sides & trigger_side && + if (change->can_change && + change->sides & trigger_side && change->trigger_element == trigger_element) { change_element = TRUE; @@ -5725,7 +5841,7 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action) if (button2) dropped = DropElement(player); - moved = MoveFigure(player, dx, dy); + moved = MovePlayer(player, dx, dy); } if (tape.single_step && tape.recording && !tape.pausing) @@ -5842,7 +5958,7 @@ void GameActions() actual_player_action = recorded_player_action[i]; PlayerActions(&stored_player[i], actual_player_action); - ScrollFigure(&stored_player[i], SCROLL_GO_ON); + ScrollPlayer(&stored_player[i], SCROLL_GO_ON); } network_player_action_received = FALSE; @@ -5886,6 +6002,16 @@ void GameActions() Changed[x][y] = CE_BITMASK_DEFAULT; ChangeEvent[x][y] = CE_BITMASK_DEFAULT; +#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 (JustStopped[x][y] > 0) JustStopped[x][y]--; @@ -5962,7 +6088,13 @@ void GameActions() /* this may take place after moving, so 'element' may have changed */ if (IS_CHANGING(x, y)) { +#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], MovDir[x][y]); } @@ -6213,7 +6345,7 @@ void GameActions() } } - if (TimeFrames >= (1000 / GameFrameDelay)) + if (TimeFrames >= FRAMES_PER_SECOND) { TimeFrames = 0; TimePlayed++; @@ -6380,7 +6512,7 @@ void ScrollLevel(int dx, int dy) static void CheckGravityMovement(struct PlayerInfo *player) { - if (level.gravity && !player->programmed_action) + if (game.gravity && !player->programmed_action) { int move_dir_vertical = player->action & (MV_UP | MV_DOWN); int move_dir_horizontal = player->action & (MV_LEFT | MV_RIGHT); @@ -6408,15 +6540,16 @@ static void CheckGravityMovement(struct PlayerInfo *player) } /* - MoveFigureOneStep() + MovePlayerOneStep() ----------------------------------------------------------------------------- dx, dy: direction (non-diagonal) to try to move the player to real_dx, real_dy: direction as read from input device (can be diagonal) */ -boolean MoveFigureOneStep(struct PlayerInfo *player, +boolean MovePlayerOneStep(struct PlayerInfo *player, int dx, int dy, int real_dx, int real_dy) { +#if 0 static int change_sides[4][2] = { /* enter side leave side */ @@ -6431,6 +6564,7 @@ boolean MoveFigureOneStep(struct PlayerInfo *player, dy == +1 ? MV_DOWN : MV_NO_MOVING); int enter_side = change_sides[MV_DIR_BIT(move_direction)][0]; int leave_side = change_sides[MV_DIR_BIT(move_direction)][1]; +#endif int jx = player->jx, jy = player->jy; int new_jx = jx + dx, new_jy = jy + dy; int element; @@ -6491,9 +6625,9 @@ boolean MoveFigureOneStep(struct PlayerInfo *player, player->MovPos = (dx > 0 || dy > 0 ? -1 : 1) * (TILEX - TILEX / player->move_delay_value); - ScrollFigure(player, SCROLL_INIT); + ScrollPlayer(player, SCROLL_INIT); -#if 1 +#if 0 if (IS_CUSTOM_ELEMENT(Feld[jx][jy])) { CheckTriggeredElementSideChange(jx, jy, Feld[jx][jy], leave_side, @@ -6514,7 +6648,7 @@ boolean MoveFigureOneStep(struct PlayerInfo *player, return MF_MOVING; } -boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) +boolean MovePlayer(struct PlayerInfo *player, int dx, int dy) { int jx = player->jx, jy = player->jy; int old_jx = jx, old_jy = jy; @@ -6553,7 +6687,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) while (player->MovPos) { - ScrollFigure(player, SCROLL_GO_ON); + ScrollPlayer(player, SCROLL_GO_ON); ScrollScreen(NULL, SCROLL_GO_ON); FrameCounter++; DrawAllPlayers(); @@ -6565,13 +6699,13 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) if (player->last_move_dir & (MV_LEFT | MV_RIGHT)) { - if (!(moved |= MoveFigureOneStep(player, 0, dy, dx, dy))) - moved |= MoveFigureOneStep(player, dx, 0, dx, dy); + if (!(moved |= MovePlayerOneStep(player, 0, dy, dx, dy))) + moved |= MovePlayerOneStep(player, dx, 0, dx, dy); } else { - if (!(moved |= MoveFigureOneStep(player, dx, 0, dx, dy))) - moved |= MoveFigureOneStep(player, 0, dy, dx, dy); + if (!(moved |= MovePlayerOneStep(player, dx, 0, dx, dy))) + moved |= MovePlayerOneStep(player, 0, dy, dx, dy); } jx = player->jx; @@ -6671,6 +6805,48 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) #if 1 player->snapped = FALSE; #endif + +#if 1 + player->Switching = FALSE; +#endif + + +#if 1 + { + static int change_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 = player->MovDir; + int enter_side = change_sides[MV_DIR_BIT(move_direction)][0]; + int leave_side = change_sides[MV_DIR_BIT(move_direction)][1]; + +#if 1 + if (IS_CUSTOM_ELEMENT(Feld[old_jx][old_jy])) + { + CheckTriggeredElementSideChange(old_jx, old_jy, Feld[old_jx][old_jy], + leave_side, CE_OTHER_GETS_LEFT); + CheckElementSideChange(old_jx, old_jy, Feld[old_jx][old_jy], + leave_side, CE_LEFT_BY_PLAYER, -1); + } + + if (IS_CUSTOM_ELEMENT(Feld[jx][jy])) + { + CheckTriggeredElementSideChange(jx, jy, Feld[jx][jy], + enter_side, CE_OTHER_GETS_ENTERED); + CheckElementSideChange(jx, jy, Feld[jx][jy], + enter_side, CE_ENTERED_BY_PLAYER, -1); + } +#endif + + } +#endif + + } else { @@ -6682,8 +6858,11 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) player->is_moving = FALSE; } - TestIfHeroTouchesBadThing(jx, jy); - TestIfPlayerTouchesCustomElement(jx, jy); + if (game.engine_version < VERSION_IDENT(3,0,7)) + { + TestIfHeroTouchesBadThing(jx, jy); + TestIfPlayerTouchesCustomElement(jx, jy); + } if (!player->active) RemoveHero(player); @@ -6691,7 +6870,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) return moved; } -void ScrollFigure(struct PlayerInfo *player, int mode) +void ScrollPlayer(struct PlayerInfo *player, int mode) { int jx = player->jx, jy = player->jy; int last_jx = player->last_jx, last_jy = player->last_jy; @@ -6745,16 +6924,26 @@ void ScrollFigure(struct PlayerInfo *player, int mode) player->last_jy = jy; if (Feld[jx][jy] == EL_EXIT_OPEN || - Feld[jx][jy] == EL_SP_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 || - Feld[jx][jy] == EL_SP_EXIT_OPEN) + IS_SP_ELEMENT(Feld[jx][jy])) player->LevelSolved = player->GameOver = TRUE; } + if (game.engine_version >= VERSION_IDENT(3,0,7)) + { + TestIfHeroTouchesBadThing(jx, jy); + TestIfPlayerTouchesCustomElement(jx, jy); + + if (!player->active) + RemoveHero(player); + } + if (tape.single_step && tape.recording && !tape.pausing && !player->programmed_action) TapeTogglePause(TAPE_TOGGLE_AUTOMATIC); @@ -6791,9 +6980,6 @@ void ScrollScreen(struct PlayerInfo *player, int mode) void TestIfPlayerTouchesCustomElement(int x, int y) { -#if 0 - static boolean check_changing = FALSE; -#endif static int xy[4][2] = { { 0, -1 }, @@ -6801,47 +6987,73 @@ void TestIfPlayerTouchesCustomElement(int x, int y) { +1, 0 }, { 0, +1 } }; + static int change_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; -#if 0 - if (check_changing) /* prevent this function from running into a loop */ - return; - - check_changing = TRUE; -#endif - for (i=0; i<4; i++) { int xx = x + xy[i][0]; int yy = y + xy[i][1]; + int center_side = change_sides[i][0]; + int border_side = change_sides[i][1]; + int border_element; if (!IN_LEV_FIELD(xx, yy)) continue; if (IS_PLAYER(x, y)) { - CheckTriggeredElementChange(xx, yy, Feld[xx][yy], CE_OTHER_GETS_TOUCHED); - CheckElementChange(xx, yy, Feld[xx][yy], CE_TOUCHED_BY_PLAYER); + if (game.engine_version < VERSION_IDENT(3,0,7)) + border_element = Feld[xx][yy]; /* may be moving! */ + else if (!IS_MOVING(xx, yy) && !IS_BLOCKED(xx, yy)) + border_element = Feld[xx][yy]; + else if (MovDir[xx][yy] & touch_dir[i]) /* elements are touching */ + border_element = MovingOrBlocked2Element(xx, yy); + else + continue; /* center and border element do not touch */ + + CheckTriggeredElementSideChange(xx, yy, border_element, border_side, + CE_OTHER_GETS_TOUCHED); + CheckElementSideChange(xx, yy, border_element, border_side, + CE_TOUCHED_BY_PLAYER, -1); } else if (IS_PLAYER(xx, yy)) { - CheckTriggeredElementChange(x, y, Feld[x][y], CE_OTHER_GETS_TOUCHED); - CheckElementChange(x, y, Feld[x][y], CE_TOUCHED_BY_PLAYER); + if (game.engine_version >= VERSION_IDENT(3,0,7)) + { + struct PlayerInfo *player = PLAYERINFO(xx, yy); + + if (player->MovPos != 0 && !(player->MovDir & touch_dir[i])) + continue; /* center and border element do not touch */ + } + + CheckTriggeredElementSideChange(x, y, center_element, center_side, + CE_OTHER_GETS_TOUCHED); + CheckElementSideChange(x, y, center_element, center_side, + CE_TOUCHED_BY_PLAYER, -1); break; } } - -#if 0 - check_changing = FALSE; -#endif } void TestIfElementTouchesCustomElement(int x, int y) { -#if 0 - static boolean check_changing = FALSE; -#endif static int xy[4][2] = { { 0, -1 }, @@ -6857,18 +7069,18 @@ void TestIfElementTouchesCustomElement(int x, int y) { 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 + }; boolean change_center_element = FALSE; int center_element_change_page = 0; - int center_element = Feld[x][y]; + int center_element = Feld[x][y]; /* should always be non-moving! */ int i, j; -#if 0 - if (check_changing) /* prevent this function from running into a loop */ - return; - - check_changing = TRUE; -#endif - for (i=0; i<4; i++) { int xx = x + xy[i][0]; @@ -6880,7 +7092,14 @@ void TestIfElementTouchesCustomElement(int x, int y) if (!IN_LEV_FIELD(xx, yy)) continue; - border_element = Feld[xx][yy]; + if (game.engine_version < VERSION_IDENT(3,0,7)) + 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 */ /* check for change of center element (but change it only once) */ if (IS_CUSTOM_ELEMENT(center_element) && @@ -6892,7 +7111,8 @@ void TestIfElementTouchesCustomElement(int x, int y) struct ElementChangeInfo *change = &element_info[center_element].change_page[j]; - if (change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && change->sides & border_side && change->trigger_element == border_element) { @@ -6913,7 +7133,8 @@ void TestIfElementTouchesCustomElement(int x, int y) struct ElementChangeInfo *change = &element_info[border_element].change_page[j]; - if (change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && + if (change->can_change && + change->events & CH_EVENT_BIT(CE_OTHER_IS_TOUCHING) && change->sides & center_side && change->trigger_element == center_element) { @@ -6928,10 +7149,6 @@ void TestIfElementTouchesCustomElement(int x, int y) if (change_center_element) CheckElementSideChange(x, y, center_element, CH_SIDE_ANY, CE_OTHER_IS_TOUCHING, center_element_change_page); - -#if 0 - check_changing = FALSE; -#endif } void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) @@ -7009,6 +7226,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, @@ -7048,6 +7272,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)) + { + 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; @@ -7067,24 +7297,6 @@ 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 (player->shield_deadly_time_left > 0) Bang(bad_x, bad_y); else if (!PLAYER_PROTECTED(kill_x, kill_y)) @@ -7263,16 +7475,13 @@ static boolean checkDiagonalPushing(struct PlayerInfo *player, int DigField(struct PlayerInfo *player, int x, int y, int real_dx, int real_dy, int mode) { -#if 0 - static int change_sides[4][2] = + static int change_sides[4] = { - /* 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 */ + CH_SIDE_RIGHT, /* moving left */ + CH_SIDE_LEFT, /* moving right */ + CH_SIDE_BOTTOM, /* moving up */ + CH_SIDE_TOP, /* moving down */ }; -#endif boolean use_spring_bug = (game.engine_version < VERSION_IDENT(2,2,0)); int jx = player->jx, jy = player->jy; int dx = x - jx, dy = y - jy; @@ -7281,10 +7490,7 @@ int DigField(struct PlayerInfo *player, dx == +1 ? MV_RIGHT : dy == -1 ? MV_UP : dy == +1 ? MV_DOWN : MV_NO_MOVING); -#if 0 - int enter_side = change_sides[MV_DIR_BIT(move_direction)][0]; - int leave_side = change_sides[MV_DIR_BIT(move_direction)][1]; -#endif + int dig_side = change_sides[MV_DIR_BIT(move_direction)]; int element; if (player->MovPos == 0) @@ -7351,6 +7557,7 @@ int DigField(struct PlayerInfo *player, switch (element) { +#if 0 case EL_ROBOT_WHEEL: Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE; ZX = x; @@ -7359,7 +7566,9 @@ int DigField(struct PlayerInfo *player, PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING); return MF_ACTION; break; +#endif +#if 0 case EL_SP_TERMINAL: { int xx, yy; @@ -7380,7 +7589,9 @@ int DigField(struct PlayerInfo *player, return MF_ACTION; } break; +#endif +#if 0 case EL_CONVEYOR_BELT_1_SWITCH_LEFT: case EL_CONVEYOR_BELT_1_SWITCH_MIDDLE: case EL_CONVEYOR_BELT_1_SWITCH_RIGHT: @@ -7393,31 +7604,56 @@ int DigField(struct PlayerInfo *player, case EL_CONVEYOR_BELT_4_SWITCH_LEFT: case EL_CONVEYOR_BELT_4_SWITCH_MIDDLE: case EL_CONVEYOR_BELT_4_SWITCH_RIGHT: +#if 1 + if (!PLAYER_SWITCHING(player, x, y)) +#else if (!player->Switching) +#endif { player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + ToggleBeltSwitch(x, y); PlaySoundLevel(x, y, SND_CLASS_CONVEYOR_BELT_SWITCH_ACTIVATING); } return MF_ACTION; break; +#endif +#if 0 case EL_SWITCHGATE_SWITCH_UP: case EL_SWITCHGATE_SWITCH_DOWN: +#if 1 + if (!PLAYER_SWITCHING(player, x, y)) +#else if (!player->Switching) +#endif { player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + ToggleSwitchgateSwitch(x, y); PlaySoundLevel(x, y, SND_CLASS_SWITCHGATE_SWITCH_ACTIVATING); } return MF_ACTION; break; +#endif +#if 0 case EL_LIGHT_SWITCH: case EL_LIGHT_SWITCH_ACTIVE: +#if 1 + if (!PLAYER_SWITCHING(player, x, y)) +#else if (!player->Switching) +#endif { player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + ToggleLightSwitch(x, y); PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ? SND_LIGHT_SWITCH_ACTIVATING : @@ -7425,14 +7661,18 @@ int DigField(struct PlayerInfo *player, } return MF_ACTION; break; +#endif +#if 0 case EL_TIMEGATE_SWITCH: ActivateTimegateSwitch(x, y); PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVATING); return MF_ACTION; break; +#endif +#if 0 case EL_BALLOON_SWITCH_LEFT: case EL_BALLOON_SWITCH_RIGHT: case EL_BALLOON_SWITCH_UP: @@ -7450,6 +7690,7 @@ int DigField(struct PlayerInfo *player, return MF_ACTION; break; +#endif case EL_SP_PORT_LEFT: case EL_SP_PORT_RIGHT: @@ -7490,7 +7731,7 @@ int DigField(struct PlayerInfo *player, element == EL_SP_GRAVITY_PORT_RIGHT || element == EL_SP_GRAVITY_PORT_UP || element == EL_SP_GRAVITY_PORT_DOWN) - level.gravity = !level.gravity; + game.gravity = !game.gravity; /* automatically move to the next field with double speed */ player->programmed_action = move_direction; @@ -7542,6 +7783,7 @@ int DigField(struct PlayerInfo *player, } break; +#if 0 case EL_LAMP: Feld[x][y] = EL_LAMP_ACTIVE; local_player->lights_still_needed--; @@ -7549,7 +7791,9 @@ int DigField(struct PlayerInfo *player, PlaySoundLevel(x, y, SND_LAMP_ACTIVATING); return MF_ACTION; break; +#endif +#if 0 case EL_TIME_ORB_FULL: Feld[x][y] = EL_TIME_ORB_EMPTY; TimeLeft += 10; @@ -7558,6 +7802,7 @@ int DigField(struct PlayerInfo *player, PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MIDDLE); return MF_ACTION; break; +#endif default: @@ -7575,7 +7820,9 @@ int DigField(struct PlayerInfo *player, if (!player->key[element - EL_GATE_1_GRAY]) return MF_NO_ACTION; } - else if (element == EL_EXIT_OPEN || element == EL_SP_EXIT_OPEN) + else if (element == EL_EXIT_OPEN || + element == EL_SP_EXIT_OPEN || + element == EL_SP_EXIT_OPENING) { sound_action = ACTION_PASSING; /* player is passing exit */ } @@ -7597,6 +7844,11 @@ int DigField(struct PlayerInfo *player, if (!IN_LEV_FIELD(nextx, nexty) || !IS_FREE(nextx, nexty)) return MF_NO_ACTION; +#if 1 + if (CAN_MOVE(element)) /* only fixed elements can be passed! */ + return MF_NO_ACTION; +#endif + if (element >= EL_EM_GATE_1 && element <= EL_EM_GATE_4) { if (!player->key[element - EL_EM_GATE_1]) @@ -7626,7 +7878,7 @@ int DigField(struct PlayerInfo *player, GfxElement[x][y] = GFX_ELEMENT(element); #else GfxElement[x][y] = - (CAN_BE_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element)); + (GFX_CRUMBLED(element) ? EL_SAND : GFX_ELEMENT(element)); #endif player->is_digging = TRUE; } @@ -7748,9 +8000,15 @@ int DigField(struct PlayerInfo *player, !(element == EL_SPRING && use_spring_bug)) return MF_NO_ACTION; +#if 1 + /* 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 if (element == EL_SPRING && MovDir[x][y] != MV_NO_MOVING) return MF_NO_ACTION; - +#endif if (!player->Pushing && game.engine_version >= RELEASE_IDENT(2,2,0,7)) player->push_delay_value = GET_NEW_PUSH_DELAY(element); @@ -7823,15 +8081,187 @@ int DigField(struct PlayerInfo *player, if (game.engine_version < RELEASE_IDENT(2,2,0,7)) player->push_delay_value = GET_NEW_PUSH_DELAY(element); +#if 1 + CheckTriggeredElementSideChange(x, y, element, dig_side, + CE_OTHER_GETS_PUSHED); + CheckElementSideChange(x, y, element, dig_side, + CE_PUSHED_BY_PLAYER, -1); +#else CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_PUSHED); CheckElementChange(x, y, element, CE_PUSHED_BY_PLAYER); +#endif break; } + else if (IS_SWITCHABLE(element)) + { + if (PLAYER_SWITCHING(player, x, y)) + return MF_ACTION; + +#if 1 + PlaySoundLevelElementAction(x, y, element, ACTION_ACTIVATING); +#endif + + if (element == EL_ROBOT_WHEEL) + { + Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE; + ZX = x; + ZY = y; + + DrawLevelField(x, y); + +#if 0 + PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING); +#endif + } + else if (element == EL_SP_TERMINAL) + { + int xx, yy; + +#if 0 + PlaySoundLevel(x, y, SND_SP_TERMINAL_ACTIVATING); +#endif + + for (yy=0; yySwitching = TRUE; + player->switch_x = x; + player->switch_y = y; + + ToggleBeltSwitch(x, y); + +#if 0 + PlaySoundLevel(x, y, SND_CLASS_CONVEYOR_BELT_SWITCH_ACTIVATING); +#endif + } + } + else if (element == EL_SWITCHGATE_SWITCH_UP || + element == EL_SWITCHGATE_SWITCH_DOWN) + { +#if 0 + if (!PLAYER_SWITCHING(player, x, y)) +#endif + { + player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + + ToggleSwitchgateSwitch(x, y); + +#if 0 + PlaySoundLevel(x, y, SND_CLASS_SWITCHGATE_SWITCH_ACTIVATING); +#endif + } + } + else if (element == EL_LIGHT_SWITCH || + element == EL_LIGHT_SWITCH_ACTIVE) + { +#if 0 + if (!PLAYER_SWITCHING(player, x, y)) +#endif + { + player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + + ToggleLightSwitch(x, y); + +#if 0 + PlaySoundLevel(x, y, element == EL_LIGHT_SWITCH ? + SND_LIGHT_SWITCH_ACTIVATING : + SND_LIGHT_SWITCH_DEACTIVATING); +#endif + } + } + else if (element == EL_TIMEGATE_SWITCH) + { + ActivateTimegateSwitch(x, y); + +#if 0 + PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVATING); +#endif + } + else if (element == EL_BALLOON_SWITCH_LEFT || + element == EL_BALLOON_SWITCH_RIGHT || + element == EL_BALLOON_SWITCH_UP || + 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); + +#if 0 + PlaySoundLevel(x, y, SND_CLASS_BALLOON_SWITCH_ACTIVATING); +#endif + } + else if (element == EL_LAMP) + { + Feld[x][y] = EL_LAMP_ACTIVE; + local_player->lights_still_needed--; + + DrawLevelField(x, y); + +#if 0 + PlaySoundLevel(x, y, SND_LAMP_ACTIVATING); +#endif + } + else if (element == 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); + +#if 0 + PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MIDDLE); +#endif + } + + return MF_ACTION; + } else { - CheckTriggeredElementChange(x, y, element, CE_OTHER_GETS_PRESSED); - CheckElementChange(x, y, element, CE_PRESSED_BY_PLAYER); +#if 1 + if (!PLAYER_SWITCHING(player, x, y)) +#else + if (!player->Switching) +#endif + { + player->Switching = TRUE; + player->switch_x = x; + player->switch_y = y; + + CheckTriggeredElementSideChange(x, y, element, dig_side, + CE_OTHER_IS_SWITCHING); + CheckElementSideChange(x, y, element, dig_side, CE_SWITCHED, -1); + } + + CheckTriggeredElementSideChange(x, y, element, dig_side, + CE_OTHER_GETS_PRESSED); + CheckElementSideChange(x, y, element, dig_side, + CE_PRESSED_BY_PLAYER, -1); } return MF_NO_ACTION; @@ -7842,24 +8272,6 @@ int DigField(struct PlayerInfo *player, if (Feld[x][y] != element) /* really digged/collected something */ player->is_collecting = !player->is_digging; -#if 0 - if (IS_CUSTOM_ELEMENT(Feld[jx][jy])) - { - CheckTriggeredElementSideChange(jx, jy, Feld[jx][jy], leave_side, - CE_OTHER_GETS_LEFT); - CheckElementSideChange(jx, jy, Feld[jx][jy], leave_side, - CE_LEFT_BY_PLAYER, -1); - } - - if (IS_CUSTOM_ELEMENT(Feld[x][y])) - { - CheckTriggeredElementSideChange(x, y, Feld[x][y], enter_side, - CE_OTHER_GETS_ENTERED); - CheckElementSideChange(x, y, Feld[x][y], enter_side, - CE_ENTERED_BY_PLAYER, -1); - } -#endif - return MF_MOVING; }