X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=09ea5e2ec74455bfe11eaf8e99f6ef2198c3d255;hb=c5ee7e4524f10322894b2547337e4c973a80a552;hp=b82ede439a61eea86f45182870abb95d7f777524;hpb=cd9add1d9479d1938d05ca9df4f31c3f99bd5f3e;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index b82ede43..09ea5e2e 100644 --- a/src/game.c +++ b/src/game.c @@ -100,113 +100,94 @@ #define NUM_GAME_BUTTONS 6 /* forward declaration for internal use */ +static void InitBeltMovement(void); 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 SND_ACTION_UNKNOWN 0 -#define SND_ACTION_WAITING 1 -#define SND_ACTION_MOVING 2 -#define SND_ACTION_DIGGING 3 -#define SND_ACTION_COLLECTING 4 -#define SND_ACTION_PASSING 5 -#define SND_ACTION_IMPACT 6 -#define SND_ACTION_PUSHING 7 -#define SND_ACTION_ACTIVATING 8 -#define SND_ACTION_ACTIVE 9 +#define IS_ANIMATED(g) (graphic_info[g].anim_frames > 1) +#define IS_LOOP_SOUND(s) (sound_info[s].loop) -#define NUM_SND_ACTIONS 10 -static struct -{ - char *text; - int value; - boolean is_loop; -} sound_action_properties[] = +/* ------------------------------------------------------------------------- */ +/* definition of elements that automatically change to other elements after */ +/* 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 { - /* insert _all_ loop sound actions here */ - { ".waiting", SND_ACTION_WAITING, TRUE }, - { ".moving", SND_ACTION_MOVING, TRUE }, /* continuos moving */ - { ".active", SND_ACTION_ACTIVE, TRUE }, - { ".growing", SND_ACTION_UNKNOWN, TRUE }, - { ".attacking", SND_ACTION_UNKNOWN, TRUE }, - - /* other (non-loop) sound actions are optional */ - { ".stepping", SND_ACTION_MOVING, FALSE }, /* discrete moving */ - { ".digging", SND_ACTION_DIGGING, FALSE }, - { ".collecting", SND_ACTION_COLLECTING, FALSE }, - { ".passing", SND_ACTION_PASSING, FALSE }, - { ".impact", SND_ACTION_IMPACT, FALSE }, - { ".pushing", SND_ACTION_PUSHING, FALSE }, - { ".activating", SND_ACTION_ACTIVATING, FALSE }, - { NULL, 0, 0 }, + int base_element; + int next_element; + int change_delay; + void (*pre_change_function)(int x, int y); + void (*change_function)(int x, int y); + void (*post_change_function)(int x, int y); }; -static int element_action_sound[MAX_NUM_ELEMENTS][NUM_SND_ACTIONS]; -static boolean is_loop_sound[NUM_SOUND_FILES]; -#define IS_LOOP_SOUND(x) (is_loop_sound[x]) +static struct ChangingElementInfo changing_element_list[] = +{ + { 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 }, -#ifdef DEBUG -#if 0 -static unsigned int getStateCheckSum(int counter) -{ - int x, y; - unsigned int mult = 1; - unsigned int checksum = 0; - /* - static short lastFeld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; - */ - static boolean first_game = TRUE; + { EL_TIMEGATE_OPENING, EL_TIMEGATE_OPEN, 29, NULL, NULL, NULL }, + { EL_TIMEGATE_CLOSING, EL_TIMEGATE_CLOSED, 29, NULL, NULL, NULL }, - for (y=0; ygems_still_needed, 3), FS_SMALL, FC_YELLOW); @@ -498,96 +481,6 @@ void DrawGameDoorValues() } -/* - ============================================================================= - InitGameSound() - ----------------------------------------------------------------------------- - initialize sound effect lookup table for element actions - ============================================================================= -*/ - -void InitGameSound() -{ - int sound_effect_properties[NUM_SOUND_FILES]; - int i, j; - -#if 0 - debug_print_timestamp(0, NULL); -#endif - - for (i=0; i VERSION_IDENT(2,0,1)) - Elementeigenschaften2[EL_WALL_GROWING_ACTIVE] |= EP_BIT_EM_SLIPPERY_WALL; + Properties2[EL_WALL_GROWING_ACTIVE] |= EP_BIT_EM_SLIPPERY_WALL; else - Elementeigenschaften2[EL_WALL_GROWING_ACTIVE] &=~EP_BIT_EM_SLIPPERY_WALL; + Properties2[EL_WALL_GROWING_ACTIVE] &=~EP_BIT_EM_SLIPPERY_WALL; + } + + /* initialize changing elements information */ + for (i=0; ibase_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].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++; } } @@ -736,8 +656,8 @@ void InitGame() player->last_jx = player->last_jy = 0; player->jx = player->jy = 0; - player->shield_passive_time_left = 0; - player->shield_active_time_left = 0; + player->shield_normal_time_left = 0; + player->shield_deadly_time_left = 0; DigField(player, 0, 0, 0, 0, DF_NO_PUSH); SnapField(player, 0, 0); @@ -794,12 +714,15 @@ void InitGame() Feld[x][y] = Ur[x][y]; MovPos[x][y] = MovDir[x][y] = MovDelay[x][y] = 0; Store[x][y] = Store2[x][y] = StorePlayer[x][y] = 0; - Frame[x][y] = 0; - GfxAction[x][y] = GFX_ACTION_DEFAULT; AmoebaNr[x][y] = 0; JustStopped[x][y] = 0; Stop[x][y] = FALSE; + ExplodePhase[x][y] = 0; ExplodeField[x][y] = EX_NO_EXPLOSION; + + GfxFrame[x][y] = 0; + GfxAction[x][y] = ACTION_DEFAULT; + GfxRandom[x][y] = SimpleRND(1000000); } } @@ -818,6 +741,8 @@ void InitGame() } } + InitBeltMovement(); + game.emulation = (emulate_bd ? EMU_BOULDERDASH : emulate_sb ? EMU_SOKOBAN : emulate_sp ? EMU_SUPAPLEX : EMU_NONE); @@ -957,7 +882,6 @@ void InitGame() DrawLevel(); DrawAllPlayers(); - FadeToFront(); /* after drawing the level, correct some elements */ if (game.timegate_time_left == 0) @@ -967,9 +891,10 @@ void InitGame() BlitBitmap(fieldbuffer, backbuffer, FX, FY, SXSIZE, SYSIZE, SX, SY); redraw_mask |= REDRAW_FROM_BACKBUFFER; + FadeToFront(); /* copy default game door content to main double buffer */ - BlitBitmap(pix[PIX_DOOR], drawto, + BlitBitmap(graphic_info[IMG_GLOBAL_DOOR].bitmap, drawto, DOOR_GFX_PAGEX5, DOOR_GFX_PAGEY1, DXSIZE, DYSIZE, DX, DY); if (level_nr < 100) @@ -978,7 +903,7 @@ void InitGame() else { DrawTextExt(drawto, DX + XX_EMERALDS, DY + YY_EMERALDS, - int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3); + int2str(level_nr, 3), FS_SMALL, FC_SPECIAL3, FONT_OPAQUE); BlitBitmap(drawto, drawto, DX + XX_EMERALDS, DY + YY_EMERALDS + 1, FONT5_XSIZE * 3, FONT5_YSIZE - 1, @@ -996,7 +921,7 @@ void InitGame() MapTapeButtons(); /* copy actual game door content to door double buffer for OpenDoor() */ - BlitBitmap(drawto, pix[PIX_DB_DOOR], + BlitBitmap(drawto, bitmap_db_door, DX, DY, DXSIZE, DYSIZE, DOOR_GFX_PAGEX1, DOOR_GFX_PAGEY1); OpenDoor(DOOR_OPEN_ALL); @@ -1152,6 +1077,9 @@ void GameWon() if (local_player->MovPos) return; + if (tape.playing && tape.auto_play) + tape.auto_play_level_solved = TRUE; + local_player->LevelSolved = FALSE; PlaySoundStereo(SND_GAME_WINNING, SOUND_MAX_RIGHT); @@ -1214,7 +1142,7 @@ void GameWon() #endif /* Hero disappears */ - DrawNewLevelField(ExitX, ExitY); + DrawLevelField(ExitX, ExitY); BackToFront(); if (tape.playing) @@ -1325,16 +1253,23 @@ int NewHiScore() 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); + if (!JustStopped[x][y] || direction != MovDir[x][y]) + GfxFrame[x][y] = 0; + MovDir[x][y] = direction; MovDir[newx][newy] = direction; if (Feld[newx][newy] == EL_EMPTY) Feld[newx][newy] = EL_BLOCKED; - GfxAction[x][y] = GFX_ACTION_MOVING; + if (direction == MV_DOWN && CAN_FALL(element)) + GfxAction[x][y] = ACTION_FALLING; + else + GfxAction[x][y] = ACTION_MOVING; } void Moving2Blocked(int x, int y, int *goes_to_x, int *goes_to_y) @@ -1445,85 +1380,52 @@ 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; - GfxAction[oldx][oldy] = GfxAction[newx][newy] = GFX_ACTION_DEFAULT; + GfxAction[oldx][oldy] = GfxAction[newx][newy] = ACTION_DEFAULT; - DrawNewLevelField(oldx, oldy); - DrawNewLevelField(newx, newy); + DrawLevelField(oldx, oldy); + DrawLevelField(newx, newy); } void DrawDynamite(int x, int y) { int sx = SCREENX(x), sy = SCREENY(y); -#if 0 - int graphic = el2gfx(Feld[x][y]); -#else int graphic = el2img(Feld[x][y]); -#endif int frame; if (!IN_SCR_FIELD(sx, sy) || IS_PLAYER(x, y)) return; if (Store[x][y]) -#if 0 - DrawGraphic(sx, sy, el2gfx(Store[x][y])); -#else - DrawNewGraphic(sx, sy, el2img(Store[x][y]), 0); -#endif - - if (Feld[x][y] == EL_DYNAMITE_ACTIVE) - { - if ((frame = (96 - MovDelay[x][y]) / 12) > 6) - frame = 6; - } - else - { - if ((frame = ((96 - MovDelay[x][y]) / 6) % 8) > 3) - frame = 7 - frame; - } - -#if 1 - frame = getNewGraphicAnimationFrame(graphic, 96 - MovDelay[x][y]); -#endif + DrawGraphic(sx, sy, el2img(Store[x][y]), 0); - /* - printf("-> %d: %d [%d]\n", graphic, frame, MovDelay[x][y]); - */ + frame = getGraphicAnimationFrame(graphic, GfxFrame[x][y]); -#if 0 - if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(sx, sy, GFX_SP_DISK_RED); - else if (Store[x][y]) - DrawGraphicThruMask(sx, sy, graphic + frame); - else - DrawGraphic(sx, sy, graphic + frame); -#else if (game.emulation == EMU_SUPAPLEX) - DrawNewGraphic(sx, sy, IMG_SP_DISK_RED, 0); + DrawGraphic(sx, sy, IMG_SP_DISK_RED, frame); else if (Store[x][y]) - DrawNewGraphicThruMask(sx, sy, graphic, frame); + DrawGraphicThruMask(sx, sy, graphic, frame); else - DrawNewGraphic(sx, sy, graphic, frame); -#endif + DrawGraphic(sx, sy, graphic, frame); } void CheckDynamite(int x, int y) { - if (MovDelay[x][y]) /* dynamite is still waiting to explode */ +#if 0 + int element = Feld[x][y]; +#endif + + 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 0 + if (checkDrawLevelGraphicAnimation(x, y, el2img(element))) +#endif + DrawDynamite(x, y); - if (!(MovDelay[x][y] % delay)) - DrawDynamite(x, y); - } + PlaySoundLevelAction(x, y, ACTION_ACTIVE); return; } @@ -1670,7 +1572,7 @@ void Explode(int ex, int ey, int phase, int mode) Feld[x][y] = EL_EXPLOSION; MovDir[x][y] = MovPos[x][y] = 0; AmoebaNr[x][y] = 0; - Frame[x][y] = 1; + ExplodePhase[x][y] = 1; Stop[x][y] = TRUE; } @@ -1686,7 +1588,7 @@ void Explode(int ex, int ey, int phase, int mode) x = ex; y = ey; - Frame[x][y] = (phase < last_phase ? phase + 1 : 0); + ExplodePhase[x][y] = (phase < last_phase ? phase + 1 : 0); if (phase == first_phase_after_start) { @@ -1725,50 +1627,29 @@ void Explode(int ex, int ey, int phase, int mode) InitField(x, y, FALSE); if (CAN_MOVE(element) || COULD_MOVE(element)) InitMovDir(x, y); - DrawNewLevelField(x, y); + DrawLevelField(x, y); if (IS_PLAYER(x, y) && !PLAYERINFO(x,y)->present) StorePlayer[x][y] = 0; } - else if (!(phase % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) + else if (phase >= delay && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) { -#if 0 - int graphic = GFX_EXPLOSION; - - if (game.emulation == EMU_SUPAPLEX) - graphic = (Store[x][y] == EL_SP_INFOTRON ? - GFX_SP_EXPLODE_INFOTRON : - GFX_SP_EXPLODE_EMPTY); - - graphic += (phase / delay - 1); -#else - int graphic = IMG_EXPLOSION; - int frame = (phase / delay - 1); - - if (game.emulation == EMU_SUPAPLEX) - graphic = (Store[x][y] == EL_SP_INFOTRON ? - IMG_SP_EXPLOSION_INFOTRON : - IMG_SP_EXPLOSION); -#endif + int stored = Store[x][y]; + int graphic = (game.emulation != EMU_SUPAPLEX ? IMG_EXPLOSION : + stored == EL_SP_INFOTRON ? IMG_SP_EXPLOSION_INFOTRON : + IMG_SP_EXPLOSION); + int frame = getGraphicAnimationFrame(graphic, phase - delay); if (phase == delay) - ErdreichAnbroeckeln(SCREENX(x), SCREENY(y)); + DrawCrumbledSand(SCREENX(x), SCREENY(y)); if (IS_PFORTE(Store[x][y])) { - DrawNewLevelElement(x, y, Store[x][y]); -#if 0 - DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic); -#else - DrawNewGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame); -#endif + DrawLevelElement(x, y, Store[x][y]); + DrawGraphicThruMask(SCREENX(x), SCREENY(y), graphic, frame); } else -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), graphic); -#else - DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame); -#endif + DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame); } } @@ -1875,37 +1756,32 @@ void Bang(int x, int y) } } -void Blurb(int x, int y) +void SplashAcid(int x, int y) { int element = Feld[x][y]; - if (element != EL_ACID_SPLASHING_LEFT && - element != EL_ACID_SPLASHING_RIGHT) /* start */ + if (element != EL_ACID_SPLASH_LEFT && + element != EL_ACID_SPLASH_RIGHT) { PlaySoundLevel(x, y, SND_ACID_SPLASHING); + if (IN_LEV_FIELD(x-1, y) && IS_FREE(x-1, y) && (!IN_LEV_FIELD(x-1, y-1) || !CAN_FALL(MovingOrBlocked2Element(x-1, y-1)))) - { - Feld[x-1][y] = EL_ACID_SPLASHING_LEFT; - } + Feld[x-1][y] = EL_ACID_SPLASH_LEFT; + if (IN_LEV_FIELD(x+1, y) && IS_FREE(x+1, y) && (!IN_LEV_FIELD(x+1, y-1) || !CAN_FALL(MovingOrBlocked2Element(x+1, y-1)))) - { - Feld[x+1][y] = EL_ACID_SPLASHING_RIGHT; - } + Feld[x+1][y] = EL_ACID_SPLASH_RIGHT; } + +#if 0 else /* go on */ { -#if 0 - int graphic = - (element == EL_ACID_SPLASHING_LEFT ? GFX_BLURB_LEFT : GFX_BLURB_RIGHT); -#else - int graphic = (element == EL_ACID_SPLASHING_LEFT ? - IMG_ACID_SPLASHING_LEFT : - IMG_ACID_SPLASHING_RIGHT); -#endif + int graphic = (element == EL_ACID_SPLASH_LEFT ? + IMG_ACID_SPLASH_LEFT : + IMG_ACID_SPLASH_RIGHT); if (!MovDelay[x][y]) /* initialize animation counter */ MovDelay[x][y] = 9; @@ -1914,20 +1790,78 @@ void Blurb(int x, int y) { MovDelay[x][y]--; if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), graphic+4-MovDelay[x][y]/2); -#else { - int frame = getNewGraphicAnimationFrame(graphic, 8 - MovDelay[x][y]); + int frame = getGraphicAnimationFrame(graphic, 8 - MovDelay[x][y]); - DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame); + DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame); } -#endif if (!MovDelay[x][y]) { Feld[x][y] = EL_EMPTY; - DrawNewLevelField(x, y); + DrawLevelField(x, y); + } + } + } +#endif +} + +static void InitBeltMovement() +{ + static int belt_base_element[4] = + { + EL_CONVEYOR_BELT1_LEFT, + EL_CONVEYOR_BELT2_LEFT, + EL_CONVEYOR_BELT3_LEFT, + EL_CONVEYOR_BELT4_LEFT + }; + static int belt_base_active_element[4] = + { + EL_CONVEYOR_BELT1_LEFT_ACTIVE, + EL_CONVEYOR_BELT2_LEFT_ACTIVE, + EL_CONVEYOR_BELT3_LEFT_ACTIVE, + EL_CONVEYOR_BELT4_LEFT_ACTIVE + }; + + int x, y, i, j; + + /* set frame order for belt animation graphic according to belt direction */ + for (i=0; i<4; i++) + { + int belt_nr = i; + + for (j=0; j<3; j++) + { + int element = belt_base_active_element[belt_nr] + j; + int graphic = el2img(element); + + if (game.belt_dir[i] == MV_LEFT) + graphic_info[graphic].anim_mode &= ~ANIM_REVERSE; + else + graphic_info[graphic].anim_mode |= ANIM_REVERSE; + } + } + + for(y=0; y 0) { Feld[x][y] = EL_LIGHT_SWITCH_ACTIVE; - DrawNewLevelField(x, y); + DrawLevelField(x, y); } else if (element == EL_LIGHT_SWITCH_ACTIVE && game.light_time_left == 0) { Feld[x][y] = EL_LIGHT_SWITCH; - DrawNewLevelField(x, y); + DrawLevelField(x, y); } else if (element == EL_INVISIBLE_STEELWALL || element == EL_INVISIBLE_WALL || @@ -2112,7 +2046,7 @@ static void RedrawAllLightSwitchesAndInvisibleElements() if (game.light_time_left > 0) Feld[x][y] = getInvisibleActiveFromInvisibleElement(element); - DrawNewLevelField(x, y); + DrawLevelField(x, y); } else if (element == EL_INVISIBLE_STEELWALL_ACTIVE || element == EL_INVISIBLE_WALL_ACTIVE || @@ -2121,7 +2055,7 @@ static void RedrawAllLightSwitchesAndInvisibleElements() if (game.light_time_left == 0) Feld[x][y] = getInvisibleFromInvisibleActiveElement(element); - DrawNewLevelField(x, y); + DrawLevelField(x, y); } } } @@ -2192,14 +2126,14 @@ void Impact(int x, int y) if (!lastline && smashed == EL_ACID) /* element falls into acid */ { - Blurb(x, y); + SplashAcid(x, y); return; } if ((element == EL_BOMB || element == EL_SP_DISK_ORANGE || element == EL_DX_SUPABOMB) && - (lastline || object_hit)) /* element is bomb */ + (lastline || object_hit)) /* element is bomb */ { Bang(x, y); return; @@ -2228,7 +2162,8 @@ void Impact(int x, int y) if (!lastline && object_hit) /* check which object was hit */ { if (CAN_CHANGE(element) && - (smashed == EL_MAGIC_WALL || smashed == EL_BD_MAGIC_WALL)) + (smashed == EL_MAGIC_WALL || + smashed == EL_BD_MAGIC_WALL)) { int xx, yy; int activated_magic_wall = @@ -2249,29 +2184,31 @@ void Impact(int x, int y) SND_BD_MAGIC_WALL_ACTIVATING)); } - if (IS_PLAYER(x, y+1)) + if (IS_PLAYER(x, y + 1)) { KillHeroUnlessProtected(x, y+1); return; } else if (smashed == EL_PENGUIN) { - Bang(x, y+1); + Bang(x, y + 1); return; } else if (element == EL_BD_DIAMOND) { if (IS_ENEMY(smashed) && IS_BD_ELEMENT(smashed)) { - Bang(x, y+1); + Bang(x, y + 1); return; } } - else if ((element == EL_SP_INFOTRON || element == EL_SP_ZONK) && - (smashed == EL_SP_SNIKSNAK || smashed == EL_SP_ELECTRON || + else if ((element == EL_SP_INFOTRON || + element == EL_SP_ZONK) && + (smashed == EL_SP_SNIKSNAK || + smashed == EL_SP_ELECTRON || smashed == EL_SP_DISK_ORANGE)) { - Bang(x, y+1); + Bang(x, y + 1); return; } else if (element == EL_ROCK || @@ -2279,24 +2216,28 @@ void Impact(int x, int y) element == EL_BD_ROCK) { if (IS_ENEMY(smashed) || - smashed == EL_BOMB || smashed == EL_SP_DISK_ORANGE || + smashed == EL_BOMB || + smashed == EL_SP_DISK_ORANGE || smashed == EL_DX_SUPABOMB || - smashed == EL_SATELLITE || smashed == EL_PIG || - smashed == EL_DRAGON || smashed == EL_MOLE) + smashed == EL_SATELLITE || + smashed == EL_PIG || + smashed == EL_DRAGON || + smashed == EL_MOLE) { - Bang(x, y+1); + Bang(x, y + 1); return; } - else if (!IS_MOVING(x, y+1)) + else if (!IS_MOVING(x, y + 1)) { - if (smashed == EL_LAMP || smashed == EL_LAMP_ACTIVE) + if (smashed == EL_LAMP || + smashed == EL_LAMP_ACTIVE) { - Bang(x, y+1); + Bang(x, y + 1); return; } else if (smashed == EL_NUT) { - Feld[x][y+1] = EL_CRACKINGNUT; + Feld[x][y+1] = EL_NUT_CRACKING; PlaySoundLevel(x, y, SND_NUT_CRACKING); RaiseScoreElement(EL_NUT); return; @@ -2346,7 +2287,7 @@ void Impact(int x, int y) /* play sound of object that hits the ground */ if (lastline || object_hit) - PlaySoundLevelElementAction(x, y, element, SND_ACTION_IMPACT); + PlaySoundLevelElementAction(x, y, element, ACTION_IMPACT); } void TurnRound(int x, int y) @@ -2380,18 +2321,18 @@ void TurnRound(int x, int y) int element = Feld[x][y]; int old_move_dir = MovDir[x][y]; - int left_dir = turn[old_move_dir].left; + int left_dir = turn[old_move_dir].left; int right_dir = turn[old_move_dir].right; - int back_dir = turn[old_move_dir].back; + int back_dir = turn[old_move_dir].back; - int left_dx = move_xy[left_dir].x, left_dy = move_xy[left_dir].y; - int right_dx = move_xy[right_dir].x, right_dy = move_xy[right_dir].y; - int move_dx = move_xy[old_move_dir].x, move_dy = move_xy[old_move_dir].y; - int back_dx = move_xy[back_dir].x, back_dy = move_xy[back_dir].y; + int left_dx = move_xy[left_dir].x, left_dy = move_xy[left_dir].y; + int right_dx = move_xy[right_dir].x, right_dy = move_xy[right_dir].y; + int move_dx = move_xy[old_move_dir].x, move_dy = move_xy[old_move_dir].y; + int back_dx = move_xy[back_dir].x, back_dy = move_xy[back_dir].y; - int left_x = x+left_dx, left_y = y+left_dy; - int right_x = x+right_dx, right_y = y+right_dy; - int move_x = x+move_dx, move_y = y+move_dy; + int left_x = x + left_dx, left_y = y + left_dy; + int right_x = x + right_dx, right_y = y + right_dy; + int move_x = x + move_dx, move_y = y + move_dy; if (element == EL_BUG || element == EL_BD_BUTTERFLY) { @@ -2635,17 +2576,18 @@ void TurnRound(int x, int y) MovDir[x][y] = game.balloon_dir; MovDelay[x][y] = 0; } - else if (element == EL_SPRING_MOVING) + else if (element == EL_SPRING) { - if (!IN_LEV_FIELD(move_x, move_y) || !IS_FREE(move_x, move_y) || - (IN_LEV_FIELD(x, y+1) && IS_FREE(x, y+1))) - { - Feld[x][y] = 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)))) MovDir[x][y] = MV_NO_MOVING; - } + MovDelay[x][y] = 0; } - else if (element == EL_ROBOT || element == EL_SATELLITE || element == EL_PENGUIN) + else if (element == EL_ROBOT || + element == EL_SATELLITE || + element == EL_PENGUIN) { int attr_x = -1, attr_y = -1; @@ -2674,7 +2616,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; @@ -2793,14 +2735,16 @@ static boolean JustBeingPushed(int x, int y) 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]; if (Stop[x][y]) return; - GfxAction[x][y] = GFX_ACTION_DEFAULT; + GfxAction[x][y] = ACTION_DEFAULT; - if (CAN_FALL(element) && y0 && IS_PLAYER(x-1, y)) || (x %d\n", MovDir[x][y]); +#endif TurnRound(x, y); - +#if 0 + if (element == EL_SPRING) + printf("2--> %d\n", MovDir[x][y]); +#endif if (MovDelay[x][y] && (element == EL_BUG || element == EL_SPACESHIP || element == EL_SP_SNIKSNAK || element == EL_SP_ELECTRON || element == EL_MOLE)) - DrawNewLevelField(x, y); + DrawLevelField(x, y); } } @@ -3001,25 +2999,24 @@ void StartMoving(int x, int y) MovDelay[x][y]--; if (element == EL_ROBOT || - element == EL_YAMYAM || element == EL_DARK_YAMYAM) + element == EL_YAMYAM || + element == EL_DARK_YAMYAM) { - int phase = MovDelay[x][y] % 8; - - if (phase > 3) - phase = 7 - phase; - - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(element) + phase); +#if 1 + ContinueLevelElementAnimation(x, y, element); #else + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) { int graphic = el2img(element); - int frame = getNewGraphicAnimationFrame(graphic, MovDelay[x][y] % 8); + int frame = getGraphicAnimationFrame(graphic, MovDelay[x][y] % 8); - DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame); + DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame); } #endif +#if 1 + PlaySoundLevelAction(x, y, ACTION_WAITING); +#else if (MovDelay[x][y] % 4 == 3) { if (element == EL_YAMYAM) @@ -3027,32 +3024,21 @@ void StartMoving(int x, int y) else if (element == EL_DARK_YAMYAM) PlaySoundLevel(x, y, SND_DARK_YAMYAM_WAITING); } +#endif } else if (element == EL_SP_ELECTRON) -#if 0 - DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_LOOP); -#else - DrawNewGraphicAnimation(x, y, IMG_SP_ELECTRON); -#endif + ContinueLevelElementAnimation(x, y, element); else if (element == EL_DRAGON) { int i; int dir = MovDir[x][y]; int dx = (dir == MV_LEFT ? -1 : dir == MV_RIGHT ? +1 : 0); int dy = (dir == MV_UP ? -1 : dir == MV_DOWN ? +1 : 0); -#if 0 - int graphic = (dir == MV_LEFT ? GFX_FLAMMEN_LEFT : - dir == MV_RIGHT ? GFX_FLAMMEN_RIGHT : - dir == MV_UP ? GFX_FLAMMEN_UP : - dir == MV_DOWN ? GFX_FLAMMEN_DOWN : GFX_LEERRAUM); - int phase = FrameCounter % 2; -#else - int graphic = (dir == MV_LEFT ? IMG_FLAMES_LEFT1 : - dir == MV_RIGHT ? IMG_FLAMES_RIGHT1 : - dir == MV_UP ? IMG_FLAMES_UP1 : - dir == MV_DOWN ? IMG_FLAMES_DOWN1 : IMG_EMPTY); - int frame = getNewGraphicAnimationFrame(graphic, -1); -#endif + int graphic = (dir == MV_LEFT ? IMG_FLAMES1_LEFT : + dir == MV_RIGHT ? IMG_FLAMES1_RIGHT : + dir == MV_UP ? IMG_FLAMES1_UP : + dir == MV_DOWN ? IMG_FLAMES1_DOWN : IMG_EMPTY); + int frame = getGraphicAnimationFrame(graphic, -1); for (i=1; i<=3; i++) { @@ -3075,24 +3061,20 @@ void StartMoving(int x, int y) Feld[xx][yy] = EL_FLAMES; if (IN_SCR_FIELD(sx, sy)) -#if 0 - DrawGraphic(sx, sy, graphic + phase*3 + i-1); -#else - DrawNewGraphic(sx, sy, flame_graphic, frame); -#endif + DrawGraphic(sx, sy, flame_graphic, frame); } else { if (Feld[xx][yy] == EL_FLAMES) Feld[xx][yy] = EL_EMPTY; - DrawNewLevelField(xx, yy); + DrawLevelField(xx, yy); } } } if (MovDelay[x][y]) /* element still has to wait some time */ { - PlaySoundLevelAction(x, y, SND_ACTION_WAITING); + PlaySoundLevelAction(x, y, ACTION_WAITING); return; } @@ -3122,7 +3104,7 @@ void StartMoving(int x, int y) IN_LEV_FIELD(newx, newy) && MovDir[x][y] == MV_DOWN && Feld[newx][newy] == EL_ACID) { - Blurb(x, y); + SplashAcid(x, y); Store[x][y] = EL_ACID; } else if (element == EL_PENGUIN && IN_LEV_FIELD(newx, newy)) @@ -3130,16 +3112,11 @@ void StartMoving(int x, int y) if (Feld[newx][newy] == EL_EXIT_OPEN) { Feld[x][y] = EL_EMPTY; - DrawNewLevelField(x, y); + DrawLevelField(x, y); PlaySoundLevel(newx, newy, SND_PENGUIN_PASSING_EXIT); if (IN_SCR_FIELD(SCREENX(newx), SCREENY(newy))) -#if 0 - DrawGraphicThruMask(SCREENX(newx), SCREENY(newy), el2gfx(element)); -#else - DrawNewGraphicThruMask(SCREENX(newx), SCREENY(newy), el2img(element), - 0); -#endif + DrawGraphicThruMask(SCREENX(newx),SCREENY(newy), el2img(element), 0); local_player->friends_still_needed--; if (!local_player->friends_still_needed && @@ -3151,7 +3128,7 @@ void StartMoving(int x, int y) else if (IS_MAMPF3(Feld[newx][newy])) { if (DigField(local_player, newx, newy, 0, 0, DF_DIG) == MF_MOVING) - DrawNewLevelField(newx, newy); + DrawLevelField(newx, newy); else MovDir[x][y] = MV_NO_MOVING; } @@ -3160,7 +3137,7 @@ void StartMoving(int x, int y) if (IS_PLAYER(x, y)) DrawPlayerField(x, y); else - DrawNewLevelField(x, y); + DrawLevelField(x, y); return; } } @@ -3173,7 +3150,7 @@ void StartMoving(int x, int y) else { Feld[newx][newy] = EL_EMPTY; - DrawNewLevelField(newx, newy); + DrawLevelField(newx, newy); } PlaySoundLevel(x, y, SND_PIG_EATING); @@ -3183,7 +3160,7 @@ void StartMoving(int x, int y) if (IS_PLAYER(x, y)) DrawPlayerField(x, y); else - DrawNewLevelField(x, y); + DrawLevelField(x, y); return; } } @@ -3194,7 +3171,7 @@ void StartMoving(int x, int y) if (IS_PLAYER(x, y)) DrawPlayerField(x, y); else - DrawNewLevelField(x, y); + DrawLevelField(x, y); return; } else @@ -3215,7 +3192,7 @@ void StartMoving(int x, int y) if (IS_PLAYER(x, y)) DrawPlayerField(x, y); else - DrawNewLevelField(x, y); + DrawLevelField(x, y); PlaySoundLevel(x, y, SND_DRAGON_ATTACKING); @@ -3237,7 +3214,7 @@ void StartMoving(int x, int y) else { Feld[newx][newy] = EL_EMPTY; - DrawNewLevelField(newx, newy); + DrawLevelField(newx, newy); } PlaySoundLevel(x, y, SND_YAMYAM_EATING); @@ -3258,7 +3235,7 @@ void StartMoving(int x, int y) else { Feld[newx][newy] = EL_EMPTY; - DrawNewLevelField(newx, newy); + DrawLevelField(newx, newy); } PlaySoundLevel(x, y, SND_DARK_YAMYAM_EATING); @@ -3284,7 +3261,7 @@ void StartMoving(int x, int y) else /* element == EL_PACMAN */ { Feld[newx][newy] = EL_EMPTY; - DrawNewLevelField(newx, newy); + DrawLevelField(newx, newy); PlaySoundLevel(x, y, SND_PACMAN_EATING); } } @@ -3303,48 +3280,28 @@ void StartMoving(int x, int y) if (element == EL_BUG || element == EL_SPACESHIP || element == EL_SP_SNIKSNAK) -#if 0 DrawLevelField(x, y); -#else - DrawNewLevelField(x, y); -#endif else if (element == EL_BUG || element == EL_SPACESHIP || element == EL_SP_SNIKSNAK || element == EL_MOLE) -#if 0 DrawLevelField(x, y); -#else - DrawNewLevelField(x, y); -#endif else if (element == EL_BD_BUTTERFLY || element == EL_BD_FIREFLY) -#if 0 - DrawGraphicAnimation(x, y, el2gfx(element), 2, 4, ANIM_LOOP); -#else - DrawNewGraphicAnimation(x, y, el2img(element)); -#endif + ContinueLevelElementAnimation(x, y, element); else if (element == EL_SATELLITE) -#if 0 - DrawGraphicAnimation(x, y, GFX_SONDE_START, 8, 2, ANIM_LOOP); -#else - DrawNewGraphicAnimation(x, y, IMG_SATELLITE); -#endif + ContinueLevelElementAnimation(x, y, element); else if (element == EL_SP_ELECTRON) -#if 0 - DrawGraphicAnimation(x, y, GFX2_SP_ELECTRON, 8, 2, ANIM_LOOP); -#else - DrawNewGraphicAnimation(x, y, IMG_SP_ELECTRON); -#endif + ContinueLevelElementAnimation(x, y, element); if (DONT_TOUCH(element)) TestIfBadThingTouchesHero(x, y); - PlaySoundLevelAction(x, y, SND_ACTION_WAITING); + PlaySoundLevelAction(x, y, ACTION_WAITING); return; } InitMovingField(x, y, MovDir[x][y]); - PlaySoundLevelAction(x, y, SND_ACTION_MOVING); + PlaySoundLevelAction(x, y, ACTION_MOVING); } if (MovDir[x][y]) @@ -3357,7 +3314,7 @@ void ContinueMoving(int x, int y) int direction = MovDir[x][y]; int dx = (direction == MV_LEFT ? -1 : direction == MV_RIGHT ? +1 : 0); int dy = (direction == MV_UP ? -1 : direction == MV_DOWN ? +1 : 0); - int horiz_move = (dx!=0); + int horiz_move = (dx != 0); int newx = x + dx, newy = y + dy; int step = (horiz_move ? dx : dy) * TILEX / 8; @@ -3374,8 +3331,8 @@ void ContinueMoving(int x, int y) else if (CAN_FALL(element) && horiz_move && y < lev_fieldy-1 && IS_BELT_ACTIVE(Feld[x][y+1])) step /= 2; - else if (element == EL_SPRING_MOVING) - step*=2; + else if (element == EL_SPRING && horiz_move) + step *= 2; #if OLD_GAME_BEHAVIOUR else if (CAN_FALL(element) && horiz_move && !IS_SP_ELEMENT(element)) @@ -3401,7 +3358,7 @@ void ContinueMoving(int x, int y) }; Feld[x][y] = EL_SAND; - DrawNewLevelField(x, y); + DrawLevelField(x, y); for(i=0; i<4; i++) { @@ -3411,7 +3368,7 @@ void ContinueMoving(int x, int y) yy = y + xy[i][1]; if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_SAND) - DrawNewLevelField(xx, yy); /* for "ErdreichAnbroeckeln()" */ + DrawLevelField(xx, yy); /* for "DrawCrumbledSand()" */ } } @@ -3468,13 +3425,25 @@ void ContinueMoving(int x, int y) MovDelay[newx][newy] = 0; GfxAction[newx][newy] = GfxAction[x][y]; /* keep action one frame */ - GfxAction[x][y] = GFX_ACTION_DEFAULT; + GfxRandom[newx][newy] = GfxRandom[x][y]; /* keep same random value */ + GfxAction[x][y] = ACTION_DEFAULT; +#if 0 if (!CAN_MOVE(element)) MovDir[newx][newy] = 0; +#else + /* + if (CAN_FALL(element) && MovDir[newx][newy] == MV_DOWN) + MovDir[newx][newy] = 0; + */ + + if (!CAN_MOVE(element) || + (element == EL_SPRING && MovDir[newx][newy] == MV_DOWN)) + MovDir[newx][newy] = 0; +#endif - DrawNewLevelField(x, y); - DrawNewLevelField(newx, newy); + DrawLevelField(x, y); + DrawLevelField(newx, newy); Stop[newx][newy] = TRUE; JustStopped[newx][newy] = 3; @@ -3494,10 +3463,16 @@ void ContinueMoving(int x, int y) } else /* still moving on */ { - if (GfxAction[x][y] == GFX_ACTION_DEFAULT) - GfxAction[x][y] = GFX_ACTION_MOVING; +#if 0 + if (GfxAction[x][y] == ACTION_DEFAULT) + { + printf("reset GfxAction...\n"); - DrawNewLevelField(x, y); + GfxAction[x][y] = ACTION_MOVING; + } +#endif + + DrawLevelField(x, y); } } @@ -3668,7 +3643,7 @@ void AmoebeUmwandelnBD(int ax, int ay, int new_element) AmoebaNr[x][y] = 0; Feld[x][y] = new_element; InitField(x, y, FALSE); - DrawNewLevelField(x, y); + DrawLevelField(x, y); done = TRUE; } } @@ -3703,22 +3678,18 @@ void AmoebeWaechst(int x, int y) { MovDelay[x][y]--; if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_AMOEBING + 3 - MovDelay[x][y]/2); -#else { - int frame = getNewGraphicAnimationFrame(IMG_AMOEBA_CREATING, - 6 - MovDelay[x][y]); + int frame = getGraphicAnimationFrame(IMG_AMOEBA_CREATING, + 6 - MovDelay[x][y]); - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_AMOEBA_CREATING, frame); + DrawGraphic(SCREENX(x), SCREENY(y), IMG_AMOEBA_CREATING, frame); } -#endif if (!MovDelay[x][y]) { Feld[x][y] = Store[x][y]; Store[x][y] = 0; - DrawNewLevelField(x, y); + DrawLevelField(x, y); } } } @@ -3740,21 +3711,17 @@ void AmoebaDisappearing(int x, int y) { MovDelay[x][y]--; if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_AMOEBING + MovDelay[x][y]/2); -#else { - int frame = getNewGraphicAnimationFrame(IMG_AMOEBA_SHRINKING, - 6 - MovDelay[x][y]); + int frame = getGraphicAnimationFrame(IMG_AMOEBA_SHRINKING, + 6 - MovDelay[x][y]); - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_AMOEBA_SHRINKING, frame); + DrawGraphic(SCREENX(x), SCREENY(y), IMG_AMOEBA_SHRINKING, frame); } -#endif if (!MovDelay[x][y]) { Feld[x][y] = EL_EMPTY; - DrawNewLevelField(x, y); + DrawLevelField(x, y); /* don't let mole enter this field in this cycle; (give priority to objects falling to this field from above) */ @@ -3779,7 +3746,7 @@ void AmoebeAbleger(int ax, int ay) if (!level.amoeba_speed) { Feld[ax][ay] = EL_AMOEBA_DEAD; - DrawNewLevelField(ax, ay); + DrawLevelField(ax, ay); return; } @@ -3842,7 +3809,7 @@ void AmoebeAbleger(int ax, int ay) if (i == 4 && (!waiting_for_player || game.emulation == EMU_BOULDERDASH)) { Feld[ax][ay] = EL_AMOEBA_DEAD; - DrawNewLevelField(ax, ay); + DrawLevelField(ax, ay); AmoebaCnt[AmoebaNr[ax][ay]]--; if (AmoebaCnt[AmoebaNr[ax][ay]] <= 0) /* amoeba is completely dead */ @@ -3905,7 +3872,7 @@ void AmoebeAbleger(int ax, int ay) return; } - DrawNewLevelField(newax, neway); + DrawLevelField(newax, neway); } void Life(int ax, int ay) @@ -3957,7 +3924,7 @@ void Life(int ax, int ay) { Feld[xx][yy] = EL_EMPTY; if (!Stop[xx][yy]) - DrawNewLevelField(xx, yy); + DrawLevelField(xx, yy); Stop[xx][yy] = TRUE; changed = TRUE; } @@ -3969,7 +3936,7 @@ void Life(int ax, int ay) Feld[xx][yy] = element; MovDelay[xx][yy] = (element == EL_GAMEOFLIFE ? 0 : life_time-1); if (!Stop[xx][yy]) - DrawNewLevelField(xx, yy); + DrawLevelField(xx, yy); Stop[xx][yy] = TRUE; changed = TRUE; } @@ -3981,155 +3948,40 @@ void Life(int ax, int ay) SND_BIOMAZE_CREATING); } -void RobotWheel(int x, int y) +static void InitRobotWheel(int x, int y) { - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - MovDelay[x][y]--; - if (MovDelay[x][y]) - { - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_ABLENK+MovDelay[x][y]%4); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_ROBOT_WHEEL_ACTIVE, -1); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_ROBOT_WHEEL_ACTIVE, frame); - } -#endif - if (!(MovDelay[x][y]%4)) - PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE); - return; - } - } - - Feld[x][y] = EL_ROBOT_WHEEL; - DrawNewLevelField(x, y); - if (ZX == x && ZY == y) - ZX = ZY = -1; + MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; } -void TimegateWheel(int x, int y) +static void RunRobotWheel(int x, int y) { - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - MovDelay[x][y]--; - if (MovDelay[x][y]) - { - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), - GFX_TIMEGATE_SWITCH + MovDelay[x][y]%4); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_TIMEGATE_SWITCH_ACTIVE, -1); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_SWITCH_ACTIVE, frame); - } -#endif - if (!(MovDelay[x][y]%4)) - PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE); - return; - } - } + PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVE); +} - Feld[x][y] = EL_TIMEGATE_SWITCH; - DrawNewLevelField(x, y); +static void StopRobotWheel(int x, int y) +{ if (ZX == x && ZY == y) ZX = ZY = -1; } -void Blubber(int x, int y) +static void InitTimegateWheel(int x, int y) { -#if 0 - if (y > 0 && IS_MOVING(x, y - 1) && MovDir[x][y - 1] == MV_DOWN) - DrawNewLevelField(x, y - 1); - else - DrawGraphicAnimation(x, y, GFX_GEBLUBBER, 4, 10, ANIM_LOOP); -#else - DrawNewGraphicAnimation(x, y, IMG_ACID); -#endif + MovDelay[x][y] = level.time_wheel * FRAMES_PER_SECOND; } -void NussKnacken(int x, int y) +static void RunTimegateWheel(int x, int y) { - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 7; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - MovDelay[x][y]--; - if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), - GFX_CRACKINGNUT + 3 - MovDelay[x][y]/2); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_NUT_CRACKING, - 6 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_NUT_CRACKING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_EMERALD; - DrawNewLevelField(x, y); - } - } -} - -void BreakingPearl(int x, int y) -{ - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 9; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - MovDelay[x][y]--; - if (MovDelay[x][y]/2 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), - GFX_PEARL_BREAKING + 4 - MovDelay[x][y]/2); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_PEARL_BREAKING, - 8 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_PEARL_BREAKING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_EMPTY; - DrawNewLevelField(x, y); - } - } + PlaySoundLevel(x, y, SND_TIMEGATE_SWITCH_ACTIVE); } void SiebAktivieren(int x, int y, int type) { -#if 0 - int graphic = (type == 1 ? GFX_MAGIC_WALL_FULL : GFX_MAGIC_WALL_BD_FULL) + 3; - - DrawGraphicAnimation(x, y, graphic, 4, 4, ANIM_REVERSE); -#else int graphic = (type == 1 ? IMG_MAGIC_WALL_FULL : IMG_BD_MAGIC_WALL_FULL); - DrawNewGraphicAnimation(x, y, graphic); -#endif + ContinueLevelGraphicAnimation(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 || @@ -4138,199 +3990,17 @@ 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); -} - -void AusgangstuerOeffnen(int x, int y) -{ - int delay = 6; - - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 5 * delay; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - int tuer; - - MovDelay[x][y]--; - tuer = MovDelay[x][y]/delay; - if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_AUSGANG_AUF-tuer); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_EXIT_OPENING, - 29 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_EXIT_OPENING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_EXIT_OPEN; - DrawNewLevelField(x, y); - } - } -} - -void AusgangstuerBlinken(int x, int y) -{ -#if 0 - DrawGraphicAnimation(x, y, GFX_AUSGANG_AUF, 4, 4, ANIM_PINGPONG); -#else - DrawNewGraphicAnimation(x, y, IMG_EXIT_OPEN); -#endif -} - -void OpenSwitchgate(int x, int y) -{ - int delay = 6; - - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 5 * delay; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - int phase; - - MovDelay[x][y]--; - phase = MovDelay[x][y] / delay; - if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_SWITCHGATE_OPEN - phase); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_SWITCHGATE_OPENING, - 29 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_SWITCHGATE_OPENING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_SWITCHGATE_OPEN; - DrawNewLevelField(x, y); - } - } -} - -void CloseSwitchgate(int x, int y) -{ - int delay = 6; - - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 5 * delay; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - int phase; - - MovDelay[x][y]--; - phase = MovDelay[x][y] / delay; - if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_SWITCHGATE_CLOSED + phase); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_SWITCHGATE_CLOSING, - 29 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_SWITCHGATE_CLOSING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_SWITCHGATE_CLOSED; - DrawNewLevelField(x, y); - } - } -} - -void OpenTimegate(int x, int y) -{ - int delay = 6; - - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 5 * delay; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - int phase; - - MovDelay[x][y]--; - phase = MovDelay[x][y] / delay; - if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_TIMEGATE_OPEN - phase); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_TIMEGATE_OPENING, - 29 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_OPENING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_TIMEGATE_OPEN; - DrawNewLevelField(x, y); - } - } -} - -void CloseTimegate(int x, int y) -{ - int delay = 6; - - if (!MovDelay[x][y]) /* next animation frame */ - MovDelay[x][y] = 5 * delay; - - if (MovDelay[x][y]) /* wait some time before next frame */ - { - int phase; - - MovDelay[x][y]--; - phase = MovDelay[x][y] / delay; - if (!(MovDelay[x][y] % delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_TIMEGATE_CLOSED + phase); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_TIMEGATE_CLOSING, - 29 - MovDelay[x][y]); - - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_TIMEGATE_CLOSING, frame); - } -#endif - - if (!MovDelay[x][y]) - { - Feld[x][y] = EL_TIMEGATE_CLOSED; - DrawNewLevelField(x, y); - } - } + PlaySoundLevelNearest(x, y, SND_SP_EXIT_OPENING); } static void CloseAllOpenTimegates() @@ -4359,16 +4029,16 @@ void EdelsteinFunkeln(int x, int y) if (Feld[x][y] == EL_BD_DIAMOND) #if 0 - DrawGraphicAnimation(x, y, GFX_EDELSTEIN_BD, 4, 4, ANIM_REVERSE); + DrawLevelElementAnimation(x, y, el2img(Feld[x][y])); #else - DrawNewGraphicAnimation(x, y, IMG_BD_DIAMOND); + 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]--; @@ -4376,29 +4046,17 @@ void EdelsteinFunkeln(int x, int y) SetDrawtoField(DRAW_BUFFERED); #if 0 - DrawGraphic(SCREENX(x), SCREENY(y), el2gfx(Feld[x][y])); + DrawGraphic(SCREENX(x), SCREENY(y), el2img(Feld[x][y]), 0); #else - DrawNewGraphic(SCREENX(x), SCREENY(y), el2img(Feld[x][y]), 0); + DrawLevelElementAnimation(x, y, Feld[x][y]); #endif - if (MovDelay[x][y]) + if (MovDelay[x][y] != 0) { - int phase = (MovDelay[x][y]-1)/2; + int frame = getGraphicAnimationFrame(IMG_TWINKLE_WHITE, + 10 - MovDelay[x][y]); - if (phase > 2) - phase = 4-phase; - -#if 0 - DrawGraphicThruMask(SCREENX(x), SCREENY(y), GFX_FUNKELN_WEISS + phase); -#else - { - int frame = getNewGraphicAnimationFrame(IMG_TWINKLE_WHITE, - 10 - MovDelay[x][y]); - - DrawNewGraphicThruMask(SCREENX(x), SCREENY(y), IMG_TWINKLE_WHITE, - frame); - } -#endif + DrawGraphicThruMask(SCREENX(x), SCREENY(y), IMG_TWINKLE_WHITE, frame); if (setup.direct_draw) { @@ -4425,54 +4083,43 @@ void MauerWaechst(int x, int y) if (MovDelay[x][y]) /* wait some time before next frame */ { - int phase; - MovDelay[x][y]--; - phase = 2 - MovDelay[x][y] / delay; -#if 0 - if (!(MovDelay[x][y]%delay) && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - DrawGraphic(SCREENX(x), SCREENY(y), - (MovDir[x][y] == MV_LEFT ? GFX_MAUER_LEFT : - MovDir[x][y] == MV_RIGHT ? GFX_MAUER_RIGHT : - MovDir[x][y] == MV_UP ? GFX_MAUER_UP : - GFX_MAUER_DOWN ) + phase); -#else + if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) { int graphic = el_dir2img(Feld[x][y], MovDir[x][y]); - int frame = getNewGraphicAnimationFrame(graphic, 17 - MovDelay[x][y]); + int frame = getGraphicAnimationFrame(graphic, 17 - MovDelay[x][y]); - DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame); + DrawGraphic(SCREENX(x), SCREENY(y), graphic, frame); } -#endif if (!MovDelay[x][y]) { if (MovDir[x][y] == MV_LEFT) { if (IN_LEV_FIELD(x - 1, y) && IS_MAUER(Feld[x - 1][y])) - DrawNewLevelField(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])) - DrawNewLevelField(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])) - DrawNewLevelField(x, y - 1); + DrawLevelField(x, y - 1); } else { if (IN_LEV_FIELD(x, y + 1) && IS_MAUER(Feld[x][y + 1])) - DrawNewLevelField(x, y + 1); + DrawLevelField(x, y + 1); } Feld[x][y] = Store[x][y]; Store[x][y] = 0; MovDir[x][y] = MV_NO_MOVING; - DrawNewLevelField(x, y); + DrawLevelField(x, y); } } } @@ -4513,12 +4160,8 @@ void MauerAbleger(int ax, int ay) Store[ax][ay-1] = element; MovDir[ax][ay-1] = MV_UP; if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay-1))) -#if 0 - DrawGraphic(SCREENX(ax), SCREENY(ay-1), GFX_MAUER_UP); -#else - DrawNewGraphic(SCREENX(ax), SCREENY(ay - 1), - IMG_WALL_GROWING_ACTIVE_UP, 0); -#endif + DrawGraphic(SCREENX(ax), SCREENY(ay - 1), + IMG_WALL_GROWING_ACTIVE_UP, 0); new_wall = TRUE; } if (unten_frei) @@ -4527,12 +4170,8 @@ void MauerAbleger(int ax, int ay) Store[ax][ay+1] = element; MovDir[ax][ay+1] = MV_DOWN; if (IN_SCR_FIELD(SCREENX(ax), SCREENY(ay+1))) -#if 0 - DrawGraphic(SCREENX(ax), SCREENY(ay+1), GFX_MAUER_DOWN); -#else - DrawNewGraphic(SCREENX(ax), SCREENY(ay + 1), - IMG_WALL_GROWING_ACTIVE_DOWN, 0); -#endif + DrawGraphic(SCREENX(ax), SCREENY(ay + 1), + IMG_WALL_GROWING_ACTIVE_DOWN, 0); new_wall = TRUE; } } @@ -4546,12 +4185,8 @@ void MauerAbleger(int ax, int ay) Store[ax-1][ay] = element; MovDir[ax-1][ay] = MV_LEFT; if (IN_SCR_FIELD(SCREENX(ax-1), SCREENY(ay))) -#if 0 - DrawGraphic(SCREENX(ax-1), SCREENY(ay), GFX_MAUER_LEFT); -#else - DrawNewGraphic(SCREENX(ax - 1), SCREENY(ay), - IMG_WALL_GROWING_ACTIVE_LEFT, 0); -#endif + DrawGraphic(SCREENX(ax - 1), SCREENY(ay), + IMG_WALL_GROWING_ACTIVE_LEFT, 0); new_wall = TRUE; } @@ -4561,18 +4196,14 @@ void MauerAbleger(int ax, int ay) Store[ax+1][ay] = element; MovDir[ax+1][ay] = MV_RIGHT; if (IN_SCR_FIELD(SCREENX(ax+1), SCREENY(ay))) -#if 0 - DrawGraphic(SCREENX(ax+1), SCREENY(ay), GFX_MAUER_RIGHT); -#else - DrawNewGraphic(SCREENX(ax + 1), SCREENY(ay), - IMG_WALL_GROWING_ACTIVE_RIGHT, 0); -#endif + DrawGraphic(SCREENX(ax + 1), SCREENY(ay), + IMG_WALL_GROWING_ACTIVE_RIGHT, 0); new_wall = TRUE; } } if (element == EL_WALL_GROWING && (links_frei || rechts_frei)) - DrawNewLevelField(ax, ay); + DrawLevelField(ax, ay); if (!IN_LEV_FIELD(ax, ay-1) || IS_MAUER(Feld[ax][ay-1])) oben_massiv = TRUE; @@ -4633,7 +4264,7 @@ void CheckForDragon(int x, int y) if (IN_LEV_FIELD(xx, yy) && Feld[xx][yy] == EL_FLAMES) { Feld[xx][yy] = EL_EMPTY; - DrawNewLevelField(xx, yy); + DrawLevelField(xx, yy); } else break; @@ -4642,166 +4273,96 @@ 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); - - if (MovDelay[x][y]) - { - MovDelay[x][y]--; - if (MovDelay[x][y] < 5 && IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x), SCREENY(y), GFX_SP_BUG_WARNING); -#else - DrawNewGraphic(SCREENX(x), SCREENY(y), IMG_SP_BUGGY_BASE, 0); -#endif - if (MovDelay[x][y]) - return; + { 0, -1 }, + { -1, 0 }, + { +1, 0 }, + { 0, +1 } + }; - Feld[x][y] = EL_SP_BUGGY_BASE_ACTIVE; - } - } - else if (element == EL_SP_BUGGY_BASE_ACTIVE) + for (i=0; i<4; i++) { - if (!MovDelay[x][y]) /* start activating buggy base */ - MovDelay[x][y] = 1 * FRAMES_PER_SECOND + RND(1 * FRAMES_PER_SECOND); + int xx = x + xy[i][0], yy = y + xy[i][1]; - if (MovDelay[x][y]) + if (IS_PLAYER(xx, yy)) { - MovDelay[x][y]--; - if (MovDelay[x][y]) - { - int i; - static int xy[4][2] = - { - { 0, -1 }, - { -1, 0 }, - { +1, 0 }, - { 0, +1 } - }; + PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE); - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) -#if 0 - DrawGraphic(SCREENX(x),SCREENY(y), GFX_SP_BUG_ACTIVE + SimpleRND(4)); -#else - { - int graphic = IMG_SP_BUGGY_BASE_ACTIVE; - int frame = getNewGraphicAnimationFrame(graphic, SimpleRND(100)); - - DrawNewGraphic(SCREENX(x), SCREENY(y), graphic, frame); - } -#endif + break; + } + } +} - for (i=0; i<4; i++) - { - int xx = x + xy[i][0], yy = y + xy[i][1]; +static void InitTrap(int x, int y) +{ + MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); +} - if (IS_PLAYER(xx, yy)) - { - PlaySoundLevel(x, y, SND_SP_BUGGY_BASE_ACTIVE); - break; - } - } +static void ActivateTrap(int x, int y) +{ + PlaySoundLevel(x, y, SND_TRAP_ACTIVATING); +} - return; - } +static void ChangeActiveTrap(int x, int y) +{ + int graphic = IMG_TRAP_ACTIVE; - Feld[x][y] = EL_SP_BUGGY_BASE; - DrawNewLevelField(x, y); - } - } + /* if animation frame already drawn, correct crumbled sand border */ + if (IS_ANIMATED(graphic)) + if (checkDrawLevelGraphicAnimation(x, y, graphic)) + DrawCrumbledSand(SCREENX(x), SCREENY(y)); } -static void CheckTrap(int x, int y) +static void ChangeElement(int x, int y) { int element = Feld[x][y]; - if (element == EL_TRAP) + if (MovDelay[x][y] == 0) /* initialize element change */ { - if (!MovDelay[x][y]) /* wait some time before activating trap */ - MovDelay[x][y] = 2 * FRAMES_PER_SECOND + RND(5 * FRAMES_PER_SECOND); + MovDelay[x][y] = changing_element[element].change_delay + 1; + GfxFrame[x][y] = 0; - if (MovDelay[x][y]) - { - MovDelay[x][y]--; - if (MovDelay[x][y]) - return; - - Feld[x][y] = EL_TRAP_ACTIVE; - PlaySoundLevel(x, y, SND_TRAP_ACTIVATING); - } + if (changing_element[element].pre_change_function) + changing_element[element].pre_change_function(x, y); } - else if (element == EL_TRAP_ACTIVE) - { - int delay = 4; - int num_frames = 8; - - if (!MovDelay[x][y]) /* start activating trap */ - MovDelay[x][y] = num_frames * delay; - - if (MovDelay[x][y]) - { - MovDelay[x][y]--; - - if (MovDelay[x][y]) - { - if (!(MovDelay[x][y] % delay)) - { - int phase = MovDelay[x][y]/delay; - - if (phase >= num_frames/2) - phase = num_frames - phase; - - if (IN_SCR_FIELD(SCREENX(x), SCREENY(y))) - { -#if 0 - DrawGraphic(SCREENX(x),SCREENY(y), GFX_TRAP_INACTIVE + phase - 1); -#else - int graphic = IMG_TRAP_ACTIVE; - int frame = getNewGraphicAnimationFrame(graphic, - 31 - MovDelay[x][y]); - DrawNewGraphic(SCREENX(x),SCREENY(y), graphic, frame); -#endif - ErdreichAnbroeckeln(SCREENX(x), SCREENY(y)); - } - } + MovDelay[x][y]--; - return; - } + if (MovDelay[x][y] != 0) /* continue element change */ + { + if (IS_ANIMATED(el2img(element))) + ContinueLevelElementAnimation(x, y, element); - Feld[x][y] = EL_TRAP; - DrawNewLevelField(x, y); - } + if (changing_element[element].change_function) + changing_element[element].change_function(x, y); } -} - -static void DrawBeltAnimation(int x, int y, int element) -{ - int belt_nr = getBeltNrFromBeltActiveElement(element); - int belt_dir = game.belt_dir[belt_nr]; - - if (belt_dir != MV_NO_MOVING) + else /* finish element change */ { -#if 0 - int delay = 2; - int mode = ANIM_LOOP | (belt_dir == MV_LEFT ? 0 : ANIM_REVERSE); - int graphic = el2gfx(element) + (belt_dir == MV_LEFT ? 0 : 7); + Feld[x][y] = changing_element[element].next_element; + GfxFrame[x][y] = 0; - DrawGraphicAnimation(x, y, graphic, 8, delay, mode); -#else - int graphic = el2img(element); + DrawLevelField(x, y); - DrawNewGraphicAnimation(x, y, graphic); -#endif - - if (!(FrameCounter % 2)) - PlaySoundLevel(x, y, SND_CONVEYOR_BELT_ACTIVE); + if (changing_element[element].post_change_function) + changing_element[element].post_change_function(x, y); } } @@ -4895,6 +4456,7 @@ static void PlayerActions(struct PlayerInfo *player, byte player_action) */ #endif + /* if the player does not move for some time, reset animation to start */ if (++player->frame_reset_delay > player->move_delay_value) player->Frame = 0; } @@ -4950,7 +4512,7 @@ void GameActions() static unsigned long action_delay = 0; unsigned long action_delay_value; int sieb_x = 0, sieb_y = 0; - int i, x, y, element; + int i, x, y, element, graphic; byte *recorded_player_action; byte summarized_player_action = 0; @@ -5054,8 +4616,6 @@ void GameActions() #endif #endif - - FrameCounter++; TimeFrames++; @@ -5065,6 +4625,8 @@ void GameActions() if (JustStopped[x][y] > 0) JustStopped[x][y]--; + GfxFrame[x][y]++; + #if DEBUG if (IS_BLOCKED(x, y)) { @@ -5085,24 +4647,62 @@ void GameActions() for (y=0; yshield_active_time_left) + if (player->shield_deadly_time_left) PlaySoundLevel(player->jx, player->jy, SND_SHIELD_DEADLY_ACTIVE); - else if (player->shield_passive_time_left) + else if (player->shield_normal_time_left) PlaySoundLevel(player->jx, player->jy, SND_SHIELD_NORMAL_ACTIVE); } } @@ -5384,10 +4953,10 @@ void GameActions() if (SHIELD_ON(player)) { - player->shield_passive_time_left--; + player->shield_normal_time_left--; - if (player->shield_active_time_left > 0) - player->shield_active_time_left--; + if (player->shield_deadly_time_left > 0) + player->shield_deadly_time_left--; } } @@ -5489,14 +5058,14 @@ void ScrollLevel(int dx, int dy) { x = (dx == 1 ? BX1 : BX2); for (y=BY1; y<=BY2; y++) - DrawNewScreenField(x, y); + DrawScreenField(x, y); } if (dy) { y = (dy == 1 ? BY1 : BY2); for (x=BX1; x<=BX2; x++) - DrawNewScreenField(x, y); + DrawScreenField(x, y); } redraw_mask |= REDRAW_FIELD; @@ -5562,7 +5131,7 @@ boolean MoveFigureOneStep(struct PlayerInfo *player, { if (element == EL_ACID && dx == 0 && dy == 1) { - Blurb(jx, jy); + SplashAcid(jx, jy); Feld[jx][jy] = EL_PLAYER1; InitMovingField(jx, jy, MV_DOWN); Store[jx][jy] = EL_ACID; @@ -5624,7 +5193,8 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) int original_move_delay_value = player->move_delay_value; #if DEBUG - printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES.\n"); + printf("THIS SHOULD ONLY HAPPEN WITH PRE-1.2 LEVEL TAPES. [%ld]\n", + tape.counter); #endif /* scroll remaining steps with finest movement resolution */ @@ -5728,7 +5298,11 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) if (!(moved & MF_MOVING) && !player->Pushing) player->Frame = 0; else +#if 0 player->Frame = (player->Frame + 1) % 4; +#else + player->Frame += 1 * 0; +#endif if (moved & MF_MOVING) { @@ -5737,7 +5311,7 @@ boolean MoveFigure(struct PlayerInfo *player, int dx, int dy) else if (old_jx == jx && old_jy != jy) player->MovDir = (old_jy < jy ? MV_DOWN : MV_UP); - DrawNewLevelField(jx, jy); /* for "ErdreichAnbroeckeln()" */ + DrawLevelField(jx, jy); /* for "DrawCrumbledSand()" */ player->last_move_dir = player->MovDir; player->is_moving = TRUE; @@ -5773,6 +5347,8 @@ void ScrollFigure(struct PlayerInfo *player, int mode) { player->actual_frame_counter = FrameCounter; player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); + if (player->Frame) + player->Frame += 1; if (Feld[last_jx][last_jy] == EL_EMPTY) Feld[last_jx][last_jy] = EL_PLAYER_IS_LEAVING; @@ -5785,6 +5361,7 @@ void ScrollFigure(struct PlayerInfo *player, int mode) player->MovPos += (player->MovPos > 0 ? -1 : 1) * move_stepsize; player->GfxPos = move_stepsize * (player->MovPos / move_stepsize); + player->Frame += 1; if (Feld[last_jx][last_jy] == EL_PLAYER_IS_LEAVING) Feld[last_jx][last_jy] = EL_EMPTY; @@ -5907,7 +5484,7 @@ void TestIfGoodThingHitsBadThing(int good_x, int good_y, int good_move_dir) { struct PlayerInfo *player = PLAYERINFO(good_x, good_y); - if (player->shield_active_time_left > 0) + if (player->shield_deadly_time_left > 0) Bang(kill_x, kill_y); else if (!PLAYER_PROTECTED(good_x, good_y)) KillHero(player); @@ -6004,7 +5581,7 @@ void TestIfBadThingHitsGoodThing(int bad_x, int bad_y, int bad_move_dir) ; #endif - if (player->shield_active_time_left > 0) + if (player->shield_deadly_time_left > 0) Bang(bad_x, bad_y); else if (!PLAYER_PROTECTED(kill_x, kill_y)) KillHero(player); @@ -6089,8 +5666,8 @@ void KillHero(struct PlayerInfo *player) Feld[jx][jy] = EL_EMPTY; /* deactivate shield (else Bang()/Explode() would not work right) */ - player->shield_passive_time_left = 0; - player->shield_active_time_left = 0; + player->shield_normal_time_left = 0; + player->shield_deadly_time_left = 0; Bang(jx, jy); BuryHero(player); @@ -6203,8 +5780,9 @@ 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); + PlaySoundLevelElementAction(x, y, element, ACTION_DIGGING); break; case EL_EMERALD: @@ -6226,7 +5804,7 @@ int DigField(struct PlayerInfo *player, DrawText(DX_EMERALDS, DY_EMERALDS, int2str(local_player->gems_still_needed, 3), FS_SMALL, FC_YELLOW); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING); + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); break; case EL_SPEED_PILL: @@ -6252,14 +5830,14 @@ int DigField(struct PlayerInfo *player, case EL_SHIELD_NORMAL: RemoveField(x, y); - player->shield_passive_time_left += 10; + player->shield_normal_time_left += 10; PlaySoundLevel(x, y, SND_SHIELD_NORMAL_COLLECTING); break; case EL_SHIELD_DEADLY: RemoveField(x, y); - player->shield_passive_time_left += 10; - player->shield_active_time_left += 10; + player->shield_normal_time_left += 10; + player->shield_deadly_time_left += 10; PlaySoundLevel(x, y, SND_SHIELD_DEADLY_COLLECTING); break; @@ -6271,7 +5849,7 @@ int DigField(struct PlayerInfo *player, DrawText(DX_DYNAMITE, DY_DYNAMITE, int2str(local_player->dynamite, 3), FS_SMALL, FC_YELLOW); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_COLLECTING); + PlaySoundLevelElementAction(x, y, element, ACTION_COLLECTING); break; case EL_DYNABOMB_NR: @@ -6307,9 +5885,9 @@ int DigField(struct PlayerInfo *player, player->key[key_nr] = TRUE; RaiseScoreElement(element); DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1 + key_nr); + IMG_KEY1 + key_nr); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1 + key_nr); + IMG_KEY1 + key_nr); PlaySoundLevel(x, y, SND_KEY_COLLECTING); break; } @@ -6325,9 +5903,9 @@ int DigField(struct PlayerInfo *player, player->key[key_nr] = TRUE; RaiseScoreElement(element); DrawMiniGraphicExt(drawto, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1 + key_nr); + IMG_KEY1 + key_nr); DrawMiniGraphicExt(window, DX_KEYS + key_nr * MINI_TILEX, DY_KEYS, - GFX_SCHLUESSEL1 + key_nr); + IMG_KEY1 + key_nr); PlaySoundLevel(x, y, SND_KEY_COLLECTING); break; } @@ -6336,7 +5914,7 @@ int DigField(struct PlayerInfo *player, Feld[x][y] = EL_ROBOT_WHEEL_ACTIVE; ZX = x; ZY = y; - DrawNewLevelField(x, y); + DrawLevelField(x, y); PlaySoundLevel(x, y, SND_ROBOT_WHEEL_ACTIVATING); return MF_ACTION; break; @@ -6481,19 +6059,19 @@ int DigField(struct PlayerInfo *player, else { RemoveField(x, y); - Feld[x+dx][y+dy] = element; + Feld[x + dx][y + dy] = element; } if (element == EL_SPRING) { - Feld[x+dx][y+dy] = EL_SPRING_MOVING; - MovDir[x+dx][y+dy] = move_direction; + Feld[x + dx][y + dy] = EL_SPRING; + MovDir[x + dx][y + dy] = move_direction; } player->push_delay_value = (element == EL_SPRING ? 0 : 2 + RND(8)); - DrawNewLevelField(x + dx, y + dy); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING); + DrawLevelField(x + dx, y + dy); + PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); break; case EL_GATE1: @@ -6553,7 +6131,7 @@ int DigField(struct PlayerInfo *player, player->programmed_action = move_direction; DOUBLE_PLAYER_SPEED(player); - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PASSING); + PlaySoundLevelElementAction(x, y, element, ACTION_PASSING); break; case EL_SP_PORT1_LEFT: @@ -6662,7 +6240,7 @@ int DigField(struct PlayerInfo *player, case EL_LAMP: Feld[x][y] = EL_LAMP_ACTIVE; local_player->lights_still_needed--; - DrawNewLevelField(x, y); + DrawLevelField(x, y); PlaySoundLevel(x, y, SND_LAMP_ACTIVATING); return MF_ACTION; break; @@ -6671,7 +6249,7 @@ int DigField(struct PlayerInfo *player, Feld[x][y] = EL_TIME_ORB_EMPTY; TimeLeft += 10; DrawText(DX_TIME, DY_TIME, int2str(TimeLeft, 3), FS_SMALL, FC_YELLOW); - DrawNewLevelField(x, y); + DrawLevelField(x, y); PlaySoundStereo(SND_TIME_ORB_FULL_COLLECTING, SOUND_MAX_RIGHT); return MF_ACTION; break; @@ -6751,13 +6329,13 @@ int DigField(struct PlayerInfo *player, { RemoveField(x, y); Feld[x+dx][y+dy] = element; - PlaySoundLevelElementAction(x, y, element, SND_ACTION_PUSHING); + PlaySoundLevelElementAction(x, y, element, ACTION_PUSHING); } player->push_delay_value = (element == EL_BALLOON ? 0 : 2); - DrawNewLevelField(x, y); - DrawNewLevelField(x + dx, y + dy); + DrawLevelField(x, y); + DrawLevelField(x + dx, y + dy); if (IS_SB_ELEMENT(element) && local_player->sokobanfields_still_needed == 0 && @@ -6815,7 +6393,7 @@ boolean SnapField(struct PlayerInfo *player, int dx, int dy) return FALSE; player->snapped = TRUE; - DrawNewLevelField(x, y); + DrawLevelField(x, y); BackToFront(); return TRUE; @@ -6838,27 +6416,22 @@ 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))) { -#if 0 if (game.emulation == EMU_SUPAPLEX) - DrawGraphic(SCREENX(jx), SCREENY(jy), GFX_SP_DISK_RED); + DrawGraphic(SCREENX(jx), SCREENY(jy), IMG_SP_DISK_RED, 0); else - DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNAMIT); -#else - if (game.emulation == EMU_SUPAPLEX) - DrawNewGraphic(SCREENX(jx), SCREENY(jy), IMG_SP_DISK_RED, 0); - else - DrawNewGraphicThruMask(SCREENX(jx), SCREENY(jy), - IMG_DYNAMITE_ACTIVE, 0); -#endif + DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), IMG_DYNAMITE_ACTIVE, 0); } PlaySoundLevel(jx, jy, SND_DYNAMITE_DROPPING); @@ -6867,15 +6440,10 @@ 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))) -#if 0 - DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), GFX_DYNABOMB); -#else - DrawNewGraphicThruMask(SCREENX(jx), SCREENY(jy), - el2img(Feld[jx][jy]), 0); -#endif + DrawGraphicThruMask(SCREENX(jx), SCREENY(jy), el2img(Feld[jx][jy]), 0); PlaySoundLevel(jx, jy, SND_DYNABOMB_DROPPING); } @@ -6883,10 +6451,29 @@ boolean PlaceBomb(struct PlayerInfo *player) return TRUE; } -void PlaySoundLevel(int x, int y, int nr) +/* ------------------------------------------------------------------------- */ +/* game sound playing functions */ +/* ------------------------------------------------------------------------- */ + +static int *loop_sound_frame = NULL; +static int *loop_sound_volume = NULL; + +void InitPlaySoundLevel() +{ + int num_sounds = getSoundListSize(); + + if (loop_sound_frame != NULL) + free(loop_sound_frame); + + if (loop_sound_volume != NULL) + free(loop_sound_volume); + + loop_sound_frame = checked_calloc(num_sounds * sizeof(int)); + loop_sound_volume = checked_calloc(num_sounds * sizeof(int)); +} + +static void PlaySoundLevel(int x, int y, int nr) { - static int loop_sound_frame[NUM_SOUND_FILES]; - static int loop_sound_volume[NUM_SOUND_FILES]; int sx = SCREENX(x), sy = SCREENY(y); int volume, stereo_position; int max_distance = 8; @@ -6930,16 +6517,26 @@ 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]; + int sound_effect = element_info[element].sound[sound_action]; - if (sound_effect != -1) + if (sound_effect != SND_UNDEFINED) PlaySoundLevel(x, y, sound_effect); } @@ -7086,7 +6683,7 @@ void CreateGameButtons() for (i=0; i