X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;ds=inline;f=src%2Fgame_em%2Flogic.c;h=53a9f23bf19992a7759ab92ad6339e2e6454609a;hb=96c2871c2efdc7f3e6edf49841409eb8e38a78e1;hp=2c5f74b347b2878fb7294b656a50f91ec5815f2c;hpb=c734235e0757e54dfdf6645d07a76c2a0bc591ba;p=rocksndiamonds.git diff --git a/src/game_em/logic.c b/src/game_em/logic.c index 2c5f74b3..53a9f23b 100644 --- a/src/game_em/logic.c +++ b/src/game_em/logic.c @@ -172,9 +172,8 @@ static boolean player_killed(struct PLAYER *ply) switch (cave[x][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -183,7 +182,6 @@ static boolean player_killed(struct PLAYER *ply) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: case Xdynamite_1: case Xdynamite_2: @@ -361,11 +359,10 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) { /* fire is released */ case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: + case Xsplash_e: + case Xsplash_w: cave[x][y] = Zplayer; next[x][y] = Zplayer; -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -374,7 +371,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif play_element_sound(x, y, SOUND_blank, Xblank); ply->anim = PLY_walk_n + anim; ply->x = x; @@ -391,9 +387,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+1][y-1] == Xblank) - cave[x+1][y-1] = Xacid_splash_e; + cave[x+1][y-1] = Xsplash_e; if (cave[x-1][y-1] == Xblank) - cave[x-1][y-1] = Xacid_splash_w; + cave[x-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); #endif @@ -567,9 +563,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -578,7 +573,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y] = dx > 0 ? Ystone_e : Ystone_w; next[x+dx][y] = Xstone_pause; goto stone_walk; @@ -592,9 +586,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y-1] == Xblank) - cave[x+dx+1][y-1] = Xacid_splash_e; + cave[x+dx+1][y-1] = Xsplash_e; if (cave[x+dx-1][y-1] == Xblank) - cave[x+dx-1][y-1] = Xacid_splash_w; + cave[x+dx-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); stone_walk: @@ -616,9 +610,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -627,7 +620,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y] = dx > 0 ? Ybomb_e : Ybomb_w; next[x+dx][y] = Xbomb_pause; goto bomb_walk; @@ -641,9 +633,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y-1] == Xblank) - cave[x+dx+1][y-1] = Xacid_splash_e; + cave[x+dx+1][y-1] = Xsplash_e; if (cave[x+dx-1][y-1] == Xblank) - cave[x+dx-1][y-1] = Xacid_splash_w; + cave[x+dx-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); bomb_walk: @@ -665,9 +657,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -676,7 +667,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y] = dx > 0 ? Ynut_e : Ynut_w; next[x+dx][y] = Xnut_pause; goto nut_walk; @@ -690,9 +680,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y-1] == Xblank) - cave[x+dx+1][y-1] = Xacid_splash_e; + cave[x+dx+1][y-1] = Xsplash_e; if (cave[x+dx-1][y-1] == Xblank) - cave[x+dx-1][y-1] = Xacid_splash_w; + cave[x+dx-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); nut_walk: @@ -714,9 +704,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -725,7 +714,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y] = dx > 0 ? Yspring_e : Yspring_w; next[x+dx][y] = dx > 0 ? Xspring_e : Xspring_w; goto spring_walk; @@ -739,9 +727,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y-1] == Xblank) - cave[x+dx+1][y-1] = Xacid_splash_e; + cave[x+dx+1][y-1] = Xsplash_e; if (cave[x+dx-1][y-1] == Xblank) - cave[x+dx-1][y-1] = Xacid_splash_w; + cave[x+dx-1][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); spring_walk: @@ -785,9 +773,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y+dy]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -796,7 +783,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yballoon_n : Yballoon_s) : (dx > 0 ? Yballoon_e : Yballoon_w)); next[x+dx][y+dy] = Xballoon; @@ -811,9 +797,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y+dy-1] == Xblank) - cave[x+dx+1][y+dy-1] = Xacid_splash_e; + cave[x+dx+1][y+dy-1] = Xsplash_e; if (cave[x+dx-1][y+dy-1] == Xblank) - cave[x+dx-1][y+dy-1] = Xacid_splash_w; + cave[x+dx-1][y+dy-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); balloon_walk: @@ -842,9 +828,8 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) switch (cave[x+dx][y+dy]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -853,7 +838,6 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x+dx][y+dy] = (dy ? (dy < 0 ? Yandroid_n : Yandroid_s) : (dx > 0 ? Yandroid_e : Yandroid_w)); next[x+dx][y+dy] = (dy ? (dy < 0 ? Xandroid_2_n : Xandroid_2_s) : @@ -869,9 +853,9 @@ static boolean player_digfield(struct PLAYER *ply, int dx, int dy) case Xacid_7: case Xacid_8: if (cave[x+dx+1][y+dy-1] == Xblank) - cave[x+dx+1][y+dy-1] = Xacid_splash_e; + cave[x+dx+1][y+dy-1] = Xsplash_e; if (cave[x+dx-1][y+dy-1] == Xblank) - cave[x+dx-1][y+dy-1] = Xacid_splash_w; + cave[x+dx-1][y+dy-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); android_walk: @@ -1356,7 +1340,6 @@ static void Lacid_8(int x, int y) next[x][y] = Xacid_1; } -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS static void Lfake_acid_1(int x, int y) { next[x][y] = Xfake_acid_2; @@ -1396,7 +1379,6 @@ static void Lfake_acid_8(int x, int y) { next[x][y] = Xfake_acid_1; } -#endif static void Landroid(int x, int y) { @@ -1806,9 +1788,8 @@ static void Landroid_1_n(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -1817,7 +1798,6 @@ static void Landroid_1_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_nB; next[x][y] = Xblank; cave[x][y-1] = Yandroid_n; @@ -1836,9 +1816,9 @@ static void Landroid_1_n(int x, int y) cave[x][y] = Yandroid_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1853,9 +1833,8 @@ static void Landroid_2_n(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -1864,7 +1843,6 @@ static void Landroid_2_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_nB; next[x][y] = Xblank; cave[x][y-1] = Yandroid_n; @@ -1883,9 +1861,9 @@ static void Landroid_2_n(int x, int y) cave[x][y] = Yandroid_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1900,9 +1878,8 @@ static void Landroid_1_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -1911,7 +1888,6 @@ static void Landroid_1_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_eB; next[x][y] = Xblank; cave[x+1][y] = Yandroid_e; @@ -1930,9 +1906,9 @@ static void Landroid_1_e(int x, int y) cave[x][y] = Yandroid_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1947,9 +1923,8 @@ static void Landroid_2_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -1958,7 +1933,6 @@ static void Landroid_2_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_eB; next[x][y] = Xblank; cave[x+1][y] = Yandroid_e; @@ -1977,9 +1951,9 @@ static void Landroid_2_e(int x, int y) cave[x][y] = Yandroid_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1994,9 +1968,8 @@ static void Landroid_1_s(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2005,7 +1978,6 @@ static void Landroid_1_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_sB; next[x][y] = Xblank; cave[x][y+1] = Yandroid_s; @@ -2024,9 +1996,9 @@ static void Landroid_1_s(int x, int y) cave[x][y] = Yandroid_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2041,9 +2013,8 @@ static void Landroid_2_s(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2052,7 +2023,6 @@ static void Landroid_2_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_sB; next[x][y] = Xblank; cave[x][y+1] = Yandroid_s; @@ -2071,9 +2041,9 @@ static void Landroid_2_s(int x, int y) cave[x][y] = Yandroid_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2088,9 +2058,8 @@ static void Landroid_1_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2099,7 +2068,6 @@ static void Landroid_1_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_wB; next[x][y] = Xblank; cave[x-1][y] = Yandroid_w; @@ -2118,9 +2086,9 @@ static void Landroid_1_w(int x, int y) cave[x][y] = Yandroid_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2135,9 +2103,8 @@ static void Landroid_2_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2146,7 +2113,6 @@ static void Landroid_2_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yandroid_wB; next[x][y] = Xblank; cave[x-1][y] = Yandroid_w; @@ -2165,9 +2131,9 @@ static void Landroid_2_w(int x, int y) cave[x][y] = Yandroid_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2214,9 +2180,8 @@ static void Leater_n(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2225,7 +2190,6 @@ static void Leater_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2246,9 +2210,9 @@ static void Leater_n(int x, int y) cave[x][y] = Yeater_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2296,9 +2260,8 @@ static void Leater_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2307,7 +2270,6 @@ static void Leater_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2328,9 +2290,9 @@ static void Leater_e(int x, int y) cave[x][y] = Yeater_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2378,9 +2340,8 @@ static void Leater_s(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2389,7 +2350,6 @@ static void Leater_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2410,9 +2370,9 @@ static void Leater_s(int x, int y) cave[x][y] = Yeater_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2460,9 +2420,8 @@ static void Leater_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2471,7 +2430,6 @@ static void Leater_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2492,9 +2450,9 @@ static void Leater_w(int x, int y) cave[x][y] = Yeater_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2526,9 +2484,8 @@ static void Lalien(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2537,7 +2494,6 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2559,9 +2515,9 @@ static void Lalien(int x, int y) cave[x][y] = Yalien_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -2571,9 +2527,8 @@ static void Lalien(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2582,7 +2537,6 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2604,9 +2558,9 @@ static void Lalien(int x, int y) cave[x][y] = Yalien_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -2619,9 +2573,8 @@ static void Lalien(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2630,7 +2583,6 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2652,9 +2604,9 @@ static void Lalien(int x, int y) cave[x][y] = Yalien_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -2664,9 +2616,8 @@ static void Lalien(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2675,7 +2626,6 @@ static void Lalien(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2697,9 +2647,9 @@ static void Lalien(int x, int y) cave[x][y] = Yalien_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -2717,9 +2667,8 @@ static void Lbug_n(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2728,7 +2677,6 @@ static void Lbug_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2750,9 +2698,9 @@ static void Lbug_n(int x, int y) cave[x][y] = Ybug_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2779,9 +2727,8 @@ static void Lbug_1_n(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2790,7 +2737,6 @@ static void Lbug_1_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -2833,9 +2779,8 @@ static void Lbug_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2844,7 +2789,6 @@ static void Lbug_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2866,9 +2810,9 @@ static void Lbug_e(int x, int y) cave[x][y] = Ybug_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2895,9 +2839,8 @@ static void Lbug_1_e(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2906,7 +2849,6 @@ static void Lbug_1_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -2949,9 +2891,8 @@ static void Lbug_s(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2960,7 +2901,6 @@ static void Lbug_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -2982,9 +2922,9 @@ static void Lbug_s(int x, int y) cave[x][y] = Ybug_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3011,9 +2951,8 @@ static void Lbug_1_s(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3022,7 +2961,6 @@ static void Lbug_1_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3065,9 +3003,8 @@ static void Lbug_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3076,7 +3013,6 @@ static void Lbug_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -3098,9 +3034,9 @@ static void Lbug_w(int x, int y) cave[x][y] = Ybug_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3127,9 +3063,8 @@ static void Lbug_1_w(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3138,7 +3073,6 @@ static void Lbug_1_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3181,9 +3115,8 @@ static void Ltank_n(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3192,7 +3125,6 @@ static void Ltank_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -3214,9 +3146,9 @@ static void Ltank_n(int x, int y) cave[x][y] = Ytank_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3243,9 +3175,8 @@ static void Ltank_1_n(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3254,7 +3185,6 @@ static void Ltank_1_n(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3297,9 +3227,8 @@ static void Ltank_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3308,7 +3237,6 @@ static void Ltank_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -3330,9 +3258,9 @@ static void Ltank_e(int x, int y) cave[x][y] = Ytank_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3359,9 +3287,8 @@ static void Ltank_1_e(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3370,7 +3297,6 @@ static void Ltank_1_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3413,9 +3339,8 @@ static void Ltank_s(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3424,7 +3349,6 @@ static void Ltank_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -3446,9 +3370,9 @@ static void Ltank_s(int x, int y) cave[x][y] = Ytank_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3475,9 +3399,8 @@ static void Ltank_1_s(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3486,7 +3409,6 @@ static void Ltank_1_s(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3529,9 +3451,8 @@ static void Ltank_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3540,7 +3461,6 @@ static void Ltank_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -3562,9 +3482,9 @@ static void Ltank_w(int x, int y) cave[x][y] = Ytank_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3591,9 +3511,8 @@ static void Ltank_1_w(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3602,7 +3521,6 @@ static void Ltank_1_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Xacid_1: @@ -3645,9 +3563,8 @@ static void Lemerald(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3656,7 +3573,6 @@ static void Lemerald(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yemerald_sB; next[x][y] = Xblank; cave[x][y+1] = Yemerald_s; @@ -3674,9 +3590,9 @@ static void Lemerald(int x, int y) cave[x][y] = Yemerald_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3708,8 +3624,8 @@ static void Lemerald(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xwonderwall: case Xkey_1: case Xkey_2: @@ -3790,9 +3706,8 @@ static void Lemerald_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3801,7 +3716,6 @@ static void Lemerald_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yemerald_sB; next[x][y] = Xblank; cave[x][y+1] = Yemerald_s; @@ -3819,9 +3733,9 @@ static void Lemerald_pause(int x, int y) cave[x][y] = Yemerald_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3837,9 +3751,8 @@ static void Lemerald_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3848,7 +3761,6 @@ static void Lemerald_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: cave[x][y] = Yemerald_sB; next[x][y] = Xblank; @@ -3867,9 +3779,9 @@ static void Lemerald_fall(int x, int y) cave[x][y] = Yemerald_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3902,9 +3814,8 @@ static void Ldiamond(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -3913,7 +3824,6 @@ static void Ldiamond(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; cave[x][y+1] = Ydiamond_s; @@ -3931,9 +3841,9 @@ static void Ldiamond(int x, int y) cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3965,8 +3875,8 @@ static void Ldiamond(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xwonderwall: case Xkey_1: case Xkey_2: @@ -4047,9 +3957,8 @@ static void Ldiamond_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4058,7 +3967,6 @@ static void Ldiamond_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; cave[x][y+1] = Ydiamond_s; @@ -4076,9 +3984,9 @@ static void Ldiamond_pause(int x, int y) cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4094,9 +4002,8 @@ static void Ldiamond_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4105,7 +4012,6 @@ static void Ldiamond_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; @@ -4124,9 +4030,9 @@ static void Ldiamond_fall(int x, int y) cave[x][y] = Ydiamond_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4159,9 +4065,8 @@ static void Lstone(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4170,7 +4075,6 @@ static void Lstone(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: cave[x][y] = Ystone_sB; @@ -4190,9 +4094,9 @@ static void Lstone(int x, int y) cave[x][y] = Ystone_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4231,8 +4135,8 @@ static void Lstone(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xkey_1: case Xkey_2: case Xkey_3: @@ -4297,9 +4201,8 @@ static void Lstone_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4308,7 +4211,6 @@ static void Lstone_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ystone_sB; next[x][y] = Xblank; cave[x][y+1] = Ystone_s; @@ -4326,9 +4228,9 @@ static void Lstone_pause(int x, int y) cave[x][y] = Ystone_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4344,9 +4246,8 @@ static void Lstone_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4355,7 +4256,6 @@ static void Lstone_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: cave[x][y] = Ystone_sB; next[x][y] = Xblank; @@ -4374,9 +4274,9 @@ static void Lstone_fall(int x, int y) cave[x][y] = Ystone_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4423,9 +4323,8 @@ static void Lstone_fall(int x, int y) switch (cave[x+1][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4434,7 +4333,6 @@ static void Lstone_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xalien: case Xalien_pause: cave[x][y+1] = Xspring_e; @@ -4450,9 +4348,8 @@ static void Lstone_fall(int x, int y) switch (cave[x-1][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4461,7 +4358,6 @@ static void Lstone_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xalien: case Xalien_pause: cave[x][y+1] = Xspring_w; @@ -4498,9 +4394,8 @@ static void Lstone_fall(int x, int y) switch (cave[x][y+2]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4509,7 +4404,6 @@ static void Lstone_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: case Xbug_1_n: case Xbug_1_e: @@ -4601,9 +4495,8 @@ static void Lbomb(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4612,7 +4505,6 @@ static void Lbomb(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ybomb_sB; next[x][y] = Xblank; cave[x][y+1] = Ybomb_s; @@ -4630,9 +4522,9 @@ static void Lbomb(int x, int y) cave[x][y] = Ybomb_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4664,8 +4556,8 @@ static void Lbomb(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xkey_1: case Xkey_2: case Xkey_3: @@ -4728,9 +4620,8 @@ static void Lbomb_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4739,7 +4630,6 @@ static void Lbomb_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ybomb_sB; next[x][y] = Xblank; cave[x][y+1] = Ybomb_s; @@ -4757,9 +4647,9 @@ static void Lbomb_pause(int x, int y) cave[x][y] = Ybomb_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4775,9 +4665,8 @@ static void Lbomb_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4786,7 +4675,6 @@ static void Lbomb_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ybomb_sB; next[x][y] = Xblank; cave[x][y+1] = Ybomb_s; @@ -4804,9 +4692,9 @@ static void Lbomb_fall(int x, int y) cave[x][y] = Ybomb_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4822,9 +4710,8 @@ static void Lnut(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4833,7 +4720,6 @@ static void Lnut(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ynut_sB; next[x][y] = Xblank; cave[x][y+1] = Ynut_s; @@ -4851,9 +4737,9 @@ static void Lnut(int x, int y) cave[x][y] = Ynut_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4885,8 +4771,8 @@ static void Lnut(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xkey_1: case Xkey_2: case Xkey_3: @@ -4949,9 +4835,8 @@ static void Lnut_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -4960,7 +4845,6 @@ static void Lnut_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Ynut_sB; next[x][y] = Xblank; cave[x][y+1] = Ynut_s; @@ -4978,9 +4862,9 @@ static void Lnut_pause(int x, int y) cave[x][y] = Ynut_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4996,9 +4880,8 @@ static void Lnut_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5007,7 +4890,6 @@ static void Lnut_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: cave[x][y] = Ynut_sB; next[x][y] = Xblank; @@ -5026,9 +4908,9 @@ static void Lnut_fall(int x, int y) cave[x][y] = Ynut_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5045,9 +4927,8 @@ static void Lspring(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5056,7 +4937,6 @@ static void Lspring(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: cave[x][y] = Yspring_sB; @@ -5076,9 +4956,9 @@ static void Lspring(int x, int y) cave[x][y] = Yspring_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5110,8 +4990,8 @@ static void Lspring(int x, int y) case Xball_2: case Xnut: case Xnut_pause: - case Xslidewall_ns: - case Xslidewall_ew: + case Xslide_ns: + case Xslide_ew: case Xkey_1: case Xkey_2: case Xkey_3: @@ -5202,9 +5082,8 @@ static void Lspring_pause(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5213,7 +5092,6 @@ static void Lspring_pause(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yspring_sB; next[x][y] = Xblank; cave[x][y+1] = Yspring_s; @@ -5231,9 +5109,9 @@ static void Lspring_pause(int x, int y) cave[x][y] = Yspring_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5249,9 +5127,8 @@ static void Lspring_e(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5260,7 +5137,6 @@ static void Lspring_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yspring_sB; next[x][y] = Xblank; cave[x][y+1] = Yspring_s; @@ -5278,9 +5154,9 @@ static void Lspring_e(int x, int y) cave[x][y] = Yspring_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5291,9 +5167,8 @@ static void Lspring_e(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5302,7 +5177,6 @@ static void Lspring_e(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Yalien_nB: case Yalien_eB: case Yalien_sB: @@ -5324,9 +5198,9 @@ static void Lspring_e(int x, int y) cave[x][y] = Yspring_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5364,9 +5238,8 @@ static void Lspring_w(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5375,7 +5248,6 @@ static void Lspring_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yspring_sB; next[x][y] = Xblank; cave[x][y+1] = Yspring_s; @@ -5393,9 +5265,9 @@ static void Lspring_w(int x, int y) cave[x][y] = Yspring_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5406,9 +5278,8 @@ static void Lspring_w(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5417,7 +5288,6 @@ static void Lspring_w(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Yalien_nB: case Yalien_eB: case Yalien_sB: @@ -5439,9 +5309,9 @@ static void Lspring_w(int x, int y) cave[x][y] = Yspring_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5479,9 +5349,8 @@ static void Lspring_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5490,7 +5359,6 @@ static void Lspring_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Zplayer: cave[x][y] = Yspring_sB; next[x][y] = Xblank; @@ -5509,9 +5377,9 @@ static void Lspring_fall(int x, int y) cave[x][y] = Yspring_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -5960,9 +5828,8 @@ static void Lballoon(int x, int y) switch (cave[x][y-1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -5971,7 +5838,6 @@ static void Lballoon(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yballoon_nB; next[x][y] = Xblank; cave[x][y-1] = Yballoon_n; @@ -5989,9 +5855,9 @@ static void Lballoon(int x, int y) cave[x][y] = Yballoon_nB; next[x][y] = Xblank; if (cave[x+1][y-2] == Xblank) - cave[x+1][y-2] = Xacid_splash_e; + cave[x+1][y-2] = Xsplash_e; if (cave[x-1][y-2] == Xblank) - cave[x-1][y-2] = Xacid_splash_w; + cave[x-1][y-2] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -6001,9 +5867,8 @@ static void Lballoon(int x, int y) switch (cave[x+1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6012,7 +5877,6 @@ static void Lballoon(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yballoon_eB; next[x][y] = Xblank; cave[x+1][y] = Yballoon_e; @@ -6030,9 +5894,9 @@ static void Lballoon(int x, int y) cave[x][y] = Yballoon_eB; next[x][y] = Xblank; if (cave[x+2][y-1] == Xblank) - cave[x+2][y-1] = Xacid_splash_e; + cave[x+2][y-1] = Xsplash_e; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_w; + cave[x][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -6042,9 +5906,8 @@ static void Lballoon(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6053,7 +5916,6 @@ static void Lballoon(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yballoon_sB; next[x][y] = Xblank; cave[x][y+1] = Yballoon_s; @@ -6071,9 +5933,9 @@ static void Lballoon(int x, int y) cave[x][y] = Yballoon_sB; next[x][y] = Xblank; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -6083,9 +5945,8 @@ static void Lballoon(int x, int y) switch (cave[x-1][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6094,7 +5955,6 @@ static void Lballoon(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Yballoon_wB; next[x][y] = Xblank; cave[x-1][y] = Yballoon_w; @@ -6112,9 +5972,9 @@ static void Lballoon(int x, int y) cave[x][y] = Yballoon_wB; next[x][y] = Xblank; if (cave[x][y-1] == Xblank) - cave[x][y-1] = Xacid_splash_e; + cave[x][y-1] = Xsplash_e; if (cave[x-2][y-1] == Xblank) - cave[x-2][y-1] = Xacid_splash_w; + cave[x-2][y-1] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; } @@ -6303,9 +6163,8 @@ static void Ldrip_fall(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6314,7 +6173,6 @@ static void Ldrip_fall(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xplant: case Yplant: case Zplayer: @@ -6335,9 +6193,9 @@ static void Ldrip_fall(int x, int y) cave[x][y] = Ydrip_1_sB; next[x][y] = Xdrip_stretchB; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -6417,9 +6275,8 @@ static void Lsand_stone(int x, int y) switch (cave[x][y+1]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6428,7 +6285,6 @@ static void Lsand_stone(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif cave[x][y] = Xsand_stonesand_quickout_1; next[x][y] = Xsand_stonesand_quickout_2; cave[x][y+1] = Xsand_stoneout_1; @@ -6446,9 +6302,9 @@ static void Lsand_stone(int x, int y) cave[x][y] = Xsand_stonesand_quickout_1; next[x][y] = Xsand_stonesand_quickout_2; if (cave[x+1][y] == Xblank) - cave[x+1][y] = Xacid_splash_e; + cave[x+1][y] = Xsplash_e; if (cave[x-1][y] == Xblank) - cave[x-1][y] = Xacid_splash_w; + cave[x-1][y] = Xsplash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -6531,7 +6387,6 @@ static void Lsand_stoneout_2(int x, int y) next[x][y] = Xstone_fall; } -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS static void Lsand_stonesand_quickout_1(int x, int y) { next[x][y] = Xsand_stonesand_quickout_2; @@ -6541,39 +6396,38 @@ static void Lsand_stonesand_quickout_2(int x, int y) { next[x][y] = Xsand; } -#endif -static void Lslidewall_ns(int x, int y) +static void Lslide_ns(int x, int y) { if (tab_blank[cave[x][y-1]]) { - cave[x][y-1] = Yslidewall_ns_blank; - next[x][y-1] = Xslidewall_ns; - play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns); + cave[x][y-1] = Yslide_ns_blank; + next[x][y-1] = Xslide_ns; + play_element_sound(x, y, SOUND_slide, Xslide_ns); } if (tab_blank[cave[x][y+1]]) { - cave[x][y+1] = Yslidewall_ns_blank; - next[x][y+1] = Xslidewall_ns; - play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns); + cave[x][y+1] = Yslide_ns_blank; + next[x][y+1] = Xslide_ns; + play_element_sound(x, y, SOUND_slide, Xslide_ns); } } -static void Lslidewall_ew(int x, int y) +static void Lslide_ew(int x, int y) { if (tab_blank[cave[x+1][y]]) { - cave[x+1][y] = Yslidewall_ew_blank; - next[x+1][y] = Xslidewall_ew; - play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew); + cave[x+1][y] = Yslide_ew_blank; + next[x+1][y] = Xslide_ew; + play_element_sound(x, y, SOUND_slide, Xslide_ew); } if (tab_blank[cave[x-1][y]]) { - cave[x-1][y] = Yslidewall_ew_blank; - next[x-1][y] = Xslidewall_ew; - play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew); + cave[x-1][y] = Yslide_ew_blank; + next[x-1][y] = Xslide_ew; + play_element_sound(x, y, SOUND_slide, Xslide_ew); } } @@ -6628,9 +6482,8 @@ static void Lamoeba(int x, int y) switch (cave[x][y]) { case Xblank: - case Xacid_splash_e: - case Xacid_splash_w: -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS + case Xsplash_e: + case Xsplash_w: case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -6639,7 +6492,6 @@ static void Lamoeba(int x, int y) case Xfake_acid_6: case Xfake_acid_7: case Xfake_acid_8: -#endif case Xgrass: case Xdirt: case Xsand: @@ -6721,7 +6573,6 @@ static void handle_tile(int x, int y) case Xacid_7: Lacid_7(x, y); break; case Xacid_8: Lacid_8(x, y); break; -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: Lfake_acid_1(x, y); break; case Xfake_acid_2: Lfake_acid_2(x, y); break; case Xfake_acid_3: Lfake_acid_3(x, y); break; @@ -6730,7 +6581,6 @@ static void handle_tile(int x, int y) case Xfake_acid_6: Lfake_acid_6(x, y); break; case Xfake_acid_7: Lfake_acid_7(x, y); break; case Xfake_acid_8: Lfake_acid_8(x, y); break; -#endif case Xandroid: Landroid(x, y); break; case Xandroid_1_n: Landroid_1_n(x, y); break; @@ -6856,13 +6706,11 @@ static void handle_tile(int x, int y) case Xsand_stonesand_4: Lsand_stonesand_4(x, y); break; case Xsand_stoneout_1: Lsand_stoneout_1(x, y); break; case Xsand_stoneout_2: Lsand_stoneout_2(x, y); break; -#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xsand_stonesand_quickout_1: Lsand_stonesand_quickout_1(x, y); break; case Xsand_stonesand_quickout_2: Lsand_stonesand_quickout_2(x, y); break; -#endif - case Xslidewall_ns: Lslidewall_ns(x, y); break; - case Xslidewall_ew: Lslidewall_ew(x, y); break; + case Xslide_ns: Lslide_ns(x, y); break; + case Xslide_ew: Lslide_ew(x, y); break; case Xexit: Lexit(x, y); break; case Xexit_1: Lexit_1(x, y); break;