X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=901a7fcf427d8f7d75c4d9adba0b226a486cc553;hb=38c26472a6e9f0f037ddfe535d3919c00772b26f;hp=095f635e392c97e90af23bdadabd84c3546d3eef;hpb=a2f9307de12b6111ff7076fed2e4140619f1ac5d;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index 095f635e..901a7fcf 100644 --- a/src/game.c +++ b/src/game.c @@ -105,15 +105,18 @@ static void CloseAllOpenTimegates(void); static void CheckGravityMovement(struct PlayerInfo *); static void KillHeroUnlessProtected(int, int); -void PlaySoundLevel(int, int, int); -void PlaySoundLevelAction(int, int, int); -void PlaySoundLevelElementAction(int, int, int, int); +static void PlaySoundLevel(int, int, int); +static void PlaySoundLevelNearest(int, int, int); +static void PlaySoundLevelAction(int, int, int); +static void PlaySoundLevelElementAction(int, int, int, int); static void MapGameButtons(); static void HandleGameButtons(struct GadgetInfo *); static struct GadgetInfo *game_gadget[NUM_GAME_BUTTONS]; +#define IS_ANIMATED(g) (new_graphic_info[g].anim_frames > 1) + /* ------------------------------------------------------------------------- */ /* sound definitions */ @@ -167,19 +170,62 @@ static boolean is_loop_sound[NUM_SOUND_FILES]; a specified time, eventually calling a function when changing ------------------------------------------------------------------------- */ +/* forward declaration for changer functions */ +static void InitBuggyBase(int x, int y); +static void WarnBuggyBase(int x, int y); + +static void InitTrap(int x, int y); +static void ActivateTrap(int x, int y); +static void ChangeActiveTrap(int x, int y); + +static void InitRobotWheel(int x, int y); +static void RunRobotWheel(int x, int y); +static void StopRobotWheel(int x, int y); + +static void InitTimegateWheel(int x, int y); +static void RunTimegateWheel(int x, int y); + struct ChangingElementInfo { int base_element; int next_element; int change_delay; - void (*changer_function)(int x, int y); + void (*pre_change_function)(int x, int y); + void (*change_function)(int x, int y); + void (*post_change_function)(int x, int y); }; static struct ChangingElementInfo changing_element_list[] = { - { EL_NUT_CRACKING, EL_EMERALD, 6, NULL }, - { EL_PEARL_BREAKING, EL_EMPTY, 8, NULL }, - { EL_UNDEFINED, EL_UNDEFINED, -1, NULL } + { EL_NUT_CRACKING, 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_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 } }; static struct ChangingElementInfo changing_element[MAX_NUM_ELEMENTS]; @@ -691,7 +737,9 @@ static void InitGameEngine() changing_element[i].base_element = EL_UNDEFINED; changing_element[i].next_element = EL_UNDEFINED; changing_element[i].change_delay = -1; - changing_element[i].changer_function = NULL; + changing_element[i].pre_change_function = NULL; + changing_element[i].change_function = NULL; + changing_element[i].post_change_function = NULL; } i = 0; @@ -700,10 +748,12 @@ static void InitGameEngine() struct ChangingElementInfo *ce = &changing_element_list[i]; int element = ce->base_element; - changing_element[element].base_element = ce->base_element; - changing_element[element].next_element = ce->next_element; - changing_element[element].change_delay = ce->change_delay; - changing_element[element].changer_function = ce->changer_function; + changing_element[element].base_element = ce->base_element; + changing_element[element].next_element = ce->next_element; + changing_element[element].change_delay = ce->change_delay; + changing_element[element].pre_change_function = ce->pre_change_function; + changing_element[element].change_function = ce->change_function; + changing_element[element].post_change_function = ce->post_change_function; i++; } @@ -1535,14 +1585,10 @@ void DrawDynamite(int x, int y) if (Store[x][y]) DrawGraphic(sx, sy, el2img(Store[x][y]), 0); - frame = getGraphicAnimationFrame(graphic, 96 - MovDelay[x][y]); - - /* - printf("-> %d: %d [%d]\n", graphic, frame, MovDelay[x][y]); - */ + frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]); if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(sx, sy, IMG_SP_DISK_RED, 0); + DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); else if (Store[x][y]) DrawGraphicThruMask(sx, sy, graphic, frame); else @@ -1551,21 +1597,18 @@ void DrawDynamite(int x, int y) void CheckDynamite(int x, int y) { - if (MovDelay[x][y]) /* dynamite is still waiting to explode */ + int element = Feld[x][y]; + + if (MovDelay[x][y] != 0) /* dynamite is still waiting to explode */ { MovDelay[x][y]--; - if (MovDelay[x][y]) - { - if (!(MovDelay[x][y] % 6)) - PlaySoundLevelAction(x, y, SND_ACTION_ACTIVE); - if (IS_ACTIVE_BOMB(Feld[x][y])) - { - int delay = (Feld[x][y] == EL_DYNAMITE_ACTIVE ? 12 : 6); + if (MovDelay[x][y] != 0) + { + if (checkDrawLevelGraphicAnimation(x, y, el2img(element))) + DrawDynamite(x, y); - if (!(MovDelay[x][y] % delay)) - DrawDynamite(x, y); - } + PlaySoundLevelAction(x, y, SND_ACTION_ACTIVE); return; } @@ -2748,7 +2791,7 @@ void TurnRound(int x, int y) } } - if (element == EL_ROBOT && ZX>=0 && ZY>=0) + if (element == EL_ROBOT && ZX >= 0 && ZY >= 0) { attr_x = ZX; attr_y = ZY; @@ -4070,6 +4113,23 @@ void Life(int ax, int ay) SND_BIOMAZE_CREATING); } +static void InitRobotWheel(int x, int y) +{ + MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; +} + +static void RunRobotWheel(int x, int y) +{ + PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE); +} + +static void StopRobotWheel(int x, int y) +{ + if (ZX == x && ZY == y) + ZX = ZY = -1; +} + +#if 1 void RobotWheel(int x, int y) { if (!MovDelay[x][y]) /* next animation frame */ @@ -4099,7 +4159,19 @@ void RobotWheel(int x, int y) if (ZX == x && ZY == y) ZX = ZY = -1; } +#endif +static void InitTimegateWheel(int x, int y) +{ + MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; +} + +static void RunTimegateWheel(int x, int y) +{ + PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE); +} + +#if 1 void TimegateWheel(int x, int y) { if (!MovDelay[x][y]) /* next animation frame */ @@ -4126,11 +4198,17 @@ void TimegateWheel(int x, int y) Feld[x][y] = EL_TIMEGATE_SWITCH; DrawLevelField(x, y); + /* THIS HAS NO EFFECT AT ALL! */ +#if 1 /* !!! THIS LOOKS WRONG !!! */ if (ZX == x && ZY == y) ZX = ZY = -1; +#endif + } +#endif +#if 1 void NussKnacken(int x, int y) { if (!MovDelay[x][y]) /* next animation frame */ @@ -4156,7 +4234,9 @@ void NussKnacken(int x, int y) Feld[x][y] = EL_EMERALD; DrawLevelField(x, y); } +#endif +#if 1 void BreakingPearl(int x, int y) { if (!MovDelay[x][y]) /* next animation frame */ @@ -4182,6 +4262,7 @@ void BreakingPearl(int x, int y) Feld[x][y] = EL_EMPTY; DrawLevelField(x, y); } +#endif void SiebAktivieren(int x, int y, int type) { @@ -4190,7 +4271,7 @@ void SiebAktivieren(int x, int y, int type) DrawLevelGraphicAnimation(x, y, graphic); } -void AusgangstuerPruefen(int x, int y) +void CheckExit(int x, int y) { if (local_player->gems_still_needed > 0 || local_player->sokobanfields_still_needed > 0 || @@ -4199,27 +4280,20 @@ void AusgangstuerPruefen(int x, int y) Feld[x][y] = EL_EXIT_OPENING; - PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) : - (x > LEVELX(BX2) ? LEVELX(BX2) : x), - y < LEVELY(BY1) ? LEVELY(BY1) : - (y > LEVELY(BY2) ? LEVELY(BY2) : y), - SND_EXIT_OPENING); + PlaySoundLevelNearest(x, y, SND_EXIT_OPENING); } -void AusgangstuerPruefen_SP(int x, int y) +void CheckExitSP(int x, int y) { if (local_player->gems_still_needed > 0) return; Feld[x][y] = EL_SP_EXIT_OPEN; - PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) : - (x > LEVELX(BX2) ? LEVELX(BX2) : x), - y < LEVELY(BY1) ? LEVELY(BY1) : - (y > LEVELY(BY2) ? LEVELY(BY2) : y), - SND_SP_EXIT_OPENING); + PlaySoundLevelNearest(x, y, SND_SP_EXIT_OPENING); } +#if 1 void AusgangstuerOeffnen(int x, int y) { int delay = 6; @@ -4252,7 +4326,9 @@ void AusgangstuerOeffnen(int x, int y) Feld[x][y] = EL_EXIT_OPEN; DrawLevelField(x, y); } +#endif +#if 1 void OpenSwitchgate(int x, int y) { int delay = 6; @@ -4282,7 +4358,9 @@ void OpenSwitchgate(int x, int y) Feld[x][y] = EL_SWITCHGATE_OPEN; DrawLevelField(x, y); } +#endif +#if 1 void CloseSwitchgate(int x, int y) { int delay = 6; @@ -4312,7 +4390,9 @@ void CloseSwitchgate(int x, int y) Feld[x][y] = EL_SWITCHGATE_CLOSED; DrawLevelField(x, y); } +#endif +#if 1 void OpenTimegate(int x, int y) { int delay = 6; @@ -4342,7 +4422,9 @@ void OpenTimegate(int x, int y) Feld[x][y] = EL_TIMEGATE_OPEN; DrawLevelField(x, y); } +#endif +#if 1 void CloseTimegate(int x, int y) { int delay = 6; @@ -4372,6 +4454,7 @@ void CloseTimegate(int x, int y) Feld[x][y] = EL_TIMEGATE_CLOSED; DrawLevelField(x, y); } +#endif static void CloseAllOpenTimegates() { @@ -4398,13 +4481,17 @@ void EdelsteinFunkeln(int x, int y) return; if (Feld[x][y] == EL_BD_DIAMOND) +#if 0 DrawLevelElementAnimation(x, y, el2img(Feld[x][y])); +#else + return; +#endif else { - if (!MovDelay[x][y]) /* next animation frame */ + if (MovDelay[x][y] == 0) /* next animation frame */ MovDelay[x][y] = 11 * !SimpleRND(500); - if (MovDelay[x][y]) /* wait some time before next frame */ + if (MovDelay[x][y] != 0) /* wait some time before next frame */ { MovDelay[x][y]--; @@ -4417,7 +4504,7 @@ void EdelsteinFunkeln(int x, int y) DrawLevelElementAnimation(x, y, Feld[x][y]); #endif - if (MovDelay[x][y]) + if (MovDelay[x][y] != 0) { int frame = getGraphicAnimationFrame(IMG_TWINKLE_WHITE, 10 - MovDelay[x][y]); @@ -4639,88 +4726,155 @@ void CheckForDragon(int x, int y) } } -static void CheckBuggyBase(int x, int y) +static void InitBuggyBase(int x, int y) { int element = Feld[x][y]; + int activating_delay = FRAMES_PER_SECOND / 4; + + MovDelay[x][y] = + (element == EL_SP_BUGGY_BASE ? + 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND) - activating_delay : + element == EL_SP_BUGGY_BASE_ACTIVATING ? + activating_delay : + element == EL_SP_BUGGY_BASE_ACTIVE ? + 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND) : 1); +} - if (element == EL_SP_BUGGY_BASE) +static void WarnBuggyBase(int x, int y) +{ + int i; + static int xy[4][2] = { - if (!MovDelay[x][y]) /* wait some time before activating base */ - MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; - if (MovDelay[x][y]) + for (i=0; i<4; i++) + { + int xx = x + xy[i][0], yy = y + xy[i][1]; + + if (IS_PLAYER(xx, yy)) { - MovDelay[x][y]--; - if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawGraphic(SCREENX(x), SCREENY(y), IMG_SP_BUGGY_BASE, 0); - if (MovDelay[x][y]) - return; + PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE); - Feld[x][y] = EL_SP_BUGGY_BASE_ACTIVE; + break; } } - else if (element == EL_SP_BUGGY_BASE_ACTIVE) +} + +#if 1 +void CheckBuggyBase(int x, int y) +{ + int element = Feld[x][y]; + + if (element == EL_SP_BUGGY_BASE) { - if (!MovDelay[x][y]) /* start activating buggy base */ - MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND); + if (MovDelay[x][y] == 0) /* wait some time before activating base */ + { + GfxFrame[x][y] = 0; - if (MovDelay[x][y]) + InitBuggyBase(x, y); + } + + MovDelay[x][y]--; + + if (MovDelay[x][y] != 0) { - MovDelay[x][y]--; - if (MovDelay[x][y]) - { - int i; - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + DrawLevelElementAnimation(x, y, element); + } + else + { + Feld[x][y] = EL_SP_BUGGY_BASE_ACTIVATING; + DrawLevelField(x, y); + } + } + else if (element == EL_SP_BUGGY_BASE_ACTIVATING) + { + if (MovDelay[x][y] == 0) /* display activation warning of buggy base */ + { + GfxFrame[x][y] = 0; - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - { - int graphic = IMG_SP_BUGGY_BASE_ACTIVE; - int frame = getGraphicAnimationFrame(graphic, SimpleRND(100)); + InitBuggyBase(x, y); + } - DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame); - } + MovDelay[x][y]--; - for (i=0; i<4; i++) - { - int xx = x + xy[i][0], yy = y + xy[i][1]; + if (MovDelay[x][y] != 0) + { + DrawLevelElementAnimation(x, y, element); + } + else + { + Feld[x][y] = EL_SP_BUGGY_BASE_ACTIVE; + DrawLevelField(x, y); + } + } + else if (element == EL_SP_BUGGY_BASE_ACTIVE) + { + if (MovDelay[x][y] == 0) /* start activating buggy base */ + { + GfxFrame[x][y] = 0; - if (IS_PLAYER(xx, yy)) - { - PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE); - break; - } - } + InitBuggyBase(x, y); + } - return; - } + MovDelay[x][y]--; + if (MovDelay[x][y] != 0) + { + DrawLevelElementAnimation(x, y, element); + + WarnBuggyBase(x, y); + } + else + { Feld[x][y] = EL_SP_BUGGY_BASE; DrawLevelField(x, y); } } } +#endif -static void CheckTrap(int x, int y) +static void InitTrap(int x, int y) +{ + MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); +} + +static void ActivateTrap(int x, int y) +{ + PlaySoundLevel(x, y, SND_TRAP_ACTIVATING); +} + +static void ChangeActiveTrap(int x, int y) +{ + int graphic = IMG_TRAP_ACTIVE; + + /* if animation frame already drawn, correct crumbled sand border */ + if (IS_ANIMATED(graphic)) + if (checkDrawLevelGraphicAnimation(x, y, graphic)) + DrawCrumbledSand(SCREENX(x), SCREENY(y)); +} + +#if 1 +void CheckTrap(int x, int y) { int element = Feld[x][y]; if (element == EL_TRAP) { - if (!MovDelay[x][y]) /* wait some time before activating trap */ + if (MovDelay[x][y] == 0) /* wait some time before activating trap */ MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); - if (MovDelay[x][y]) - { - MovDelay[x][y]--; - if (MovDelay[x][y]) - return; + MovDelay[x][y]--; + if (MovDelay[x][y] != 0) + { + /* do nothing while waiting */ + } + else + { Feld[x][y] = EL_TRAP_ACTIVE; PlaySoundLevel(x, y, SND_TRAP_ACTIVATING); } @@ -4730,36 +4884,29 @@ static void CheckTrap(int x, int y) int delay = 4; int num_frames = 8; - if (!MovDelay[x][y]) /* start activating trap */ - MovDelay[x][y] = num_frames * delay; - - if (MovDelay[x][y]) + if (MovDelay[x][y] == 0) /* start activating trap */ { - MovDelay[x][y]--; - - if (MovDelay[x][y]) - { - if (!(MovDelay[x][y] % delay)) - { - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - { - int graphic = IMG_TRAP_ACTIVE; - int frame = getGraphicAnimationFrame(graphic, 31 - MovDelay[x][y]); - - DrawGraphic(SCREENX(x),SCREENY(y), graphic, frame); - DrawCrumbledSand(SCREENX(x), SCREENY(y)); - } - } + MovDelay[x][y] = num_frames * delay; + GfxFrame[x][y] = 0; + } - return; - } + MovDelay[x][y]--; + if (MovDelay[x][y] != 0) + { + if (DrawLevelElementAnimation(x, y, element)) + DrawCrumbledSand(SCREENX(x), SCREENY(y)); + } + else + { Feld[x][y] = EL_TRAP; DrawLevelField(x, y); } } } +#endif +#if 1 static void DrawBeltAnimation(int x, int y, int element) { int belt_nr = getBeltNrFromBeltActiveElement(element); @@ -4773,35 +4920,41 @@ static void DrawBeltAnimation(int x, int y, int element) PlaySoundLevelAction(x, y, SND_ACTION_ACTIVE); } } +#endif static void ChangeElement(int x, int y) { int element = Feld[x][y]; - int change_delay = changing_element[element].change_delay; - if (!MovDelay[x][y]) /* next animation frame */ + if (MovDelay[x][y] == 0) /* initialize element change */ { - MovDelay[x][y] = change_delay + 1; + MovDelay[x][y] = changing_element[element].change_delay + 1; GfxFrame[x][y] = 0; + + if (changing_element[element].pre_change_function) + changing_element[element].pre_change_function(x, y); } - if (MovDelay[x][y]) /* wait some time before next frame */ - { - MovDelay[x][y]--; + MovDelay[x][y]--; - if (MovDelay[x][y]) - { + if (MovDelay[x][y] != 0) /* continue element change */ + { + if (IS_ANIMATED(el2img(element))) DrawLevelElementAnimation(x, y, element); - return; - } + 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; + GfxFrame[x][y] = 0; - Feld[x][y] = changing_element[element].next_element; - DrawLevelField(x, y); + DrawLevelField(x, y); - if (changing_element[element].changer_function) - changing_element[element].changer_function(x, y); + if (changing_element[element].post_change_function) + changing_element[element].post_change_function(x, y); + } } static void PlayerActions(struct PlayerInfo *player, byte player_action) @@ -5091,7 +5244,7 @@ void GameActions() { #if 1 - if (new_graphic_info[graphic].anim_frames > 1) + if (IS_ANIMATED(graphic)) DrawLevelGraphicAnimation(x, y, graphic); #endif @@ -5103,10 +5256,16 @@ void GameActions() StartMoving(x, y); #if 1 +#if 0 if (Feld[x][y] == EL_EMERALD && - new_graphic_info[graphic].anim_frames > 1 && + IS_ANIMATED(graphic) && + !IS_MOVING(x, y)) + DrawLevelGraphicAnimation(x, y, graphic); +#else + if (IS_ANIMATED(graphic) && !IS_MOVING(x, y)) DrawLevelGraphicAnimation(x, y, graphic); +#endif #endif if (IS_GEM(element) || element == EL_SP_INFOTRON) @@ -5122,7 +5281,7 @@ void GameActions() element == EL_EXTRA_TIME || element == EL_SHIELD_NORMAL || element == EL_SHIELD_DEADLY) && - new_graphic_info[graphic].anim_frames > 1) + IS_ANIMATED(graphic)) DrawLevelGraphicAnimation(x, y, graphic); #endif @@ -5146,10 +5305,12 @@ void GameActions() else if (element == EL_GAMEOFLIFE || element == EL_BIOMAZE) Life(x, y); +#if 0 else if (element == EL_ROBOT_WHEEL_ACTIVE) RobotWheel(x, y); else if (element == EL_TIMEGATE_SWITCH_ACTIVE) TimegateWheel(x, y); +#endif else if (element == EL_ACID_SPLASH_LEFT || element == EL_ACID_SPLASH_RIGHT) Blurb(x, y); @@ -5160,11 +5321,13 @@ void GameActions() BreakingPearl(x, y); #endif else if (element == EL_EXIT_CLOSED) - AusgangstuerPruefen(x, y); + CheckExit(x, y); else if (element == EL_SP_EXIT_CLOSED) - AusgangstuerPruefen_SP(x, y); + CheckExitSP(x, y); +#if 0 else if (element == EL_EXIT_OPENING) AusgangstuerOeffnen(x, y); +#endif else if (element == EL_WALL_GROWING_ACTIVE) MauerWaechst(x, y); else if (element == EL_WALL_GROWING || @@ -5174,14 +5337,16 @@ void GameActions() MauerAbleger(x, y); else if (element == EL_FLAMES) CheckForDragon(x, y); - else if (element == EL_SP_BUGGY_BASE || element == EL_SP_BUGGY_BASE_ACTIVE) +#if 0 + else if (element == EL_SP_BUGGY_BASE || + element == EL_SP_BUGGY_BASE_ACTIVATING || + element == EL_SP_BUGGY_BASE_ACTIVE) CheckBuggyBase(x, y); - else if (element == EL_TRAP || element == EL_TRAP_ACTIVE) + else if (element == EL_TRAP || + element == EL_TRAP_ACTIVE) CheckTrap(x, y); -#if 0 else if (IS_BELT_ACTIVE(element)) DrawBeltAnimation(x, y, element); -#endif else if (element == EL_SWITCHGATE_OPENING) OpenSwitchgate(x, y); else if (element == EL_SWITCHGATE_CLOSING) @@ -5190,12 +5355,13 @@ void GameActions() OpenTimegate(x, y); else if (element == EL_TIMEGATE_CLOSING) CloseTimegate(x, y); +#endif else if (IS_AUTO_CHANGING(element)) ChangeElement(x, y); #if 1 - else if (new_graphic_info[graphic].anim_frames > 1) + else if (IS_ANIMATED(graphic)) DrawLevelGraphicAnimation(x, y, graphic); #endif @@ -6199,6 +6365,7 @@ int DigField(struct PlayerInfo *player, case EL_TRAP: case EL_SP_BASE: case EL_SP_BUGGY_BASE: + case EL_SP_BUGGY_BASE_ACTIVATING: RemoveField(x, y); PlaySoundLevelElementAction(x, y, element, SND_ACTION_DIGGING); break; @@ -6834,11 +7001,14 @@ boolean PlaceBomb(struct PlayerInfo *player) if (element != EL_EMPTY) Store[jx][jy] = element; + MovDelay[jx][jy] = 96; + GfxFrame[jx][jy] = 0; + if (player->dynamite) { Feld[jx][jy] = EL_DYNAMITE_ACTIVE; - MovDelay[jx][jy] = 96; player->dynamite--; + DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) @@ -6855,8 +7025,8 @@ boolean PlaceBomb(struct PlayerInfo *player) { Feld[jx][jy] = EL_DYNABOMB_PLAYER1_ACTIVE + (player->element_nr - EL_PLAYER1); - MovDelay[jx][jy] = 96; player->dynabombs_left--; + if (IN_SCR_FIELD(SCREENX(jx), SCREENY(jy))) DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0); @@ -6866,7 +7036,7 @@ boolean PlaceBomb(struct PlayerInfo *player) return TRUE; } -void PlaySoundLevel(int x, int y, int nr) +static void PlaySoundLevel(int x, int y, int nr) { static int loop_sound_frame[NUM_SOUND_FILES]; static int loop_sound_volume[NUM_SOUND_FILES]; @@ -6913,12 +7083,22 @@ void PlaySoundLevel(int x, int y, int nr) PlaySoundExt(nr, volume, stereo_position, type); } -void PlaySoundLevelAction(int x, int y, int sound_action) +static void PlaySoundLevelNearest(int x, int y, int sound_action) +{ + PlaySoundLevel(x < LEVELX(BX1) ? LEVELX(BX1) : + x > LEVELX(BX2) ? LEVELX(BX2) : x, + y < LEVELY(BY1) ? LEVELY(BY1) : + y > LEVELY(BY2) ? LEVELY(BY2) : y, + sound_action); +} + +static void PlaySoundLevelAction(int x, int y, int sound_action) { PlaySoundLevelElementAction(x, y, Feld[x][y], sound_action); } -void PlaySoundLevelElementAction(int x, int y, int element, int sound_action) +static void PlaySoundLevelElementAction(int x, int y, int element, + int sound_action) { int sound_effect = element_action_sound[element][sound_action];