X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=b88998efb9b0f61b1f09e178c53fb5e80483d40f;hb=613ba6c5cd3a99bfcfc25c95083b4f00b2dec584;hp=e69b1e6182af1d54529f3bfb883cc2d9d0851816;hpb=667288cc3f60989bfc84ac50bb69dae0c7bb5b22;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index e69b1e61..b88998ef 100644 --- a/src/game.c +++ b/src/game.c @@ -176,6 +176,7 @@ static void InitField(int x, int y, boolean init_game) switch (Feld[x][y]) { case EL_SPIELFIGUR: + case EL_SP_MURPHY: if (init_game) Feld[x][y] = EL_SPIELER1; /* no break! */ @@ -260,6 +261,8 @@ static void InitField(int x, int y, boolean init_game) case EL_MAMPFER2: case EL_ROBOT: case EL_PACMAN: + case EL_SP_SNIKSNAK: + case EL_SP_ELECTRON: InitMovDir(x, y); break; @@ -298,6 +301,10 @@ static void InitField(int x, int y, boolean init_game) MovDir[x][y] = 1 << RND(4); break; + case EL_SP_EMPTY: + Feld[x][y] = EL_LEERRAUM; + break; + default: break; } @@ -648,7 +655,9 @@ void InitMovDir(int x, int y) if (element != EL_KAEFER && element != EL_FLIEGER && element != EL_BUTTERFLY && - element != EL_FIREFLY) + element != EL_FIREFLY && + element != EL_SP_SNIKSNAK && + element != EL_SP_ELECTRON) break; for (i=0; i<4; i++) @@ -663,7 +672,8 @@ void InitMovDir(int x, int y) MovDir[x][y] = direction[0][i]; break; } - else if (element == EL_FLIEGER || element == EL_FIREFLY) + else if (element == EL_FLIEGER || element == EL_FIREFLY || + element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) { MovDir[x][y] = direction[1][i]; break; @@ -1280,7 +1290,8 @@ void Impact(int x, int y) return; } - if (element == EL_BOMBE && (lastline || object_hit)) /* element is bomb */ + if ((element == EL_BOMBE || element == EL_SP_DISK_ORANGE) && + (lastline || object_hit)) /* element is bomb */ { Bang(x, y); return; @@ -1340,8 +1351,9 @@ void Impact(int x, int y) } else if (element == EL_FELSBROCKEN) { - if (IS_ENEMY(smashed) || smashed == EL_BOMBE || smashed == EL_SONDE || - smashed == EL_SCHWEIN || smashed == EL_DRACHE) + if (IS_ENEMY(smashed) || + smashed == EL_BOMBE || smashed == EL_SP_DISK_ORANGE || + smashed == EL_SONDE || smashed == EL_SCHWEIN || smashed == EL_DRACHE) { Bang(x, y+1); return; @@ -1480,7 +1492,8 @@ void TurnRound(int x, int y) else if (element == EL_BUTTERFLY) /* && MovDir[x][y] == left_dir) */ MovDelay[x][y] = 1; } - else if (element == EL_FLIEGER || element == EL_FIREFLY) + else if (element == EL_FLIEGER || element == EL_FIREFLY || + element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) { TestIfBadThingHitsOtherBadThing(x, y); @@ -1491,7 +1504,9 @@ void TurnRound(int x, int y) !IS_FREE_OR_PLAYER(move_x, move_y)) MovDir[x][y] = right_dir; - if (element == EL_FLIEGER && MovDir[x][y] != old_move_dir) + if ((element == EL_FLIEGER || + element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) + && MovDir[x][y] != old_move_dir) MovDelay[x][y] = 9; else if (element == EL_FIREFLY) /* && MovDir[x][y] == right_dir) */ MovDelay[x][y] = 1; @@ -1969,7 +1984,9 @@ void StartMoving(int x, int y) if (element!=EL_MAMPFER && element!=EL_MAMPFER2 && element!=EL_PACMAN) { TurnRound(x, y); - if (MovDelay[x][y] && (element == EL_KAEFER || element == EL_FLIEGER)) + if (MovDelay[x][y] && (element == EL_KAEFER || element == EL_FLIEGER || + element == EL_SP_SNIKSNAK || + element == EL_SP_ELECTRON)) DrawLevelField(x, y); } } @@ -2214,7 +2231,8 @@ void StartMoving(int x, int y) TurnRound(x, y); - if (element == EL_KAEFER || element == EL_FLIEGER) + if (element == EL_KAEFER || element == EL_FLIEGER || + element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON) DrawLevelField(x, y); else if (element == EL_BUTTERFLY || element == EL_FIREFLY) DrawGraphicAnimation(x, y, el2gfx(element), 2, 4, ANIM_NORMAL); @@ -2244,7 +2262,7 @@ void ContinueMoving(int x, int y) int newx = x + dx, newy = y + dy; int step = (horiz_move ? dx : dy) * TILEX/8; - if (CAN_FALL(element) && horiz_move) + if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element)) step*=2; else if (element == EL_TROPFEN) step/=2; @@ -2607,7 +2625,7 @@ void AmoebeAbleger(int ax, int ay) if (newax == ax && neway == ay) /* amoeba cannot grow */ { - if (i == 4 && !waiting_for_player) + if (i == 4 && (!waiting_for_player || game_emulation == EMU_BOULDERDASH)) { Feld[ax][ay] = EL_AMOEBE_TOT; DrawLevelField(ax, ay); @@ -4128,6 +4146,7 @@ int DigField(struct PlayerInfo *player, break; case EL_DYNAMIT_AUS: + case EL_SP_DISK_RED: RemoveField(x, y); player->dynamite++; RaiseScoreElement(EL_DYNAMIT); @@ -4187,10 +4206,35 @@ int DigField(struct PlayerInfo *player, return MF_ACTION; break; + case EL_SP_TERMINAL: + { + int xx, yy; + + for (yy=0; yygems_still_needed > 0) + return MF_NO_ACTION; + + player->LevelSolved = player->GameOver = TRUE; + PlaySoundLevel(x, y, SND_BUING); + break; + case EL_FELSBROCKEN: case EL_BOMBE: case EL_KOKOSNUSS: case EL_ZEIT_LEER: + case EL_SP_ZONK: + case EL_SP_DISK_ORANGE: if (dy || mode == DF_SNAP) return MF_NO_ACTION; @@ -4241,6 +4285,42 @@ int DigField(struct PlayerInfo *player, return MF_NO_ACTION; break; + case EL_SP_PORT1_LEFT: + case EL_SP_PORT2_LEFT: + case EL_SP_PORT1_RIGHT: + case EL_SP_PORT2_RIGHT: + case EL_SP_PORT1_UP: + case EL_SP_PORT2_UP: + case EL_SP_PORT1_DOWN: + case EL_SP_PORT2_DOWN: + case EL_SP_PORT_X: + case EL_SP_PORT_Y: + case EL_SP_PORT_XY: + if ((dx == -1 && + element != EL_SP_PORT1_LEFT && + element != EL_SP_PORT2_LEFT && + element != EL_SP_PORT_X && + element != EL_SP_PORT_XY) || + (dx == +1 && + element != EL_SP_PORT1_RIGHT && + element != EL_SP_PORT2_RIGHT && + element != EL_SP_PORT_X && + element != EL_SP_PORT_XY) || + (dy == -1 && + element != EL_SP_PORT1_UP && + element != EL_SP_PORT2_UP && + element != EL_SP_PORT_Y && + element != EL_SP_PORT_XY) || + (dy == +1 && + element != EL_SP_PORT1_DOWN && + element != EL_SP_PORT2_DOWN && + element != EL_SP_PORT_Y && + element != EL_SP_PORT_XY) || + !IN_LEV_FIELD(x + dx, y + dy) || + !IS_FREE(x + dx, y + dy)) + return MF_NO_ACTION; + break; + case EL_AUSGANG_ZU: case EL_AUSGANG_ACT: /* door is not (yet) open */ @@ -4286,6 +4366,7 @@ int DigField(struct PlayerInfo *player, case EL_SOKOBAN_FELD_VOLL: case EL_SOKOBAN_OBJEKT: case EL_SONDE: + case EL_SP_DISK_YELLOW: if (mode == DF_SNAP) return MF_NO_ACTION;