X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Fsynchro_2.c;h=7ed2bfbd93934b630cd8b5f88ce462e78eb6a763;hb=a4c71d580965e41a96f02d4014357a941eeef2fb;hp=eb202c7c302baecbabacb5b46310ee359079f2df;hpb=cbf66a1454146de5eef392444694d5020d1140cb;p=rocksndiamonds.git diff --git a/src/game_em/synchro_2.c b/src/game_em/synchro_2.c index eb202c7c..7ed2bfbd 100644 --- a/src/game_em/synchro_2.c +++ b/src/game_em/synchro_2.c @@ -13,11 +13,47 @@ #define SPRING_ROLL /* spring rolling off round things continues to roll */ -#define RANDOM (random_em = random_em << 31 | random_em >> 1) +#define RANDOM_RAW (seed = seed << 31 | seed >> 1) +#define RANDOM(x) (RANDOM_RAW & (x - 1)) -static unsigned int random_em; +static unsigned int seed; static int score; +static void Lboom_bug(int x, int y) +{ + Next[x][y] = Znormal; + Boom[x-1][y-1] = Xemerald; + Boom[x][y-1] = Xemerald; + Boom[x+1][y-1] = Xemerald; + Boom[x-1][y] = Xemerald; + Boom[x][y] = Xdiamond; + Boom[x+1][y] = Xemerald; + Boom[x-1][y+1] = Xemerald; + Boom[x][y+1] = Xemerald; + Boom[x+1][y+1] = Xemerald; + +#if PLAY_ELEMENT_SOUND + play_element_sound(x, y, SOUND_boom, element); +#endif +} + +static void Lboom_tank(int x, int y) +{ + Next[x][y] = Znormal; + Boom[x-1][y-1] = Xblank; + Boom[x][y-1] = Xblank; + Boom[x+1][y-1] = Xblank; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; +#if PLAY_ELEMENT_SOUND + play_element_sound(x, y, SOUND_boom, element); +#endif +} + static void set_nearest_player_xy(int x, int y, int *dx, int *dy) { int distance, distance_shortest = EM_MAX_CAVE_WIDTH + EM_MAX_CAVE_HEIGHT; @@ -44,243 +80,290 @@ static void set_nearest_player_xy(int x, int y, int *dx, int *dy) } } -static void Lboom_bug(int x, int y) +static void Lacid_1(int x, int y) { - Next[y][x] = Znormal; - Boom[y-1][x-1] = Xemerald; - Boom[y-1][x] = Xemerald; - Boom[y-1][x+1] = Xemerald; - Boom[y][x-1] = Xemerald; - Boom[y][x] = Xdiamond; - Boom[y][x+1] = Xemerald; - Boom[y+1][x-1] = Xemerald; - Boom[y+1][x] = Xemerald; - Boom[y+1][x+1] = Xemerald; + Next[x][y] = Xacid_2; +} -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SOUND_boom, element); -#endif +static void Lacid_2(int x, int y) +{ + Next[x][y] = Xacid_3; } -static void Lboom_tank(int x, int y) +static void Lacid_3(int x, int y) { - Next[y][x] = Znormal; - Boom[y-1][x-1] = Xblank; - Boom[y-1][x] = Xblank; - Boom[y-1][x+1] = Xblank; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; -#if PLAY_ELEMENT_SOUND - play_element_sound(x, y, SOUND_boom, element); -#endif + Next[x][y] = Xacid_4; +} + +static void Lacid_4(int x, int y) +{ + Next[x][y] = Xacid_5; +} + +static void Lacid_5(int x, int y) +{ + Next[x][y] = Xacid_6; +} + +static void Lacid_6(int x, int y) +{ + Next[x][y] = Xacid_7; +} + +static void Lacid_7(int x, int y) +{ + Next[x][y] = Xacid_8; +} + +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; +} + +static void Lfake_acid_2(int x, int y) +{ + Next[x][y] = Xfake_acid_3; } +static void Lfake_acid_3(int x, int y) +{ + Next[x][y] = Xfake_acid_4; +} + +static void Lfake_acid_4(int x, int y) +{ + Next[x][y] = Xfake_acid_5; +} + +static void Lfake_acid_5(int x, int y) +{ + Next[x][y] = Xfake_acid_6; +} + +static void Lfake_acid_6(int x, int y) +{ + Next[x][y] = Xfake_acid_7; +} + +static void Lfake_acid_7(int x, int y) +{ + Next[x][y] = Xfake_acid_8; +} + +static void Lfake_acid_8(int x, int y) +{ + Next[x][y] = Xfake_acid_1; +} +#endif + static void Landroid(int x, int y) { int dx, dy, temp; if (lev.android_clone_cnt == 0) { - if (Cave[y-1][x-1] != Xblank && - Cave[y-1][x] != Xblank && - Cave[y-1][x+1] != Xblank && - Cave[y][x-1] != Xblank && - Cave[y][x+1] != Xblank && - Cave[y+1][x-1] != Xblank && - Cave[y+1][x] != Xblank && - Cave[y+1][x+1] != Xblank) + if (Cave[x-1][y-1] != Xblank && + Cave[x][y-1] != Xblank && + Cave[x+1][y-1] != Xblank && + Cave[x-1][y] != Xblank && + Cave[x+1][y] != Xblank && + Cave[x-1][y+1] != Xblank && + Cave[x][y+1] != Xblank && + Cave[x+1][y+1] != Xblank) goto android_move; - switch (RANDOM & 7) + switch (RANDOM(8)) { /* randomly find an object to clone */ case 0: /* S,NE,W,NW,SE,E,SW,N */ - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; goto android_move; case 1: /* NW,SE,N,S,NE,SW,E,W */ - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; goto android_move; case 2: /* SW,E,S,W,N,NW,SE,NE */ - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; goto android_move; case 3: /* N,SE,NE,E,W,S,NW,SW */ - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; goto android_move; case 4: /* SE,NW,E,NE,SW,W,N,S */ - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; goto android_move; case 5: /* NE,W,SE,SW,S,N,E,NW */ - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; goto android_move; case 6: /* E,N,SW,S,NW,NE,SE,W */ - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; goto android_move; case 7: /* W,SW,NW,N,E,SE,NE,S */ - temp = lev.android_array[Cave[y][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x-1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y-1][x+1]]; if (temp != Xblank) break; - temp = lev.android_array[Cave[y+1][x]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x-1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y+1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x+1][y-1]]; if (temp != Xblank) break; + temp = lev.android_array[Cave[x][y+1]]; if (temp != Xblank) break; goto android_move; } - Next[y][x] = temp; /* the item we chose to clone */ + Next[x][y] = temp; /* the item we chose to clone */ play_element_sound(x, y, SOUND_android_clone, temp); - switch (RANDOM & 7) + switch (RANDOM(8)) { /* randomly find a direction to move */ case 0: /* S,NE,W,NW,SE,E,SW,N */ - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y-1][x] == Xblank) goto android_n; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x][y-1] == Xblank) goto android_n; goto android_move; case 1: /* NW,SE,N,S,NE,SW,E,W */ - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y][x-1] == Xblank) goto android_w; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x-1][y] == Xblank) goto android_w; goto android_move; case 2: /* SW,E,S,W,N,NW,SE,NE */ - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y-1][x+1] == Xblank) goto android_ne; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x+1][y-1] == Xblank) goto android_ne; goto android_move; case 3: /* N,SE,NE,E,W,S,NW,SW */ - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y+1][x-1] == Xblank) goto android_sw; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x-1][y+1] == Xblank) goto android_sw; goto android_move; case 4: /* SE,NW,E,NE,SW,W,N,S */ - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y+1][x] == Xblank) goto android_s; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x][y+1] == Xblank) goto android_s; goto android_move; case 5: /* NE,W,SE,SW,S,N,E,NW */ - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y-1][x-1] == Xblank) goto android_nw; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x-1][y-1] == Xblank) goto android_nw; goto android_move; case 6: /* E,N,SW,S,NW,NE,SE,W */ - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y+1][x] == Xblank) goto android_s; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y][x-1] == Xblank) goto android_w; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x][y+1] == Xblank) goto android_s; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x-1][y] == Xblank) goto android_w; goto android_move; case 7: /* W,SW,NW,N,E,SE,NE,S */ - if (Cave[y][x-1] == Xblank) goto android_w; - if (Cave[y+1][x-1] == Xblank) goto android_sw; - if (Cave[y-1][x-1] == Xblank) goto android_nw; - if (Cave[y-1][x] == Xblank) goto android_n; - if (Cave[y][x+1] == Xblank) goto android_e; - if (Cave[y+1][x+1] == Xblank) goto android_se; - if (Cave[y-1][x+1] == Xblank) goto android_ne; - if (Cave[y+1][x] == Xblank) goto android_s; + if (Cave[x-1][y] == Xblank) goto android_w; + if (Cave[x-1][y+1] == Xblank) goto android_sw; + if (Cave[x-1][y-1] == Xblank) goto android_nw; + if (Cave[x][y-1] == Xblank) goto android_n; + if (Cave[x+1][y] == Xblank) goto android_e; + if (Cave[x+1][y+1] == Xblank) goto android_se; + if (Cave[x+1][y-1] == Xblank) goto android_ne; + if (Cave[x][y+1] == Xblank) goto android_s; goto android_move; } } @@ -288,76 +371,76 @@ static void Landroid(int x, int y) android_move: if (lev.android_move_cnt == 0) { - if (Cave[y-1][x-1] == Zplayer || - Cave[y-1][x] == Zplayer || - Cave[y-1][x+1] == Zplayer || - Cave[y][x-1] == Zplayer || - Cave[y][x+1] == Zplayer || - Cave[y+1][x-1] == Zplayer || - Cave[y+1][x] == Zplayer || - Cave[y+1][x+1] == Zplayer) + if (Cave[x-1][y-1] == Zplayer || + Cave[x][y-1] == Zplayer || + Cave[x+1][y-1] == Zplayer || + Cave[x-1][y] == Zplayer || + Cave[x+1][y] == Zplayer || + Cave[x-1][y+1] == Zplayer || + Cave[x][y+1] == Zplayer || + Cave[x+1][y+1] == Zplayer) goto android_still; set_nearest_player_xy(x, y, &dx, &dy); - Next[y][x] = Xblank; /* assume we will move */ + Next[x][y] = Xblank; /* assume we will move */ temp = ((x < dx) + 1 - (x > dx)) + ((y < dy) + 1 - (y > dy)) * 3; - if (RANDOM & 1) + if (RANDOM(2)) { switch (temp) { /* attempt clockwise move first if direct path is blocked */ case 0: /* north west */ - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; - if (tab_android_move[Cave[y-1][x]]) goto android_n; - if (tab_android_move[Cave[y][x-1]]) goto android_w; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; + if (tab_android_move[Cave[x][y-1]]) goto android_n; + if (tab_android_move[Cave[x-1][y]]) goto android_w; break; case 1: /* north */ - if (tab_android_move[Cave[y-1][x]]) goto android_n; - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; + if (tab_android_move[Cave[x][y-1]]) goto android_n; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; break; case 2: /* north east */ - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; - if (tab_android_move[Cave[y][x+1]]) goto android_e; - if (tab_android_move[Cave[y-1][x]]) goto android_n; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; + if (tab_android_move[Cave[x+1][y]]) goto android_e; + if (tab_android_move[Cave[x][y-1]]) goto android_n; break; case 3: /* west */ - if (tab_android_move[Cave[y][x-1]]) goto android_w; - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; + if (tab_android_move[Cave[x-1][y]]) goto android_w; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; break; case 4: /* nowhere */ break; case 5: /* east */ - if (tab_android_move[Cave[y][x+1]]) goto android_e; - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; + if (tab_android_move[Cave[x+1][y]]) goto android_e; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; break; case 6: /* south west */ - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; - if (tab_android_move[Cave[y][x-1]]) goto android_w; - if (tab_android_move[Cave[y+1][x]]) goto android_s; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; + if (tab_android_move[Cave[x-1][y]]) goto android_w; + if (tab_android_move[Cave[x][y+1]]) goto android_s; break; case 7: /* south */ - if (tab_android_move[Cave[y+1][x]]) goto android_s; - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; + if (tab_android_move[Cave[x][y+1]]) goto android_s; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; break; case 8: /* south east */ - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; - if (tab_android_move[Cave[y+1][x]]) goto android_s; - if (tab_android_move[Cave[y][x+1]]) goto android_e; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; + if (tab_android_move[Cave[x][y+1]]) goto android_s; + if (tab_android_move[Cave[x+1][y]]) goto android_e; break; } } @@ -368,123 +451,123 @@ static void Landroid(int x, int y) /* attempt counterclockwise move first if direct path is blocked */ case 0: /* north west */ - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; - if (tab_android_move[Cave[y][x-1]]) goto android_w; - if (tab_android_move[Cave[y-1][x]]) goto android_n; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; + if (tab_android_move[Cave[x-1][y]]) goto android_w; + if (tab_android_move[Cave[x][y-1]]) goto android_n; break; case 1: /* north */ - if (tab_android_move[Cave[y-1][x]]) goto android_n; - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; + if (tab_android_move[Cave[x][y-1]]) goto android_n; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; break; case 2: /* north east */ - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; - if (tab_android_move[Cave[y-1][x]]) goto android_n; - if (tab_android_move[Cave[y][x+1]]) goto android_e; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; + if (tab_android_move[Cave[x][y-1]]) goto android_n; + if (tab_android_move[Cave[x+1][y]]) goto android_e; break; case 3: /* west */ - if (tab_android_move[Cave[y][x-1]]) goto android_w; - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; - if (tab_android_move[Cave[y-1][x-1]]) goto android_nw; + if (tab_android_move[Cave[x-1][y]]) goto android_w; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; + if (tab_android_move[Cave[x-1][y-1]]) goto android_nw; break; case 4: /* nowhere */ break; case 5: /* east */ - if (tab_android_move[Cave[y][x+1]]) goto android_e; - if (tab_android_move[Cave[y-1][x+1]]) goto android_ne; - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; + if (tab_android_move[Cave[x+1][y]]) goto android_e; + if (tab_android_move[Cave[x+1][y-1]]) goto android_ne; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; break; case 6: /* south west */ - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; - if (tab_android_move[Cave[y+1][x]]) goto android_s; - if (tab_android_move[Cave[y][x-1]]) goto android_w; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; + if (tab_android_move[Cave[x][y+1]]) goto android_s; + if (tab_android_move[Cave[x-1][y]]) goto android_w; break; case 7: /* south */ - if (tab_android_move[Cave[y+1][x]]) goto android_s; - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; - if (tab_android_move[Cave[y+1][x-1]]) goto android_sw; + if (tab_android_move[Cave[x][y+1]]) goto android_s; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; + if (tab_android_move[Cave[x-1][y+1]]) goto android_sw; break; case 8: /* south east */ - if (tab_android_move[Cave[y+1][x+1]]) goto android_se; - if (tab_android_move[Cave[y][x+1]]) goto android_e; - if (tab_android_move[Cave[y+1][x]]) goto android_s; + if (tab_android_move[Cave[x+1][y+1]]) goto android_se; + if (tab_android_move[Cave[x+1][y]]) goto android_e; + if (tab_android_move[Cave[x][y+1]]) goto android_s; break; } } } android_still: - Next[y][x] = Xandroid; + Next[x][y] = Xandroid; return; android_n: - Cave[y][x] = Yandroid_nB; - Cave[y-1][x] = Yandroid_n; - Next[y-1][x] = Xandroid; + Cave[x][y] = Yandroid_nB; + Cave[x][y-1] = Yandroid_n; + Next[x][y-1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_ne: - Cave[y][x] = Yandroid_neB; - Cave[y-1][x+1] = Yandroid_ne; - Next[y-1][x+1] = Xandroid; + Cave[x][y] = Yandroid_neB; + Cave[x+1][y-1] = Yandroid_ne; + Next[x+1][y-1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_e: - Cave[y][x] = Yandroid_eB; - Cave[y][x+1] = Yandroid_e; - Next[y][x+1] = Xandroid; + Cave[x][y] = Yandroid_eB; + Cave[x+1][y] = Yandroid_e; + Next[x+1][y] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_se: - Cave[y][x] = Yandroid_seB; - Cave[y+1][x+1] = Yandroid_se; - Next[y+1][x+1] = Xandroid; + Cave[x][y] = Yandroid_seB; + Cave[x+1][y+1] = Yandroid_se; + Next[x+1][y+1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_s: - Cave[y][x] = Yandroid_sB; - Cave[y+1][x] = Yandroid_s; - Next[y+1][x] = Xandroid; + Cave[x][y] = Yandroid_sB; + Cave[x][y+1] = Yandroid_s; + Next[x][y+1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_sw: - Cave[y][x] = Yandroid_swB; - Cave[y+1][x-1] = Yandroid_sw; - Next[y+1][x-1] = Xandroid; + Cave[x][y] = Yandroid_swB; + Cave[x-1][y+1] = Yandroid_sw; + Next[x-1][y+1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_w: - Cave[y][x] = Yandroid_wB; - Cave[y][x-1] = Yandroid_w; - Next[y][x-1] = Xandroid; + Cave[x][y] = Yandroid_wB; + Cave[x-1][y] = Yandroid_w; + Next[x-1][y] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; android_nw: - Cave[y][x] = Yandroid_nwB; - Cave[y-1][x-1] = Yandroid_nw; - Next[y-1][x-1] = Xandroid; + Cave[x][y] = Yandroid_nwB; + Cave[x-1][y-1] = Yandroid_nw; + Next[x-1][y-1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid); return; } static void Landroid_1_n(int x, int y) { - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -494,22 +577,22 @@ static void Landroid_1_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_nB; - Cave[y-1][x] = Yandroid_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xandroid; + Cave[x][y] = Yandroid_nB; + Cave[x][y-1] = Yandroid_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid_1_n); return; @@ -521,7 +604,7 @@ static void Landroid_1_n(int x, int y) static void Landroid_2_n(int x, int y) { - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -531,22 +614,22 @@ static void Landroid_2_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_nB; - Cave[y-1][x] = Yandroid_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xandroid_1_n; + Cave[x][y] = Yandroid_nB; + Cave[x][y-1] = Yandroid_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xandroid_1_n; play_element_sound(x, y, SOUND_android_move, Xandroid_2_n); return; @@ -558,7 +641,7 @@ static void Landroid_2_n(int x, int y) static void Landroid_1_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -568,22 +651,22 @@ static void Landroid_1_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_eB; - Cave[y][x+1] = Yandroid_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xandroid; + Cave[x][y] = Yandroid_eB; + Cave[x+1][y] = Yandroid_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid_1_e); return; @@ -595,7 +678,7 @@ static void Landroid_1_e(int x, int y) static void Landroid_2_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -605,22 +688,22 @@ static void Landroid_2_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_eB; - Cave[y][x+1] = Yandroid_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xandroid_1_e; + Cave[x][y] = Yandroid_eB; + Cave[x+1][y] = Yandroid_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xandroid_1_e; play_element_sound(x, y, SOUND_android_move, Xandroid_2_e); return; @@ -632,7 +715,7 @@ static void Landroid_2_e(int x, int y) static void Landroid_1_s(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -642,22 +725,22 @@ static void Landroid_1_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_sB; - Cave[y+1][x] = Yandroid_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xandroid; + Cave[x][y] = Yandroid_sB; + Cave[x][y+1] = Yandroid_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid_1_s); return; @@ -669,7 +752,7 @@ static void Landroid_1_s(int x, int y) static void Landroid_2_s(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -679,22 +762,22 @@ static void Landroid_2_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_sB; - Cave[y+1][x] = Yandroid_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xandroid_1_s; + Cave[x][y] = Yandroid_sB; + Cave[x][y+1] = Yandroid_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xandroid_1_s; play_element_sound(x, y, SOUND_android_move, Xandroid_2_s); return; @@ -706,7 +789,7 @@ static void Landroid_2_s(int x, int y) static void Landroid_1_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -716,22 +799,22 @@ static void Landroid_1_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_wB; - Cave[y][x-1] = Yandroid_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xandroid; + Cave[x][y] = Yandroid_wB; + Cave[x-1][y] = Yandroid_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xandroid; play_element_sound(x, y, SOUND_android_move, Xandroid_1_w); return; @@ -743,7 +826,7 @@ static void Landroid_1_w(int x, int y) static void Landroid_2_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -753,22 +836,22 @@ static void Landroid_2_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yandroid_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yandroid_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yandroid_wB; - Cave[y][x-1] = Yandroid_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xandroid_1_w; + Cave[x][y] = Yandroid_wB; + Cave[x-1][y] = Yandroid_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xandroid_1_w; play_element_sound(x, y, SOUND_android_move, Xandroid_1_w); return; @@ -780,39 +863,39 @@ static void Landroid_2_w(int x, int y) static void Leater_n(int x, int y) { - if (Cave[y][x+1] == Xdiamond) + if (Cave[x+1][y] == Xdiamond) { - Cave[y][x+1] = Ydiamond_blank; - Next[y][x+1] = Xblank; + Cave[x+1][y] = Ydiamond_blank; + Next[x+1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_n); return; } - if (Cave[y+1][x] == Xdiamond) + if (Cave[x][y+1] == Xdiamond) { - Cave[y+1][x] = Ydiamond_blank; - Next[y+1][x] = Xblank; + Cave[x][y+1] = Ydiamond_blank; + Next[x][y+1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_n); return; } - if (Cave[y][x-1] == Xdiamond) + if (Cave[x-1][y] == Xdiamond) { - Cave[y][x-1] = Ydiamond_blank; - Next[y][x-1] = Xblank; + Cave[x-1][y] = Ydiamond_blank; + Next[x-1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_n); return; } - if (Cave[y-1][x] == Xdiamond) + if (Cave[x][y-1] == Xdiamond) { - Cave[y-1][x] = Ydiamond_blank; - Next[y-1][x] = Xblank; + Cave[x][y-1] = Ydiamond_blank; + Next[x][y-1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_n); return; } - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -822,12 +905,12 @@ static void Leater_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yeater_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yeater_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -837,14 +920,14 @@ static void Leater_n(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yeater_nB; - Cave[y-1][x] = Yeater_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xeater_n; + Cave[x][y] = Yeater_nB; + Cave[x][y-1] = Yeater_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xeater_n; return; default: - Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w; + Next[x][y] = RANDOM(2) ? Xeater_e : Xeater_w; play_element_sound(x, y, SOUND_eater, Xeater_n); return; } @@ -852,39 +935,39 @@ static void Leater_n(int x, int y) static void Leater_e(int x, int y) { - if (Cave[y+1][x] == Xdiamond) + if (Cave[x][y+1] == Xdiamond) { - Cave[y+1][x] = Ydiamond_blank; - Next[y+1][x] = Xblank; + Cave[x][y+1] = Ydiamond_blank; + Next[x][y+1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_e); return; } - if (Cave[y][x-1] == Xdiamond) + if (Cave[x-1][y] == Xdiamond) { - Cave[y][x-1] = Ydiamond_blank; - Next[y][x-1] = Xblank; + Cave[x-1][y] = Ydiamond_blank; + Next[x-1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_e); return; } - if (Cave[y-1][x] == Xdiamond) + if (Cave[x][y-1] == Xdiamond) { - Cave[y-1][x] = Ydiamond_blank; - Next[y-1][x] = Xblank; + Cave[x][y-1] = Ydiamond_blank; + Next[x][y-1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_e); return; } - if (Cave[y][x+1] == Xdiamond) + if (Cave[x+1][y] == Xdiamond) { - Cave[y][x+1] = Ydiamond_blank; - Next[y][x+1] = Xblank; + Cave[x+1][y] = Ydiamond_blank; + Next[x+1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_e); return; } - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -894,12 +977,12 @@ static void Leater_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yeater_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yeater_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -909,14 +992,14 @@ static void Leater_e(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yeater_eB; - Cave[y][x+1] = Yeater_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xeater_e; + Cave[x][y] = Yeater_eB; + Cave[x+1][y] = Yeater_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xeater_e; return; default: - Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s; + Next[x][y] = RANDOM(2) ? Xeater_n : Xeater_s; play_element_sound(x, y, SOUND_eater, Xeater_e); return; } @@ -924,39 +1007,39 @@ static void Leater_e(int x, int y) static void Leater_s(int x, int y) { - if (Cave[y][x-1] == Xdiamond) + if (Cave[x-1][y] == Xdiamond) { - Cave[y][x-1] = Ydiamond_blank; - Next[y][x-1] = Xblank; + Cave[x-1][y] = Ydiamond_blank; + Next[x-1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_s); return; } - if (Cave[y-1][x] == Xdiamond) + if (Cave[x][y-1] == Xdiamond) { - Cave[y-1][x] = Ydiamond_blank; - Next[y-1][x] = Xblank; + Cave[x][y-1] = Ydiamond_blank; + Next[x][y-1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_s); return; } - if (Cave[y][x+1] == Xdiamond) + if (Cave[x+1][y] == Xdiamond) { - Cave[y][x+1] = Ydiamond_blank; - Next[y][x+1] = Xblank; + Cave[x+1][y] = Ydiamond_blank; + Next[x+1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_s); return; } - if (Cave[y+1][x] == Xdiamond) + if (Cave[x][y+1] == Xdiamond) { - Cave[y+1][x] = Ydiamond_blank; - Next[y+1][x] = Xblank; + Cave[x][y+1] = Ydiamond_blank; + Next[x][y+1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_s); return; } - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -966,12 +1049,12 @@ static void Leater_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yeater_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yeater_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -981,14 +1064,14 @@ static void Leater_s(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yeater_sB; - Cave[y+1][x] = Yeater_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xeater_s; + Cave[x][y] = Yeater_sB; + Cave[x][y+1] = Yeater_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xeater_s; return; default: - Next[y][x] = RANDOM & 1 ? Xeater_e : Xeater_w; + Next[x][y] = RANDOM(2) ? Xeater_e : Xeater_w; play_element_sound(x, y, SOUND_eater, Xeater_s); return; } @@ -996,39 +1079,39 @@ static void Leater_s(int x, int y) static void Leater_w(int x, int y) { - if (Cave[y-1][x] == Xdiamond) + if (Cave[x][y-1] == Xdiamond) { - Cave[y-1][x] = Ydiamond_blank; - Next[y-1][x] = Xblank; + Cave[x][y-1] = Ydiamond_blank; + Next[x][y-1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_w); return; } - if (Cave[y][x+1] == Xdiamond) + if (Cave[x+1][y] == Xdiamond) { - Cave[y][x+1] = Ydiamond_blank; - Next[y][x+1] = Xblank; + Cave[x+1][y] = Ydiamond_blank; + Next[x+1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_w); return; } - if (Cave[y+1][x] == Xdiamond) + if (Cave[x][y+1] == Xdiamond) { - Cave[y+1][x] = Ydiamond_blank; - Next[y+1][x] = Xblank; + Cave[x][y+1] = Ydiamond_blank; + Next[x][y+1] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_w); return; } - if (Cave[y][x-1] == Xdiamond) + if (Cave[x-1][y] == Xdiamond) { - Cave[y][x-1] = Ydiamond_blank; - Next[y][x-1] = Xblank; + Cave[x-1][y] = Ydiamond_blank; + Next[x-1][y] = Xblank; play_element_sound(x, y, SOUND_eater_eat, Xeater_w); return; } - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -1038,12 +1121,12 @@ static void Leater_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yeater_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yeater_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1053,14 +1136,14 @@ static void Leater_w(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yeater_wB; - Cave[y][x-1] = Yeater_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xeater_w; + Cave[x][y] = Yeater_wB; + Cave[x-1][y] = Yeater_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xeater_w; return; default: - Next[y][x] = RANDOM & 1 ? Xeater_n : Xeater_s; + Next[x][y] = RANDOM(2) ? Xeater_n : Xeater_s; play_element_sound(x, y, SOUND_eater, Xeater_w); return; } @@ -1080,11 +1163,11 @@ static void Lalien(int x, int y) set_nearest_player_xy(x, y, &dx, &dy); } - if (RANDOM & 1) + if (RANDOM(2)) { if (y > dy) { - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -1094,12 +1177,12 @@ static void Lalien(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yalien_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yalien_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1109,17 +1192,17 @@ static void Lalien(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yalien_nB; - Cave[y-1][x] = Yalien_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xalien_pause; + Cave[x][y] = Yalien_nB; + Cave[x][y-1] = Yalien_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xalien_pause; play_element_sound(x, y, SOUND_alien, Xalien); return; } } else if (y < dy) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -1129,12 +1212,12 @@ static void Lalien(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yalien_sB; - Next[y][x] = Xblank; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; + Cave[x][y] = Yalien_sB; + Next[x][y] = Xblank; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1144,10 +1227,10 @@ static void Lalien(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yalien_sB; - Cave[y+1][x] = Yalien_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xalien_pause; + Cave[x][y] = Yalien_sB; + Cave[x][y+1] = Yalien_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xalien_pause; play_element_sound(x, y, SOUND_alien, Xalien); return; } @@ -1157,7 +1240,7 @@ static void Lalien(int x, int y) { if (x < dx) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -1167,12 +1250,12 @@ static void Lalien(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yalien_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yalien_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1182,17 +1265,17 @@ static void Lalien(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yalien_eB; - Cave[y][x+1] = Yalien_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xalien_pause; + Cave[x][y] = Yalien_eB; + Cave[x+1][y] = Yalien_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xalien_pause; play_element_sound(x, y, SOUND_alien, Xalien); return; } } else if (x > dx) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -1202,12 +1285,12 @@ static void Lalien(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yalien_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yalien_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1217,10 +1300,10 @@ static void Lalien(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Yalien_wB; - Cave[y][x-1] = Yalien_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xalien_pause; + Cave[x][y] = Yalien_wB; + Cave[x-1][y] = Yalien_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xalien_pause; play_element_sound(x, y, SOUND_alien, Xalien); return; } @@ -1230,12 +1313,12 @@ static void Lalien(int x, int y) static void Lalien_pause(int x, int y) { - Next[y][x] = Xalien; + Next[x][y] = Xalien; } static void Lbug_n(int x, int y) { - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -1245,12 +1328,12 @@ static void Lbug_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybug_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybug_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1260,16 +1343,16 @@ static void Lbug_n(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ybug_nB; - Cave[y-1][x] = Ybug_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xbug_1_n; + Cave[x][y] = Ybug_nB; + Cave[x][y-1] = Ybug_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xbug_1_n; play_element_sound(x, y, SOUND_bug, Xbug_1_n); return; default: - Cave[y][x] = Ybug_n_w; - Next[y][x] = Xbug_2_w; + Cave[x][y] = Ybug_n_w; + Next[x][y] = Xbug_2_w; play_element_sound(x, y, SOUND_bug, Xbug_1_n); return; } @@ -1277,17 +1360,17 @@ static void Lbug_n(int x, int y) static void Lbug_1_n(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); return; } - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xblank: case Xacid_splash_e: @@ -1303,8 +1386,8 @@ static void Lbug_1_n(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ybug_n_e; - Next[y][x] = Xbug_2_e; + Cave[x][y] = Ybug_n_e; + Next[x][y] = Xbug_2_e; play_element_sound(x, y, SOUND_bug, Xbug_1_n); return; @@ -1316,10 +1399,10 @@ static void Lbug_1_n(int x, int y) static void Lbug_2_n(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); @@ -1331,7 +1414,7 @@ static void Lbug_2_n(int x, int y) static void Lbug_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -1341,12 +1424,12 @@ static void Lbug_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybug_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybug_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1356,16 +1439,16 @@ static void Lbug_e(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ybug_eB; - Cave[y][x+1] = Ybug_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xbug_1_e; + Cave[x][y] = Ybug_eB; + Cave[x+1][y] = Ybug_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xbug_1_e; play_element_sound(x, y, SOUND_bug, Xbug_1_e); return; default: - Cave[y][x] = Ybug_e_n; - Next[y][x] = Xbug_2_n; + Cave[x][y] = Ybug_e_n; + Next[x][y] = Xbug_2_n; play_element_sound(x, y, SOUND_bug, Xbug_1_e); return; } @@ -1373,17 +1456,17 @@ static void Lbug_e(int x, int y) static void Lbug_1_e(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); return; } - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xblank: case Xacid_splash_e: @@ -1399,8 +1482,8 @@ static void Lbug_1_e(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ybug_e_s; - Next[y][x] = Xbug_2_s; + Cave[x][y] = Ybug_e_s; + Next[x][y] = Xbug_2_s; play_element_sound(x, y, SOUND_bug, Xbug_1_e); return; @@ -1412,10 +1495,10 @@ static void Lbug_1_e(int x, int y) static void Lbug_2_e(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); @@ -1427,7 +1510,7 @@ static void Lbug_2_e(int x, int y) static void Lbug_s(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -1437,12 +1520,12 @@ static void Lbug_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybug_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybug_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1452,16 +1535,16 @@ static void Lbug_s(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ybug_sB; - Cave[y+1][x] = Ybug_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xbug_1_s; + Cave[x][y] = Ybug_sB; + Cave[x][y+1] = Ybug_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xbug_1_s; play_element_sound(x, y, SOUND_bug, Xbug_1_s); return; default: - Cave[y][x] = Ybug_s_e; - Next[y][x] = Xbug_2_e; + Cave[x][y] = Ybug_s_e; + Next[x][y] = Xbug_2_e; play_element_sound(x, y, SOUND_bug, Xbug_1_s); return; } @@ -1469,17 +1552,17 @@ static void Lbug_s(int x, int y) static void Lbug_1_s(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); return; } - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xblank: case Xacid_splash_e: @@ -1495,8 +1578,8 @@ static void Lbug_1_s(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ybug_s_w; - Next[y][x] = Xbug_2_w; + Cave[x][y] = Ybug_s_w; + Next[x][y] = Xbug_2_w; play_element_sound(x, y, SOUND_bug, Xbug_1_s); return; @@ -1508,10 +1591,10 @@ static void Lbug_1_s(int x, int y) static void Lbug_2_s(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); @@ -1523,7 +1606,7 @@ static void Lbug_2_s(int x, int y) static void Lbug_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -1533,12 +1616,12 @@ static void Lbug_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybug_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybug_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1548,16 +1631,16 @@ static void Lbug_w(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ybug_wB; - Cave[y][x-1] = Ybug_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xbug_1_w; + Cave[x][y] = Ybug_wB; + Cave[x-1][y] = Ybug_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xbug_1_w; play_element_sound(x, y, SOUND_bug, Xbug_1_w); return; default: - Cave[y][x] = Ybug_w_s; - Next[y][x] = Xbug_2_s; + Cave[x][y] = Ybug_w_s; + Next[x][y] = Xbug_2_s; play_element_sound(x, y, SOUND_bug, Xbug_1_w); return; } @@ -1565,17 +1648,17 @@ static void Lbug_w(int x, int y) static void Lbug_1_w(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); return; } - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xblank: case Xacid_splash_e: @@ -1591,8 +1674,8 @@ static void Lbug_1_w(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ybug_w_n; - Next[y][x] = Xbug_2_n; + Cave[x][y] = Ybug_w_n; + Next[x][y] = Xbug_2_n; play_element_sound(x, y, SOUND_bug, Xbug_1_w); return; @@ -1604,10 +1687,10 @@ static void Lbug_1_w(int x, int y) static void Lbug_2_w(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_bug(x, y); @@ -1619,7 +1702,7 @@ static void Lbug_2_w(int x, int y) static void Ltank_n(int x, int y) { - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -1629,12 +1712,12 @@ static void Ltank_n(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ytank_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ytank_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1644,16 +1727,16 @@ static void Ltank_n(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ytank_nB; - Cave[y-1][x] = Ytank_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xtank_1_n; + Cave[x][y] = Ytank_nB; + Cave[x][y-1] = Ytank_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xtank_1_n; play_element_sound(x, y, SOUND_tank, Xtank_1_n); return; default: - Cave[y][x] = Ytank_n_e; - Next[y][x] = Xtank_2_e; + Cave[x][y] = Ytank_n_e; + Next[x][y] = Xtank_2_e; play_element_sound(x, y, SOUND_tank, Xtank_1_n); return; } @@ -1661,17 +1744,17 @@ static void Ltank_n(int x, int y) static void Ltank_1_n(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); return; } - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xblank: case Xacid_splash_e: @@ -1687,8 +1770,8 @@ static void Ltank_1_n(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ytank_n_w; - Next[y][x] = Xtank_2_w; + Cave[x][y] = Ytank_n_w; + Next[x][y] = Xtank_2_w; play_element_sound(x, y, SOUND_tank, Xtank_1_n); return; @@ -1700,10 +1783,10 @@ static void Ltank_1_n(int x, int y) static void Ltank_2_n(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); @@ -1715,7 +1798,7 @@ static void Ltank_2_n(int x, int y) static void Ltank_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -1725,12 +1808,12 @@ static void Ltank_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ytank_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ytank_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1740,16 +1823,16 @@ static void Ltank_e(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ytank_eB; - Cave[y][x+1] = Ytank_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xtank_1_e; + Cave[x][y] = Ytank_eB; + Cave[x+1][y] = Ytank_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xtank_1_e; play_element_sound(x, y, SOUND_tank, Xtank_1_e); return; default: - Cave[y][x] = Ytank_e_s; - Next[y][x] = Xtank_2_s; + Cave[x][y] = Ytank_e_s; + Next[x][y] = Xtank_2_s; play_element_sound(x, y, SOUND_tank, Xtank_1_e); return; } @@ -1757,17 +1840,17 @@ static void Ltank_e(int x, int y) static void Ltank_1_e(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); return; } - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xblank: case Xacid_splash_e: @@ -1783,8 +1866,8 @@ static void Ltank_1_e(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ytank_e_n; - Next[y][x] = Xtank_2_n; + Cave[x][y] = Ytank_e_n; + Next[x][y] = Xtank_2_n; play_element_sound(x, y, SOUND_tank, Xtank_1_e); return; @@ -1796,10 +1879,10 @@ static void Ltank_1_e(int x, int y) static void Ltank_2_e(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); @@ -1811,7 +1894,7 @@ static void Ltank_2_e(int x, int y) static void Ltank_s(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -1821,12 +1904,12 @@ static void Ltank_s(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ytank_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ytank_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1836,16 +1919,16 @@ static void Ltank_s(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ytank_sB; - Cave[y+1][x] = Ytank_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xtank_1_s; + Cave[x][y] = Ytank_sB; + Cave[x][y+1] = Ytank_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xtank_1_s; play_element_sound(x, y, SOUND_tank, Xtank_1_s); return; default: - Cave[y][x] = Ytank_s_w; - Next[y][x] = Xtank_2_w; + Cave[x][y] = Ytank_s_w; + Next[x][y] = Xtank_2_w; play_element_sound(x, y, SOUND_tank, Xtank_1_s); return; } @@ -1853,17 +1936,17 @@ static void Ltank_s(int x, int y) static void Ltank_1_s(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); return; } - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xblank: case Xacid_splash_e: @@ -1879,8 +1962,8 @@ static void Ltank_1_s(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ytank_s_e; - Next[y][x] = Xtank_2_e; + Cave[x][y] = Ytank_s_e; + Next[x][y] = Xtank_2_e; play_element_sound(x, y, SOUND_tank, Xtank_1_s); return; @@ -1892,10 +1975,10 @@ static void Ltank_1_s(int x, int y) static void Ltank_2_s(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); @@ -1907,7 +1990,7 @@ static void Ltank_2_s(int x, int y) static void Ltank_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -1917,12 +2000,12 @@ static void Ltank_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ytank_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ytank_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -1932,16 +2015,16 @@ static void Ltank_w(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ytank_wB; - Cave[y][x-1] = Ytank_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xtank_1_w; + Cave[x][y] = Ytank_wB; + Cave[x-1][y] = Ytank_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xtank_1_w; play_element_sound(x, y, SOUND_tank, Xtank_1_w); return; default: - Cave[y][x] = Ytank_w_n; - Next[y][x] = Xtank_2_n; + Cave[x][y] = Ytank_w_n; + Next[x][y] = Xtank_2_n; play_element_sound(x, y, SOUND_tank, Xtank_1_w); return; } @@ -1949,17 +2032,17 @@ static void Ltank_w(int x, int y) static void Ltank_1_w(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); return; } - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xblank: case Xacid_splash_e: @@ -1975,8 +2058,8 @@ static void Ltank_1_w(int x, int y) case Xacid_7: case Xacid_8: case Zplayer: - Cave[y][x] = Ytank_w_s; - Next[y][x] = Xtank_2_s; + Cave[x][y] = Ytank_w_s; + Next[x][y] = Xtank_2_s; play_element_sound(x, y, SOUND_tank, Xtank_1_w); return; @@ -1988,10 +2071,10 @@ static void Ltank_1_w(int x, int y) static void Ltank_2_w(int x, int y) { - if (tab_amoeba[Cave[y-1][x]] || - tab_amoeba[Cave[y][x+1]] || - tab_amoeba[Cave[y+1][x]] || - tab_amoeba[Cave[y][x-1]]) + if (tab_amoeba[Cave[x][y-1]] || + tab_amoeba[Cave[x+1][y]] || + tab_amoeba[Cave[x][y+1]] || + tab_amoeba[Cave[x-1][y]]) { Lboom_tank(x, y); @@ -2003,7 +2086,7 @@ static void Ltank_2_w(int x, int y) static void Lemerald(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2013,22 +2096,22 @@ static void Lemerald(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yemerald_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yemerald_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yemerald_sB; - Cave[y+1][x] = Yemerald_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xemerald_fall; + Cave[x][y] = Yemerald_sB; + Cave[x][y+1] = Yemerald_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xemerald_fall; return; case Xspring: @@ -2084,43 +2167,43 @@ static void Lemerald(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Yemerald_eB; - Cave[y][x+1] = Yemerald_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xemerald_pause; + Cave[x][y] = Yemerald_eB; + Cave[x+1][y] = Yemerald_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xemerald_pause; return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Yemerald_wB; - Cave[y][x-1] = Yemerald_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xemerald_pause; + Cave[x][y] = Yemerald_wB; + Cave[x-1][y] = Yemerald_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xemerald_pause; return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Yemerald_wB; - Cave[y][x-1] = Yemerald_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xemerald_pause; + Cave[x][y] = Yemerald_wB; + Cave[x-1][y] = Yemerald_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xemerald_pause; return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Yemerald_eB; - Cave[y][x+1] = Yemerald_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xemerald_pause; + Cave[x][y] = Yemerald_eB; + Cave[x+1][y] = Yemerald_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xemerald_pause; return; } } @@ -2128,8 +2211,8 @@ static void Lemerald(int x, int y) default: if (++lev.shine_cnt > 50) { - lev.shine_cnt = RANDOM & 7; - Cave[y][x] = Xemerald_shine; + lev.shine_cnt = RANDOM(8); + Cave[x][y] = Xemerald_shine; } return; @@ -2138,7 +2221,7 @@ static void Lemerald(int x, int y) static void Lemerald_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2148,34 +2231,34 @@ static void Lemerald_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yemerald_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yemerald_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yemerald_sB; - Cave[y+1][x] = Yemerald_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xemerald_fall; + Cave[x][y] = Yemerald_sB; + Cave[x][y+1] = Yemerald_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xemerald_fall; return; default: - Cave[y][x] = Xemerald; - Next[y][x] = Xemerald; + Cave[x][y] = Xemerald; + Next[x][y] = Xemerald; return; } } static void Lemerald_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2185,12 +2268,12 @@ static void Lemerald_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yemerald_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yemerald_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2198,31 +2281,31 @@ static void Lemerald_fall(int x, int y) case Xacid_splash_e: case Xacid_splash_w: case Zplayer: - Cave[y][x] = Yemerald_sB; - Cave[y+1][x] = Yemerald_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xemerald_fall; + Cave[x][y] = Yemerald_sB; + Cave[x][y+1] = Yemerald_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xemerald_fall; return; case Xwonderwall: if (lev.wonderwall_time) { lev.wonderwall_state = 1; - Cave[y][x] = Yemerald_sB; - if (tab_blank[Cave[y+2][x]]) + Cave[x][y] = Yemerald_sB; + if (tab_blank[Cave[x][y+2]]) { - Cave[y+2][x] = Ydiamond_s; - Next[y+2][x] = Xdiamond_fall; + Cave[x][y+2] = Ydiamond_s; + Next[x][y+2] = Xdiamond_fall; } - Next[y][x] = Xblank; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } default: - Cave[y][x] = Xemerald; - Next[y][x] = Xemerald; + Cave[x][y] = Xemerald; + Next[x][y] = Xemerald; play_element_sound(x, y, SOUND_diamond, Xemerald); return; } @@ -2230,7 +2313,7 @@ static void Lemerald_fall(int x, int y) static void Ldiamond(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2240,22 +2323,22 @@ static void Ldiamond(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ydiamond_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ydiamond_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ydiamond_sB; - Cave[y+1][x] = Ydiamond_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xdiamond_fall; + Cave[x][y] = Ydiamond_sB; + Cave[x][y+1] = Ydiamond_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xdiamond_fall; return; case Xspring: @@ -2311,43 +2394,43 @@ static void Ldiamond(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ydiamond_eB; - Cave[y][x+1] = Ydiamond_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_eB; + Cave[x+1][y] = Ydiamond_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xdiamond_pause; return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ydiamond_wB; - Cave[y][x-1] = Ydiamond_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_wB; + Cave[x-1][y] = Ydiamond_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xdiamond_pause; return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ydiamond_wB; - Cave[y][x-1] = Ydiamond_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_wB; + Cave[x-1][y] = Ydiamond_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xdiamond_pause; return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ydiamond_eB; - Cave[y][x+1] = Ydiamond_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_eB; + Cave[x+1][y] = Ydiamond_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xdiamond_pause; return; } } @@ -2355,8 +2438,8 @@ static void Ldiamond(int x, int y) default: if (++lev.shine_cnt > 50) { - lev.shine_cnt = RANDOM & 7; - Cave[y][x] = Xdiamond_shine; + lev.shine_cnt = RANDOM(8); + Cave[x][y] = Xdiamond_shine; } return; @@ -2365,7 +2448,7 @@ static void Ldiamond(int x, int y) static void Ldiamond_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2375,34 +2458,34 @@ static void Ldiamond_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ydiamond_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ydiamond_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ydiamond_sB; - Cave[y+1][x] = Ydiamond_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xdiamond_fall; + Cave[x][y] = Ydiamond_sB; + Cave[x][y+1] = Ydiamond_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xdiamond_fall; return; default: - Cave[y][x] = Xdiamond; - Next[y][x] = Xdiamond; + Cave[x][y] = Xdiamond; + Next[x][y] = Xdiamond; return; } } static void Ldiamond_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2412,12 +2495,12 @@ static void Ldiamond_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ydiamond_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ydiamond_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2425,31 +2508,31 @@ static void Ldiamond_fall(int x, int y) case Xacid_splash_e: case Xacid_splash_w: case Zplayer: - Cave[y][x] = Ydiamond_sB; - Cave[y+1][x] = Ydiamond_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xdiamond_fall; + Cave[x][y] = Ydiamond_sB; + Cave[x][y+1] = Ydiamond_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xdiamond_fall; return; case Xwonderwall: if (lev.wonderwall_time) { lev.wonderwall_state = 1; - Cave[y][x] = Ydiamond_sB; - if (tab_blank[Cave[y+2][x]]) + Cave[x][y] = Ydiamond_sB; + if (tab_blank[Cave[x][y+2]]) { - Cave[y+2][x] = Ystone_s; - Next[y+2][x] = Xstone_fall; + Cave[x][y+2] = Ystone_s; + Next[x][y+2] = Xstone_fall; } - Next[y][x] = Xblank; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } default: - Cave[y][x] = Xdiamond; - Next[y][x] = Xdiamond; + Cave[x][y] = Xdiamond; + Next[x][y] = Xdiamond; play_element_sound(x, y, SOUND_diamond, Xdiamond); return; } @@ -2457,7 +2540,7 @@ static void Ldiamond_fall(int x, int y) static void Lstone(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2467,12 +2550,12 @@ static void Lstone(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ystone_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ystone_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2481,7 +2564,7 @@ static void Lstone(int x, int y) case Xacid_splash_w: case Xplant: case Yplant: -#if 1 +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2491,17 +2574,17 @@ static void Lstone(int x, int y) case Xfake_acid_7: case Xfake_acid_8: #endif - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ystone_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xstone_fall; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ystone_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xstone_fall; return; case Xsand: - Cave[y][x] = Xsand_stonein_1; - Cave[y+1][x] = Xsand_sandstone_1; - Next[y][x] = Xsand_stonein_2; - Next[y+1][x] = Xsand_sandstone_2; + Cave[x][y] = Xsand_stonein_1; + Cave[x][y+1] = Xsand_sandstone_1; + Next[x][y] = Xsand_stonein_2; + Next[x][y+1] = Xsand_sandstone_2; return; case Xspring: @@ -2550,43 +2633,43 @@ static void Lstone(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ystone_eB; - Cave[y][x+1] = Ystone_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xstone_pause; + Cave[x][y] = Ystone_eB; + Cave[x+1][y] = Ystone_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xstone_pause; return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ystone_wB; - Cave[y][x-1] = Ystone_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xstone_pause; + Cave[x][y] = Ystone_wB; + Cave[x-1][y] = Ystone_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xstone_pause; return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ystone_wB; - Cave[y][x-1] = Ystone_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xstone_pause; + Cave[x][y] = Ystone_wB; + Cave[x-1][y] = Ystone_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xstone_pause; return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ystone_eB; - Cave[y][x+1] = Ystone_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xstone_pause; + Cave[x][y] = Ystone_eB; + Cave[x+1][y] = Ystone_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xstone_pause; return; } } @@ -2595,7 +2678,7 @@ static void Lstone(int x, int y) static void Lstone_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2605,19 +2688,19 @@ static void Lstone_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ystone_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ystone_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: -#if 1 +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2627,22 +2710,22 @@ static void Lstone_pause(int x, int y) case Xfake_acid_7: case Xfake_acid_8: #endif - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ystone_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xstone_fall; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ystone_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xstone_fall; return; default: - Cave[y][x] = Xstone; - Next[y][x] = Xstone; + Cave[x][y] = Xstone; + Next[x][y] = Xstone; return; } } static void Lstone_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2652,12 +2735,12 @@ static void Lstone_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ystone_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ystone_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -2665,7 +2748,7 @@ static void Lstone_fall(int x, int y) case Xacid_splash_e: case Xacid_splash_w: case Zplayer: -#if 1 +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS case Xfake_acid_1: case Xfake_acid_2: case Xfake_acid_3: @@ -2675,17 +2758,17 @@ static void Lstone_fall(int x, int y) case Xfake_acid_7: case Xfake_acid_8: #endif - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ystone_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xstone_fall; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ystone_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xstone_fall; return; case Xnut: case Xnut_pause: - Cave[y+1][x] = Ynut_stone; - Next[y][x] = Xstone; - Next[y+1][x] = Xemerald; + Cave[x][y+1] = Ynut_stone; + Next[x][y] = Xstone; + Next[x][y+1] = Xemerald; play_element_sound(x, y, SOUND_crack, Xnut); score += lev.nut_score; return; @@ -2698,18 +2781,18 @@ static void Lstone_fall(int x, int y) case Xbug_2_e: case Xbug_2_s: case Xbug_2_w: - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ybug_stone; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xemerald; - Boom[y][x] = Xemerald; - Boom[y][x+1] = Xemerald; - Boom[y+1][x-1] = Xemerald; - Boom[y+1][x] = Xdiamond; - Boom[y+1][x+1] = Xemerald; - Boom[y+2][x-1] = Xemerald; - Boom[y+2][x] = Xemerald; - Boom[y+2][x+1] = Xemerald; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ybug_stone; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xemerald; + Boom[x][y] = Xemerald; + Boom[x+1][y] = Xemerald; + Boom[x-1][y+1] = Xemerald; + Boom[x][y+1] = Xdiamond; + Boom[x+1][y+1] = Xemerald; + Boom[x-1][y+2] = Xemerald; + Boom[x][y+2] = Xemerald; + Boom[x+1][y+2] = Xemerald; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xstone_fall); #endif @@ -2724,18 +2807,18 @@ static void Lstone_fall(int x, int y) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ytank_stone; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ytank_stone; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xstone_fall); #endif @@ -2743,59 +2826,59 @@ static void Lstone_fall(int x, int y) return; case Xspring: - if (RANDOM & 1) + if (RANDOM(2)) { - switch (Cave[y+1][x+1]) + switch (Cave[x+1][y+1]) { case Xblank: case Xacid_splash_e: case Xacid_splash_w: case Xalien: case Xalien_pause: - Cave[y+1][x] = Xspring_e; + Cave[x][y+1] = Xspring_e; break; default: - Cave[y+1][x] = Xspring_w; + Cave[x][y+1] = Xspring_w; break; } } else { - switch (Cave[y+1][x-1]) + switch (Cave[x-1][y+1]) { case Xblank: case Xacid_splash_e: case Xacid_splash_w: case Xalien: case Xalien_pause: - Cave[y+1][x] = Xspring_w; + Cave[x][y+1] = Xspring_w; break; default: - Cave[y+1][x] = Xspring_e; + Cave[x][y+1] = Xspring_e; break; } } - Next[y][x] = Xstone; + Next[x][y] = Xstone; return; case Xeater_n: case Xeater_e: case Xeater_s: case Xeater_w: - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Yeater_stone; - Next[y+1][x] = Znormal; - Boom[y][x-1] = lev.eater_array[lev.eater_pos][0]; - Boom[y][x] = lev.eater_array[lev.eater_pos][1]; - Boom[y][x+1] = lev.eater_array[lev.eater_pos][2]; - Boom[y+1][x-1] = lev.eater_array[lev.eater_pos][3]; - Boom[y+1][x] = lev.eater_array[lev.eater_pos][4]; - Boom[y+1][x+1] = lev.eater_array[lev.eater_pos][5]; - Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6]; - Boom[y+2][x] = lev.eater_array[lev.eater_pos][7]; - Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8]; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Yeater_stone; + Next[x][y+1] = Znormal; + Boom[x-1][y] = lev.eater_array[lev.eater_pos][0]; + Boom[x][y] = lev.eater_array[lev.eater_pos][1]; + Boom[x+1][y] = lev.eater_array[lev.eater_pos][2]; + Boom[x-1][y+1] = lev.eater_array[lev.eater_pos][3]; + Boom[x][y+1] = lev.eater_array[lev.eater_pos][4]; + Boom[x+1][y+1] = lev.eater_array[lev.eater_pos][5]; + Boom[x-1][y+2] = lev.eater_array[lev.eater_pos][6]; + Boom[x][y+2] = lev.eater_array[lev.eater_pos][7]; + Boom[x+1][y+2] = lev.eater_array[lev.eater_pos][8]; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xstone_fall); #endif @@ -2805,18 +2888,18 @@ static void Lstone_fall(int x, int y) case Xalien: case Xalien_pause: - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Yalien_stone; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Yalien_stone; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xstone_fall); #endif @@ -2825,7 +2908,7 @@ static void Lstone_fall(int x, int y) case Xdiamond: case Xdiamond_pause: - switch (Cave[y+2][x]) + switch (Cave[x][y+2]) { case Xblank: case Xacid_splash_e: @@ -2873,31 +2956,31 @@ static void Lstone_fall(int x, int y) case Xnut_fall: case Xplant: case Yplant: - Next[y][x] = Xstone; + Next[x][y] = Xstone; play_element_sound(x, y, SOUND_stone, Xstone); return; } - Cave[y][x] = Ystone_sB; - Cave[y+1][x] = Ydiamond_stone; - Next[y][x] = Xblank; - Next[y+1][x] = Xstone_pause; + Cave[x][y] = Ystone_sB; + Cave[x][y+1] = Ydiamond_stone; + Next[x][y] = Xblank; + Next[x][y+1] = Xstone_pause; play_element_sound(x, y, SOUND_squash, Xdiamond); return; case Xbomb: case Xbomb_pause: - Cave[y+1][x] = Ybomb_blank; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y+1] = Ybomb_blank; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xstone_fall); #endif @@ -2907,22 +2990,22 @@ static void Lstone_fall(int x, int y) if (lev.wonderwall_time) { lev.wonderwall_state = 1; - Cave[y][x] = Ystone_sB; + Cave[x][y] = Ystone_sB; - if (tab_blank[Cave[y+2][x]]) + if (tab_blank[Cave[x][y+2]]) { - Cave[y+2][x] = Yemerald_s; - Next[y+2][x] = Xemerald_fall; + Cave[x][y+2] = Yemerald_s; + Next[x][y+2] = Xemerald_fall; } - Next[y][x] = Xblank; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_wonderfall, Xwonderwall); return; } default: - Cave[y][x] = Xstone; - Next[y][x] = Xstone; + Cave[x][y] = Xstone; + Next[x][y] = Xstone; play_element_sound(x, y, SOUND_stone, Xstone); return; } @@ -2930,7 +3013,7 @@ static void Lstone_fall(int x, int y) static void Lbomb(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -2940,22 +3023,22 @@ static void Lbomb(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybomb_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybomb_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ybomb_sB; - Cave[y+1][x] = Ybomb_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xbomb_fall; + Cave[x][y] = Ybomb_sB; + Cave[x][y+1] = Ybomb_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xbomb_fall; return; case Xspring: @@ -3002,43 +3085,43 @@ static void Lbomb(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ybomb_eB; - Cave[y][x+1] = Ybomb_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xbomb_pause; + Cave[x][y] = Ybomb_eB; + Cave[x+1][y] = Ybomb_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xbomb_pause; return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ybomb_wB; - Cave[y][x-1] = Ybomb_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xbomb_pause; + Cave[x][y] = Ybomb_wB; + Cave[x-1][y] = Ybomb_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xbomb_pause; return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ybomb_wB; - Cave[y][x-1] = Ybomb_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xbomb_pause; + Cave[x][y] = Ybomb_wB; + Cave[x-1][y] = Ybomb_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xbomb_pause; return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ybomb_eB; - Cave[y][x+1] = Ybomb_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xbomb_pause; + Cave[x][y] = Ybomb_eB; + Cave[x+1][y] = Ybomb_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xbomb_pause; return; } } @@ -3047,7 +3130,7 @@ static void Lbomb(int x, int y) static void Lbomb_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3057,34 +3140,34 @@ static void Lbomb_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybomb_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybomb_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ybomb_sB; - Cave[y+1][x] = Ybomb_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xbomb_fall; + Cave[x][y] = Ybomb_sB; + Cave[x][y+1] = Ybomb_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xbomb_fall; return; default: - Cave[y][x] = Xbomb; - Next[y][x] = Xbomb; + Cave[x][y] = Xbomb; + Next[x][y] = Xbomb; return; } } static void Lbomb_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3094,36 +3177,36 @@ static void Lbomb_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ybomb_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ybomb_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ybomb_sB; - Cave[y+1][x] = Ybomb_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xbomb_fall; + Cave[x][y] = Ybomb_sB; + Cave[x][y+1] = Ybomb_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xbomb_fall; return; default: - Cave[y][x] = Ybomb_blank; - Next[y][x] = Znormal; - Boom[y-1][x-1] = Xblank; - Boom[y-1][x] = Xblank; - Boom[y-1][x+1] = Xblank; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; + Cave[x][y] = Ybomb_blank; + Next[x][y] = Znormal; + Boom[x-1][y-1] = Xblank; + Boom[x][y-1] = Xblank; + Boom[x+1][y-1] = Xblank; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xbomb_fall); #endif @@ -3133,7 +3216,7 @@ static void Lbomb_fall(int x, int y) static void Lnut(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3143,22 +3226,22 @@ static void Lnut(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ynut_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ynut_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ynut_sB; - Cave[y+1][x] = Ynut_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xnut_fall; + Cave[x][y] = Ynut_sB; + Cave[x][y+1] = Ynut_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xnut_fall; return; case Xspring: @@ -3205,43 +3288,43 @@ static void Lnut(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ynut_eB; - Cave[y][x+1] = Ynut_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xnut_pause; + Cave[x][y] = Ynut_eB; + Cave[x+1][y] = Ynut_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xnut_pause; return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ynut_wB; - Cave[y][x-1] = Ynut_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xnut_pause; + Cave[x][y] = Ynut_wB; + Cave[x-1][y] = Ynut_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xnut_pause; return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Ynut_wB; - Cave[y][x-1] = Ynut_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xnut_pause; + Cave[x][y] = Ynut_wB; + Cave[x-1][y] = Ynut_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xnut_pause; return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Ynut_eB; - Cave[y][x+1] = Ynut_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xnut_pause; + Cave[x][y] = Ynut_eB; + Cave[x+1][y] = Ynut_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xnut_pause; return; } } @@ -3250,7 +3333,7 @@ static void Lnut(int x, int y) static void Lnut_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3260,34 +3343,34 @@ static void Lnut_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ynut_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ynut_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Ynut_sB; - Cave[y+1][x] = Ynut_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xnut_fall; + Cave[x][y] = Ynut_sB; + Cave[x][y+1] = Ynut_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xnut_fall; return; default: - Cave[y][x] = Xnut; - Next[y][x] = Xnut; + Cave[x][y] = Xnut; + Next[x][y] = Xnut; return; } } static void Lnut_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3297,12 +3380,12 @@ static void Lnut_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ynut_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Ynut_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3310,15 +3393,15 @@ static void Lnut_fall(int x, int y) case Xacid_splash_e: case Xacid_splash_w: case Zplayer: - Cave[y][x] = Ynut_sB; - Cave[y+1][x] = Ynut_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xnut_fall; + Cave[x][y] = Ynut_sB; + Cave[x][y+1] = Ynut_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xnut_fall; return; default: - Cave[y][x] = Xnut; - Next[y][x] = Xnut; + Cave[x][y] = Xnut; + Next[x][y] = Xnut; play_element_sound(x, y, SOUND_nut, Xnut); return; } @@ -3326,7 +3409,7 @@ static void Lnut_fall(int x, int y) static void Lspring(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3336,12 +3419,12 @@ static void Lspring(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3350,10 +3433,10 @@ static void Lspring(int x, int y) case Xacid_splash_w: case Xplant: case Yplant: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yspring_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xspring_fall; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yspring_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xspring_fall; return; case Xspring: @@ -3400,70 +3483,70 @@ static void Lspring(int x, int y) case Xroundwall_2: case Xroundwall_3: case Xroundwall_4: - if (RANDOM & 1) + if (RANDOM(2)) { - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Yspring_eB; - Cave[y][x+1] = Yspring_e; - if (Cave[y+1][x] == Xbumper) - Cave[y+1][x] = XbumperB; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_eB; + Cave[x+1][y] = Yspring_e; + if (Cave[x][y+1] == Xbumper) + Cave[x][y+1] = XbumperB; + Next[x][y] = Xblank; #ifdef SPRING_ROLL - Next[y][x+1] = Xspring_e; + Next[x+1][y] = Xspring_e; #else - Next[y][x+1] = Xspring_pause; + Next[x+1][y] = Xspring_pause; #endif return; } - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Yspring_wB; - Cave[y][x-1] = Yspring_w; - if (Cave[y+1][x] == Xbumper) - Cave[y+1][x] = XbumperB; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_wB; + Cave[x-1][y] = Yspring_w; + if (Cave[x][y+1] == Xbumper) + Cave[x][y+1] = XbumperB; + Next[x][y] = Xblank; #ifdef SPRING_ROLL - Next[y][x-1] = Xspring_w; + Next[x-1][y] = Xspring_w; #else - Next[y][x-1] = Xspring_pause; + Next[x-1][y] = Xspring_pause; #endif return; } } else { - if (tab_blank[Cave[y][x-1]] && tab_acid[Cave[y+1][x-1]]) + if (tab_blank[Cave[x-1][y]] && tab_acid[Cave[x-1][y+1]]) { - Cave[y][x] = Yspring_wB; - Cave[y][x-1] = Yspring_w; - if (Cave[y+1][x] == Xbumper) - Cave[y+1][x] = XbumperB; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_wB; + Cave[x-1][y] = Yspring_w; + if (Cave[x][y+1] == Xbumper) + Cave[x][y+1] = XbumperB; + Next[x][y] = Xblank; #ifdef SPRING_ROLL - Next[y][x-1] = Xspring_w; + Next[x-1][y] = Xspring_w; #else - Next[y][x-1] = Xspring_pause; + Next[x-1][y] = Xspring_pause; #endif return; } - if (tab_blank[Cave[y][x+1]] && tab_acid[Cave[y+1][x+1]]) + if (tab_blank[Cave[x+1][y]] && tab_acid[Cave[x+1][y+1]]) { - Cave[y][x] = Yspring_eB; - Cave[y][x+1] = Yspring_e; - if (Cave[y+1][x] == Xbumper) - Cave[y+1][x] = XbumperB; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_eB; + Cave[x+1][y] = Yspring_e; + if (Cave[x][y+1] == Xbumper) + Cave[x][y+1] = XbumperB; + Next[x][y] = Xblank; #ifdef SPRING_ROLL - Next[y][x+1] = Xspring_e; + Next[x+1][y] = Xspring_e; #else - Next[y][x+1] = Xspring_pause; + Next[x+1][y] = Xspring_pause; #endif return; } @@ -3473,7 +3556,7 @@ static void Lspring(int x, int y) static void Lspring_pause(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3483,34 +3566,34 @@ static void Lspring_pause(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yspring_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xspring_fall; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yspring_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xspring_fall; return; default: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; return; } } static void Lspring_e(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3520,29 +3603,29 @@ static void Lspring_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yspring_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xspring_fall; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yspring_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xspring_fall; return; case Xbumper: - Cave[y+1][x] = XbumperB; + Cave[x][y+1] = XbumperB; } - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -3552,12 +3635,12 @@ static void Lspring_e(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3568,10 +3651,10 @@ static void Lspring_e(int x, int y) case Yalien_eB: case Yalien_sB: case Yalien_wB: - Cave[y][x] = Yspring_eB; - Cave[y][x+1] = Yspring_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xspring_e; + Cave[x][y] = Yspring_eB; + Cave[x+1][y] = Yspring_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xspring_e; return; case Xalien: @@ -3580,24 +3663,24 @@ static void Lspring_e(int x, int y) case Yalien_e: case Yalien_s: case Yalien_w: - Cave[y][x] = Yspring_alien_eB; - Cave[y][x+1] = Yspring_alien_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xspring_e; + Cave[x][y] = Yspring_alien_eB; + Cave[x+1][y] = Yspring_alien_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xspring_e; play_element_sound(x, y, SOUND_slurp, Xalien); score += lev.slurp_score; return; case Xbumper: case XbumperB: - Cave[y][x+1] = XbumperB; - Next[y][x] = Xspring_w; + Cave[x+1][y] = XbumperB; + Next[x][y] = Xspring_w; play_element_sound(x, y, SOUND_spring, Xspring); return; default: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; play_element_sound(x, y, SOUND_spring, Xspring); return; } @@ -3605,7 +3688,7 @@ static void Lspring_e(int x, int y) static void Lspring_w(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3615,29 +3698,29 @@ static void Lspring_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yspring_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xspring_fall; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yspring_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xspring_fall; return; case Xbumper: - Cave[y+1][x] = XbumperB; + Cave[x][y+1] = XbumperB; } - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -3647,12 +3730,12 @@ static void Lspring_w(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3663,10 +3746,10 @@ static void Lspring_w(int x, int y) case Yalien_eB: case Yalien_sB: case Yalien_wB: - Cave[y][x] = Yspring_wB; - Cave[y][x-1] = Yspring_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xspring_w; + Cave[x][y] = Yspring_wB; + Cave[x-1][y] = Yspring_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xspring_w; return; case Xalien: @@ -3675,24 +3758,24 @@ static void Lspring_w(int x, int y) case Yalien_e: case Yalien_s: case Yalien_w: - Cave[y][x] = Yspring_alien_wB; - Cave[y][x-1] = Yspring_alien_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xspring_w; + Cave[x][y] = Yspring_alien_wB; + Cave[x-1][y] = Yspring_alien_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xspring_w; play_element_sound(x, y, SOUND_slurp, Xalien); score += lev.slurp_score; return; case Xbumper: case XbumperB: - Cave[y][x-1] = XbumperB; - Next[y][x] = Xspring_e; + Cave[x-1][y] = XbumperB; + Next[x][y] = Xspring_e; play_element_sound(x, y, SOUND_spring, Xspring); return; default: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; play_element_sound(x, y, SOUND_spring, Xspring); return; } @@ -3700,7 +3783,7 @@ static void Lspring_w(int x, int y) static void Lspring_fall(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -3710,12 +3793,12 @@ static void Lspring_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yspring_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yspring_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -3723,25 +3806,25 @@ static void Lspring_fall(int x, int y) case Xacid_splash_e: case Xacid_splash_w: case Zplayer: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yspring_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xspring_fall; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yspring_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xspring_fall; return; case Xbomb: case Xbomb_pause: - Cave[y+1][x] = Ybomb_blank; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y+1] = Ybomb_blank; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xspring_fall); #endif @@ -3755,18 +3838,18 @@ static void Lspring_fall(int x, int y) case Xbug_2_e: case Xbug_2_s: case Xbug_2_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Ybug_spring; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xemerald; - Boom[y][x] = Xemerald; - Boom[y][x+1] = Xemerald; - Boom[y+1][x-1] = Xemerald; - Boom[y+1][x] = Xdiamond; - Boom[y+1][x+1] = Xemerald; - Boom[y+2][x-1] = Xemerald; - Boom[y+2][x] = Xemerald; - Boom[y+2][x+1] = Xemerald; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Ybug_spring; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xemerald; + Boom[x][y] = Xemerald; + Boom[x+1][y] = Xemerald; + Boom[x-1][y+1] = Xemerald; + Boom[x][y+1] = Xdiamond; + Boom[x+1][y+1] = Xemerald; + Boom[x-1][y+2] = Xemerald; + Boom[x][y+2] = Xemerald; + Boom[x+1][y+2] = Xemerald; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xspring_fall); #endif @@ -3781,18 +3864,18 @@ static void Lspring_fall(int x, int y) case Xtank_2_e: case Xtank_2_s: case Xtank_2_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Ytank_spring; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Ytank_spring; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xspring_fall); #endif @@ -3803,18 +3886,18 @@ static void Lspring_fall(int x, int y) case Xeater_e: case Xeater_s: case Xeater_w: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yeater_spring; - Next[y+1][x] = Znormal; - Boom[y][x-1] = lev.eater_array[lev.eater_pos][0]; - Boom[y][x] = lev.eater_array[lev.eater_pos][1]; - Boom[y][x+1] = lev.eater_array[lev.eater_pos][2]; - Boom[y+1][x-1] = lev.eater_array[lev.eater_pos][3]; - Boom[y+1][x] = lev.eater_array[lev.eater_pos][4]; - Boom[y+1][x+1] = lev.eater_array[lev.eater_pos][5]; - Boom[y+2][x-1] = lev.eater_array[lev.eater_pos][6]; - Boom[y+2][x] = lev.eater_array[lev.eater_pos][7]; - Boom[y+2][x+1] = lev.eater_array[lev.eater_pos][8]; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yeater_spring; + Next[x][y+1] = Znormal; + Boom[x-1][y] = lev.eater_array[lev.eater_pos][0]; + Boom[x][y] = lev.eater_array[lev.eater_pos][1]; + Boom[x+1][y] = lev.eater_array[lev.eater_pos][2]; + Boom[x-1][y+1] = lev.eater_array[lev.eater_pos][3]; + Boom[x][y+1] = lev.eater_array[lev.eater_pos][4]; + Boom[x+1][y+1] = lev.eater_array[lev.eater_pos][5]; + Boom[x-1][y+2] = lev.eater_array[lev.eater_pos][6]; + Boom[x][y+2] = lev.eater_array[lev.eater_pos][7]; + Boom[x+1][y+2] = lev.eater_array[lev.eater_pos][8]; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xspring_fall); #endif @@ -3824,18 +3907,18 @@ static void Lspring_fall(int x, int y) case Xalien: case Xalien_pause: - Cave[y][x] = Yspring_sB; - Cave[y+1][x] = Yalien_spring; - Next[y+1][x] = Znormal; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; - Boom[y+2][x-1] = Xblank; - Boom[y+2][x] = Xblank; - Boom[y+2][x+1] = Xblank; + Cave[x][y] = Yspring_sB; + Cave[x][y+1] = Yalien_spring; + Next[x][y+1] = Znormal; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; + Boom[x-1][y+2] = Xblank; + Boom[x][y+2] = Xblank; + Boom[x+1][y+2] = Xblank; #if PLAY_ELEMENT_SOUND play_element_sound(x, y, SOUND_boom, Xspring_fall); #endif @@ -3843,8 +3926,8 @@ static void Lspring_fall(int x, int y) return; default: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; play_element_sound(x, y, SOUND_spring, Xspring); return; } @@ -3852,7 +3935,7 @@ static void Lspring_fall(int x, int y) static void Lpush_emerald_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -3862,22 +3945,22 @@ static void Lpush_emerald_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xemerald; - Next[y][x] = Xemerald; + Cave[x][y] = Xemerald; + Next[x][y] = Xemerald; return; default: - Cave[y][x] = Yemerald_eB; - Cave[y][x+1] = Yemerald_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xemerald_pause; + Cave[x][y] = Yemerald_eB; + Cave[x+1][y] = Yemerald_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xemerald_pause; return; } } static void Lpush_emerald_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -3887,22 +3970,22 @@ static void Lpush_emerald_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xemerald; - Next[y][x] = Xemerald; + Cave[x][y] = Xemerald; + Next[x][y] = Xemerald; return; default: - Cave[y][x] = Yemerald_wB; - Cave[y][x-1] = Yemerald_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xemerald_pause; + Cave[x][y] = Yemerald_wB; + Cave[x-1][y] = Yemerald_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xemerald_pause; return; } } static void Lpush_diamond_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -3912,22 +3995,22 @@ static void Lpush_diamond_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xdiamond; - Next[y][x] = Xdiamond; + Cave[x][y] = Xdiamond; + Next[x][y] = Xdiamond; return; default: - Cave[y][x] = Ydiamond_eB; - Cave[y][x+1] = Ydiamond_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_eB; + Cave[x+1][y] = Ydiamond_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xdiamond_pause; return; } } static void Lpush_diamond_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -3937,22 +4020,22 @@ static void Lpush_diamond_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xdiamond; - Next[y][x] = Xdiamond; + Cave[x][y] = Xdiamond; + Next[x][y] = Xdiamond; return; default: - Cave[y][x] = Ydiamond_wB; - Cave[y][x-1] = Ydiamond_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xdiamond_pause; + Cave[x][y] = Ydiamond_wB; + Cave[x-1][y] = Ydiamond_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xdiamond_pause; return; } } static void Lpush_stone_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -3962,22 +4045,22 @@ static void Lpush_stone_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xstone; - Next[y][x] = Xstone; + Cave[x][y] = Xstone; + Next[x][y] = Xstone; return; default: - Cave[y][x] = Ystone_eB; - Cave[y][x+1] = Ystone_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xstone_pause; + Cave[x][y] = Ystone_eB; + Cave[x+1][y] = Ystone_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xstone_pause; return; } } static void Lpush_stone_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -3987,22 +4070,22 @@ static void Lpush_stone_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xstone; - Next[y][x] = Xstone; + Cave[x][y] = Xstone; + Next[x][y] = Xstone; return; default: - Cave[y][x] = Ystone_wB; - Cave[y][x-1] = Ystone_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xstone_pause; + Cave[x][y] = Ystone_wB; + Cave[x-1][y] = Ystone_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xstone_pause; return; } } static void Lpush_bomb_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -4012,22 +4095,22 @@ static void Lpush_bomb_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xbomb; - Next[y][x] = Xbomb; + Cave[x][y] = Xbomb; + Next[x][y] = Xbomb; return; default: - Cave[y][x] = Ybomb_eB; - Cave[y][x+1] = Ybomb_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xbomb_pause; + Cave[x][y] = Ybomb_eB; + Cave[x+1][y] = Ybomb_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xbomb_pause; return; } } static void Lpush_bomb_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -4037,22 +4120,22 @@ static void Lpush_bomb_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xbomb; - Next[y][x] = Xbomb; + Cave[x][y] = Xbomb; + Next[x][y] = Xbomb; return; default: - Cave[y][x] = Ybomb_wB; - Cave[y][x-1] = Ybomb_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xbomb_pause; + Cave[x][y] = Ybomb_wB; + Cave[x-1][y] = Ybomb_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xbomb_pause; return; } } static void Lpush_nut_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -4062,22 +4145,22 @@ static void Lpush_nut_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xnut; - Next[y][x] = Xnut; + Cave[x][y] = Xnut; + Next[x][y] = Xnut; return; default: - Cave[y][x] = Ynut_eB; - Cave[y][x+1] = Ynut_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xnut_pause; + Cave[x][y] = Ynut_eB; + Cave[x+1][y] = Ynut_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xnut_pause; return; } } static void Lpush_nut_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -4087,22 +4170,22 @@ static void Lpush_nut_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xnut; - Next[y][x] = Xnut; + Cave[x][y] = Xnut; + Next[x][y] = Xnut; return; default: - Cave[y][x] = Ynut_wB; - Cave[y][x-1] = Ynut_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xnut_pause; + Cave[x][y] = Ynut_wB; + Cave[x-1][y] = Ynut_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xnut_pause; return; } } static void Lpush_spring_e(int x, int y) { - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Zborder: case Znormal: @@ -4112,22 +4195,22 @@ static void Lpush_spring_e(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; return; default: - Cave[y][x] = Yspring_eB; - Cave[y][x+1] = Yspring_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xspring_e; + Cave[x][y] = Yspring_eB; + Cave[x+1][y] = Yspring_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xspring_e; return; } } static void Lpush_spring_w(int x, int y) { - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Zborder: case Znormal: @@ -4137,19 +4220,100 @@ static void Lpush_spring_w(int x, int y) case Xboom_android: case Xboom_1: case Zplayer: - Cave[y][x] = Xspring; - Next[y][x] = Xspring; + Cave[x][y] = Xspring; + Next[x][y] = Xspring; return; default: - Cave[y][x] = Yspring_wB; - Cave[y][x-1] = Yspring_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xspring_w; + Cave[x][y] = Yspring_wB; + Cave[x-1][y] = Yspring_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xspring_w; return; } } +static void Ldynamite_1(int x, int y) +{ + play_element_sound(x, y, SOUND_tick, Xdynamite_1); + Next[x][y] = Xdynamite_2; +} + +static void Ldynamite_2(int x, int y) +{ + play_element_sound(x, y, SOUND_tick, Xdynamite_2); + Next[x][y] = Xdynamite_3; +} + +static void Ldynamite_3(int x, int y) +{ + play_element_sound(x, y, SOUND_tick, Xdynamite_3); + Next[x][y] = Xdynamite_4; +} + +static void Ldynamite_4(int x, int y) +{ + play_element_sound(x, y, SOUND_tick, Xdynamite_4); + Next[x][y] = Zdynamite; + Boom[x-1][y-1] = Xblank; + Boom[x][y-1] = Xblank; + Boom[x+1][y-1] = Xblank; + Boom[x-1][y] = Xblank; + Boom[x][y] = Xblank; + Boom[x+1][y] = Xblank; + Boom[x-1][y+1] = Xblank; + Boom[x][y+1] = Xblank; + Boom[x+1][y+1] = Xblank; +} + +static void Lfake_door_1(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_1; +} + +static void Lfake_door_2(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_2; +} + +static void Lfake_door_3(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_3; +} + +static void Lfake_door_4(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_4; +} + +static void Lfake_door_5(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_5; +} + +static void Lfake_door_6(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_6; +} + +static void Lfake_door_7(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_7; +} + +static void Lfake_door_8(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xdoor_8; +} + static void Lballoon(int x, int y) { if (lev.wind_cnt == 0) @@ -4158,7 +4322,7 @@ static void Lballoon(int x, int y) switch (lev.wind_direction) { case 0: /* north */ - switch (Cave[y-1][x]) + switch (Cave[x][y-1]) { case Xacid_1: case Xacid_2: @@ -4168,28 +4332,28 @@ static void Lballoon(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yballoon_nB; - if (Cave[y-2][x+1] == Xblank) - Cave[y-2][x+1] = Xacid_splash_e; - if (Cave[y-2][x-1] == Xblank) - Cave[y-2][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yballoon_nB; + if (Cave[x+1][y-2] == Xblank) + Cave[x+1][y-2] = Xacid_splash_e; + if (Cave[x-1][y-2] == Xblank) + Cave[x-1][y-2] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yballoon_nB; - Cave[y-1][x] = Yballoon_n; - Next[y][x] = Xblank; - Next[y-1][x] = Xballoon; + Cave[x][y] = Yballoon_nB; + Cave[x][y-1] = Yballoon_n; + Next[x][y] = Xblank; + Next[x][y-1] = Xballoon; return; } break; case 1: /* east */ - switch (Cave[y][x+1]) + switch (Cave[x+1][y]) { case Xacid_1: case Xacid_2: @@ -4199,28 +4363,28 @@ static void Lballoon(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yballoon_eB; - if (Cave[y-1][x+2] == Xblank) - Cave[y-1][x+2] = Xacid_splash_e; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yballoon_eB; + if (Cave[x+2][y-1] == Xblank) + Cave[x+2][y-1] = Xacid_splash_e; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yballoon_eB; - Cave[y][x+1] = Yballoon_e; - Next[y][x] = Xblank; - Next[y][x+1] = Xballoon; + Cave[x][y] = Yballoon_eB; + Cave[x+1][y] = Yballoon_e; + Next[x][y] = Xblank; + Next[x+1][y] = Xballoon; return; } break; case 2: /* south */ - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -4230,28 +4394,28 @@ static void Lballoon(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yballoon_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yballoon_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yballoon_sB; - Cave[y+1][x] = Yballoon_s; - Next[y][x] = Xblank; - Next[y+1][x] = Xballoon; + Cave[x][y] = Yballoon_sB; + Cave[x][y+1] = Yballoon_s; + Next[x][y] = Xblank; + Next[x][y+1] = Xballoon; return; } break; case 3: /* west */ - switch (Cave[y][x-1]) + switch (Cave[x-1][y]) { case Xacid_1: case Xacid_2: @@ -4261,22 +4425,22 @@ static void Lballoon(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Yballoon_wB; - if (Cave[y-1][x] == Xblank) - Cave[y-1][x] = Xacid_splash_e; - if (Cave[y-1][x-2] == Xblank) - Cave[y-1][x-2] = Xacid_splash_w; - Next[y][x] = Xblank; + Cave[x][y] = Yballoon_wB; + if (Cave[x][y-1] == Xblank) + Cave[x][y-1] = Xacid_splash_e; + if (Cave[x-2][y-1] == Xblank) + Cave[x-2][y-1] = Xacid_splash_w; + Next[x][y] = Xblank; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Yballoon_wB; - Cave[y][x-1] = Yballoon_w; - Next[y][x] = Xblank; - Next[y][x-1] = Xballoon; + Cave[x][y] = Yballoon_wB; + Cave[x-1][y] = Yballoon_w; + Next[x][y] = Xblank; + Next[x-1][y] = Xballoon; return; } break; @@ -4289,77 +4453,77 @@ static void Lball_common(int x, int y) if (lev.ball_random) { - switch (RANDOM & 7) + switch (RANDOM(8)) { case 0: if (lev.ball_array[lev.ball_pos][0] != Xblank && - tab_blank[Cave[y-1][x-1]]) + tab_blank[Cave[x-1][y-1]]) { - Cave[y-1][x-1] = Yball_blank; - Next[y-1][x-1] = lev.ball_array[lev.ball_pos][0]; + Cave[x-1][y-1] = Yball_blank; + Next[x-1][y-1] = lev.ball_array[lev.ball_pos][0]; } break; case 1: if (lev.ball_array[lev.ball_pos][1] != Xblank && - tab_blank[Cave[y-1][x]]) + tab_blank[Cave[x][y-1]]) { - Cave[y-1][x] = Yball_blank; - Next[y-1][x] = lev.ball_array[lev.ball_pos][1]; + Cave[x][y-1] = Yball_blank; + Next[x][y-1] = lev.ball_array[lev.ball_pos][1]; } break; case 2: if (lev.ball_array[lev.ball_pos][2] != Xblank && - tab_blank[Cave[y-1][x+1]]) + tab_blank[Cave[x+1][y-1]]) { - Cave[y-1][x+1] = Yball_blank; - Next[y-1][x+1] = lev.ball_array[lev.ball_pos][2]; + Cave[x+1][y-1] = Yball_blank; + Next[x+1][y-1] = lev.ball_array[lev.ball_pos][2]; } break; case 3: if (lev.ball_array[lev.ball_pos][3] != Xblank && - tab_blank[Cave[y][x-1]]) + tab_blank[Cave[x-1][y]]) { - Cave[y][x-1] = Yball_blank; - Next[y][x-1] = lev.ball_array[lev.ball_pos][3]; + Cave[x-1][y] = Yball_blank; + Next[x-1][y] = lev.ball_array[lev.ball_pos][3]; } break; case 4: if (lev.ball_array[lev.ball_pos][4] != Xblank && - tab_blank[Cave[y][x+1]]) + tab_blank[Cave[x+1][y]]) { - Cave[y][x+1] = Yball_blank; - Next[y][x+1] = lev.ball_array[lev.ball_pos][4]; + Cave[x+1][y] = Yball_blank; + Next[x+1][y] = lev.ball_array[lev.ball_pos][4]; } break; case 5: if (lev.ball_array[lev.ball_pos][5] != Xblank && - tab_blank[Cave[y+1][x-1]]) + tab_blank[Cave[x-1][y+1]]) { - Cave[y+1][x-1] = Yball_blank; - Next[y+1][x-1] = lev.ball_array[lev.ball_pos][5]; + Cave[x-1][y+1] = Yball_blank; + Next[x-1][y+1] = lev.ball_array[lev.ball_pos][5]; } break; case 6: if (lev.ball_array[lev.ball_pos][6] != Xblank && - tab_blank[Cave[y+1][x]]) + tab_blank[Cave[x][y+1]]) { - Cave[y+1][x] = Yball_blank; - Next[y+1][x] = lev.ball_array[lev.ball_pos][6]; + Cave[x][y+1] = Yball_blank; + Next[x][y+1] = lev.ball_array[lev.ball_pos][6]; } break; case 7: if (lev.ball_array[lev.ball_pos][7] != Xblank && - tab_blank[Cave[y+1][x+1]]) + tab_blank[Cave[x+1][y+1]]) { - Cave[y+1][x+1] = Yball_blank; - Next[y+1][x+1] = lev.ball_array[lev.ball_pos][7]; + Cave[x+1][y+1] = Yball_blank; + Next[x+1][y+1] = lev.ball_array[lev.ball_pos][7]; } break; } @@ -4367,59 +4531,59 @@ static void Lball_common(int x, int y) else { if (lev.ball_array[lev.ball_pos][0] != Xblank && - tab_blank[Cave[y-1][x-1]]) + tab_blank[Cave[x-1][y-1]]) { - Cave[y-1][x-1] = Yball_blank; - Next[y-1][x-1] = lev.ball_array[lev.ball_pos][0]; + Cave[x-1][y-1] = Yball_blank; + Next[x-1][y-1] = lev.ball_array[lev.ball_pos][0]; } if (lev.ball_array[lev.ball_pos][1] != Xblank && - tab_blank[Cave[y-1][x]]) + tab_blank[Cave[x][y-1]]) { - Cave[y-1][x] = Yball_blank; - Next[y-1][x] = lev.ball_array[lev.ball_pos][1]; + Cave[x][y-1] = Yball_blank; + Next[x][y-1] = lev.ball_array[lev.ball_pos][1]; } if (lev.ball_array[lev.ball_pos][2] != Xblank && - tab_blank[Cave[y-1][x+1]]) + tab_blank[Cave[x+1][y-1]]) { - Cave[y-1][x+1] = Yball_blank; - Next[y-1][x+1] = lev.ball_array[lev.ball_pos][2]; + Cave[x+1][y-1] = Yball_blank; + Next[x+1][y-1] = lev.ball_array[lev.ball_pos][2]; } if (lev.ball_array[lev.ball_pos][3] != Xblank && - tab_blank[Cave[y][x-1]]) + tab_blank[Cave[x-1][y]]) { - Cave[y][x-1] = Yball_blank; - Next[y][x-1] = lev.ball_array[lev.ball_pos][3]; + Cave[x-1][y] = Yball_blank; + Next[x-1][y] = lev.ball_array[lev.ball_pos][3]; } if (lev.ball_array[lev.ball_pos][4] != Xblank && - tab_blank[Cave[y][x+1]]) + tab_blank[Cave[x+1][y]]) { - Cave[y][x+1] = Yball_blank; - Next[y][x+1] = lev.ball_array[lev.ball_pos][4]; + Cave[x+1][y] = Yball_blank; + Next[x+1][y] = lev.ball_array[lev.ball_pos][4]; } if (lev.ball_array[lev.ball_pos][5] != Xblank && - tab_blank[Cave[y+1][x-1]]) + tab_blank[Cave[x-1][y+1]]) { - Cave[y+1][x-1] = Yball_blank; - Next[y+1][x-1] = lev.ball_array[lev.ball_pos][5]; + Cave[x-1][y+1] = Yball_blank; + Next[x-1][y+1] = lev.ball_array[lev.ball_pos][5]; } if (lev.ball_array[lev.ball_pos][6] != Xblank && - tab_blank[Cave[y+1][x]]) + tab_blank[Cave[x][y+1]]) { - Cave[y+1][x] = Yball_blank; - Next[y+1][x] = lev.ball_array[lev.ball_pos][6]; + Cave[x][y+1] = Yball_blank; + Next[x][y+1] = lev.ball_array[lev.ball_pos][6]; } if (lev.ball_array[lev.ball_pos][7] != Xblank && - tab_blank[Cave[y+1][x+1]]) + tab_blank[Cave[x+1][y+1]]) { - Cave[y+1][x+1] = Yball_blank; - Next[y+1][x+1] = lev.ball_array[lev.ball_pos][7]; + Cave[x+1][y+1] = Yball_blank; + Next[x+1][y+1] = lev.ball_array[lev.ball_pos][7]; } } @@ -4431,8 +4595,8 @@ static void Lball_1(int x, int y) if (lev.ball_state == 0) return; - Cave[y][x] = Yball_1; - Next[y][x] = Xball_2; + Cave[x][y] = Yball_1; + Next[x][y] = Xball_2; if (lev.ball_cnt) return; @@ -4444,8 +4608,8 @@ static void Lball_2(int x, int y) if (lev.ball_state == 0) return; - Cave[y][x] = Yball_2; - Next[y][x] = Xball_1; + Cave[x][y] = Yball_2; + Next[x][y] = Xball_1; if (lev.ball_cnt) return; @@ -4454,14 +4618,14 @@ static void Lball_2(int x, int y) static void Ldrip(int x, int y) { - Next[y][x] = Xdrip_fall; + Next[x][y] = Xdrip_fall; } static void Ldrip_fall(int x, int y) { int temp; - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -4471,12 +4635,12 @@ static void Ldrip_fall(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Ydrip_1_sB; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xdrip_stretchB; + Cave[x][y] = Ydrip_1_sB; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xdrip_stretchB; play_element_sound(x, y, SOUND_acid, Xacid_1); return; @@ -4486,50 +4650,27 @@ static void Ldrip_fall(int x, int y) case Xplant: case Yplant: case Zplayer: - Cave[y][x] = Ydrip_1_sB; - Cave[y+1][x] = Ydrip_1_s; - Next[y][x] = Xdrip_stretchB; - Next[y+1][x] = Xdrip_stretch; + Cave[x][y] = Ydrip_1_sB; + Cave[x][y+1] = Ydrip_1_s; + Next[x][y] = Xdrip_stretchB; + Next[x][y+1] = Xdrip_stretch; return; default: - switch (RANDOM & 7) + switch (RANDOM(8)) { - case 0: - temp = Xamoeba_1; - break; - - case 1: - temp = Xamoeba_2; - break; - - case 2: - temp = Xamoeba_3; - break; - - case 3: - temp = Xamoeba_4; - break; - - case 4: - temp = Xamoeba_5; - break; - - case 5: - temp = Xamoeba_6; - break; - - case 6: - temp = Xamoeba_7; - break; - - case 7: - temp = Xamoeba_8; - break; + case 0: temp = Xamoeba_1; break; + case 1: temp = Xamoeba_2; break; + case 2: temp = Xamoeba_3; break; + case 3: temp = Xamoeba_4; break; + case 4: temp = Xamoeba_5; break; + case 5: temp = Xamoeba_6; break; + case 6: temp = Xamoeba_7; break; + case 7: temp = Xamoeba_8; break; } - Cave[y][x] = temp; - Next[y][x] = temp; + Cave[x][y] = temp; + Next[x][y] = temp; play_element_sound(x, y, SOUND_drip, Xdrip_fall); return; } @@ -4537,28 +4678,58 @@ static void Ldrip_fall(int x, int y) static void Ldrip_stretch(int x, int y) { - Cave[y][x] = Ydrip_2_s; - Next[y][x] = Xdrip_fall; + Cave[x][y] = Ydrip_2_s; + Next[x][y] = Xdrip_fall; } static void Ldrip_stretchB(int x, int y) { - Cave[y][x] = Ydrip_2_sB; - Next[y][x] = Xblank; + Cave[x][y] = Ydrip_2_sB; + Next[x][y] = Xblank; } static void Lwonderwall(int x, int y) { if (lev.wonderwall_time && lev.wonderwall_state) { - Cave[y][x] = XwonderwallB; + Cave[x][y] = XwonderwallB; play_element_sound(x, y, SOUND_wonder, Xwonderwall); } } +static void Lwheel(int x, int y) +{ + if (lev.wheel_cnt && x == lev.wheel_x && y == lev.wheel_y) + Cave[x][y] = XwheelB; +} + +static void Lswitch(int x, int y) +{ + if (lev.ball_state) + Cave[x][y] = XswitchB; +} + +static void Lfake_blank(int x, int y) +{ + if (lev.lenses_cnt) + Cave[x][y] = Xfake_blankB; +} + +static void Lfake_grass(int x, int y) +{ + if (lev.magnify_cnt) + Cave[x][y] = Xfake_grassB; +} + +static void Lfake_amoeba(int x, int y) +{ + if (lev.lenses_cnt) + Cave[x][y] = Xfake_amoebaB; +} + static void Lsand_stone(int x, int y) { - switch (Cave[y+1][x]) + switch (Cave[x][y+1]) { case Xacid_1: case Xacid_2: @@ -4568,145 +4739,145 @@ static void Lsand_stone(int x, int y) case Xacid_6: case Xacid_7: case Xacid_8: - Cave[y][x] = Xsand_stonesand_quickout_1; - if (Cave[y][x+1] == Xblank) - Cave[y][x+1] = Xacid_splash_e; - if (Cave[y][x-1] == Xblank) - Cave[y][x-1] = Xacid_splash_w; - Next[y][x] = Xsand_stonesand_quickout_2; + Cave[x][y] = Xsand_stonesand_quickout_1; + if (Cave[x+1][y] == Xblank) + Cave[x+1][y] = Xacid_splash_e; + if (Cave[x-1][y] == Xblank) + Cave[x-1][y] = Xacid_splash_w; + Next[x][y] = Xsand_stonesand_quickout_2; play_element_sound(x, y, SOUND_acid, Xacid_1); return; case Xblank: case Xacid_splash_e: case Xacid_splash_w: - Cave[y][x] = Xsand_stonesand_quickout_1; - Cave[y+1][x] = Xsand_stoneout_1; - Next[y][x] = Xsand_stonesand_quickout_2; - Next[y+1][x] = Xsand_stoneout_2; + Cave[x][y] = Xsand_stonesand_quickout_1; + Cave[x][y+1] = Xsand_stoneout_1; + Next[x][y] = Xsand_stonesand_quickout_2; + Next[x][y+1] = Xsand_stoneout_2; return; case Xsand: - Cave[y][x] = Xsand_stonesand_1; - Cave[y+1][x] = Xsand_sandstone_1; - Next[y][x] = Xsand_stonesand_2; - Next[y+1][x] = Xsand_sandstone_2; + Cave[x][y] = Xsand_stonesand_1; + Cave[x][y+1] = Xsand_sandstone_1; + Next[x][y] = Xsand_stonesand_2; + Next[x][y+1] = Xsand_sandstone_2; return; } } static void Lsand_stonein_1(int x, int y) { - Next[y][x] = Xsand_stonein_2; + Next[x][y] = Xsand_stonein_2; } static void Lsand_stonein_2(int x, int y) { - Next[y][x] = Xsand_stonein_3; + Next[x][y] = Xsand_stonein_3; } static void Lsand_stonein_3(int x, int y) { - Next[y][x] = Xsand_stonein_4; + Next[x][y] = Xsand_stonein_4; } static void Lsand_stonein_4(int x, int y) { - Next[y][x] = Xblank; + Next[x][y] = Xblank; } -static void Lsand_stonesand_1(int x, int y) +static void Lsand_sandstone_1(int x, int y) { - Next[y][x] = Xsand_stonesand_2; + Next[x][y] = Xsand_sandstone_2; } -static void Lsand_stonesand_2(int x, int y) +static void Lsand_sandstone_2(int x, int y) { - Next[y][x] = Xsand_stonesand_3; + Next[x][y] = Xsand_sandstone_3; } -static void Lsand_stonesand_3(int x, int y) +static void Lsand_sandstone_3(int x, int y) { - Next[y][x] = Xsand_stonesand_4; + Next[x][y] = Xsand_sandstone_4; } -static void Lsand_stonesand_4(int x, int y) +static void Lsand_sandstone_4(int x, int y) { - Next[y][x] = Xsand; + Next[x][y] = Xsand_stone; } -#if 1 -static void Lsand_stonesand_quickout_1(int x, int y) +static void Lsand_stonesand_1(int x, int y) { - Next[y][x] = Xsand_stonesand_quickout_2; + Next[x][y] = Xsand_stonesand_2; } -static void Lsand_stonesand_quickout_2(int x, int y) +static void Lsand_stonesand_2(int x, int y) { - Next[y][x] = Xsand; + Next[x][y] = Xsand_stonesand_3; } -#endif -static void Lsand_stoneout_1(int x, int y) +static void Lsand_stonesand_3(int x, int y) { - Next[y][x] = Xsand_stoneout_2; + Next[x][y] = Xsand_stonesand_4; } -static void Lsand_stoneout_2(int x, int y) +static void Lsand_stonesand_4(int x, int y) { - Next[y][x] = Xstone_fall; + Next[x][y] = Xsand; } -static void Lsand_sandstone_1(int x, int y) +static void Lsand_stoneout_1(int x, int y) { - Next[y][x] = Xsand_sandstone_2; + Next[x][y] = Xsand_stoneout_2; } -static void Lsand_sandstone_2(int x, int y) +static void Lsand_stoneout_2(int x, int y) { - Next[y][x] = Xsand_sandstone_3; + Next[x][y] = Xstone_fall; } -static void Lsand_sandstone_3(int x, int y) +#ifdef EM_ENGINE_USE_ADDITIONAL_ELEMENTS +static void Lsand_stonesand_quickout_1(int x, int y) { - Next[y][x] = Xsand_sandstone_4; + Next[x][y] = Xsand_stonesand_quickout_2; } -static void Lsand_sandstone_4(int x, int y) +static void Lsand_stonesand_quickout_2(int x, int y) { - Next[y][x] = Xsand_stone; + Next[x][y] = Xsand; } +#endif static void Lslidewall_ns(int x, int y) { - if (tab_blank[Cave[y-1][x]]) + if (tab_blank[Cave[x][y-1]]) { - Cave[y-1][x] = Yslidewall_ns_blank; - Next[y-1][x] = Xslidewall_ns; + Cave[x][y-1] = Yslidewall_ns_blank; + Next[x][y-1] = Xslidewall_ns; play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns); } - if (tab_blank[Cave[y+1][x]]) + if (tab_blank[Cave[x][y+1]]) { - Cave[y+1][x] = Yslidewall_ns_blank; - Next[y+1][x] = Xslidewall_ns; + Cave[x][y+1] = Yslidewall_ns_blank; + Next[x][y+1] = Xslidewall_ns; play_element_sound(x, y, SOUND_slidewall, Xslidewall_ns); } } static void Lslidewall_ew(int x, int y) { - if (tab_blank[Cave[y][x+1]]) + if (tab_blank[Cave[x+1][y]]) { - Cave[y][x+1] = Yslidewall_ew_blank; - Next[y][x+1] = Xslidewall_ew; + Cave[x+1][y] = Yslidewall_ew_blank; + Next[x+1][y] = Xslidewall_ew; play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew); } - if (tab_blank[Cave[y][x-1]]) + if (tab_blank[Cave[x-1][y]]) { - Cave[y][x-1] = Yslidewall_ew_blank; - Next[y][x-1] = Xslidewall_ew; + Cave[x-1][y] = Yslidewall_ew_blank; + Next[x-1][y] = Xslidewall_ew; play_element_sound(x, y, SOUND_slidewall, Xslidewall_ew); } } @@ -4716,22 +4887,22 @@ static void Lexit(int x, int y) if (lev.required > 0) return; - int temp = RANDOM & 63; - - if (temp < 21) + switch (RANDOM(64) / 21) { - Cave[y][x] = Xexit_1; - Next[y][x] = Xexit_2; - } - else if (temp < 42) - { - Cave[y][x] = Xexit_2; - Next[y][x] = Xexit_3; - } - else - { - Cave[y][x] = Xexit_3; - Next[y][x] = Xexit_1; + case 0: + Cave[x][y] = Xexit_1; + Next[x][y] = Xexit_2; + break; + + case 1: + Cave[x][y] = Xexit_2; + Next[x][y] = Xexit_3; + break; + + default: + Cave[x][y] = Xexit_3; + Next[x][y] = Xexit_1; + break; } play_element_sound(x, y, SOUND_exit_open, Xexit); @@ -4739,218 +4910,27 @@ static void Lexit(int x, int y) static void Lexit_1(int x, int y) { - Next[y][x] = Xexit_2; + Next[x][y] = Xexit_2; } static void Lexit_2(int x, int y) { - Next[y][x] = Xexit_3; + Next[x][y] = Xexit_3; } static void Lexit_3(int x, int y) { - Next[y][x] = Xexit_1; -} - -static void Lacid_1(int x, int y) -{ - Next[y][x] = Xacid_2; -} - -static void Lacid_2(int x, int y) -{ - Next[y][x] = Xacid_3; -} - -static void Lacid_3(int x, int y) -{ - Next[y][x] = Xacid_4; -} - -static void Lacid_4(int x, int y) -{ - Next[y][x] = Xacid_5; -} - -static void Lacid_5(int x, int y) -{ - Next[y][x] = Xacid_6; -} - -static void Lacid_6(int x, int y) -{ - Next[y][x] = Xacid_7; -} - -static void Lacid_7(int x, int y) -{ - Next[y][x] = Xacid_8; -} - -static void Lacid_8(int x, int y) -{ - Next[y][x] = Xacid_1; -} - -static void Lfake_acid_1(int x, int y) -{ - Next[y][x] = Xfake_acid_2; -} - -static void Lfake_acid_2(int x, int y) -{ - Next[y][x] = Xfake_acid_3; -} - -static void Lfake_acid_3(int x, int y) -{ - Next[y][x] = Xfake_acid_4; -} - -static void Lfake_acid_4(int x, int y) -{ - Next[y][x] = Xfake_acid_5; -} - -static void Lfake_acid_5(int x, int y) -{ - Next[y][x] = Xfake_acid_6; -} - -static void Lfake_acid_6(int x, int y) -{ - Next[y][x] = Xfake_acid_7; -} - -static void Lfake_acid_7(int x, int y) -{ - Next[y][x] = Xfake_acid_8; -} - -static void Lfake_acid_8(int x, int y) -{ - Next[y][x] = Xfake_acid_1; + Next[x][y] = Xexit_1; } static void Lpause(int x, int y) { - Next[y][x] = Xblank; -} - -static void Ldynamite_1(int x, int y) -{ - play_element_sound(x, y, SOUND_tick, Xdynamite_1); - Next[y][x] = Xdynamite_2; -} - -static void Ldynamite_2(int x, int y) -{ - play_element_sound(x, y, SOUND_tick, Xdynamite_2); - Next[y][x] = Xdynamite_3; -} - -static void Ldynamite_3(int x, int y) -{ - play_element_sound(x, y, SOUND_tick, Xdynamite_3); - Next[y][x] = Xdynamite_4; -} - -static void Ldynamite_4(int x, int y) -{ - play_element_sound(x, y, SOUND_tick, Xdynamite_4); - Next[y][x] = Zdynamite; - Boom[y-1][x-1] = Xblank; - Boom[y-1][x] = Xblank; - Boom[y-1][x+1] = Xblank; - Boom[y][x-1] = Xblank; - Boom[y][x] = Xblank; - Boom[y][x+1] = Xblank; - Boom[y+1][x-1] = Xblank; - Boom[y+1][x] = Xblank; - Boom[y+1][x+1] = Xblank; -} - -static void Lwheel(int x, int y) -{ - if (lev.wheel_cnt && x == lev.wheel_x && y == lev.wheel_y) - Cave[y][x] = XwheelB; -} - -static void Lswitch(int x, int y) -{ - if (lev.ball_state) - Cave[y][x] = XswitchB; -} - -static void Lfake_amoeba(int x, int y) -{ - if (lev.lenses_cnt) - Cave[y][x] = Xfake_amoebaB; -} - -static void Lfake_blank(int x, int y) -{ - if (lev.lenses_cnt) - Cave[y][x] = Xfake_blankB; -} - -static void Lfake_grass(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xfake_grassB; -} - -static void Lfake_door_1(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_1; -} - -static void Lfake_door_2(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_2; -} - -static void Lfake_door_3(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_3; -} - -static void Lfake_door_4(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_4; -} - -static void Lfake_door_5(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_5; -} - -static void Lfake_door_6(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_6; -} - -static void Lfake_door_7(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_7; -} - -static void Lfake_door_8(int x, int y) -{ - if (lev.magnify_cnt) - Cave[y][x] = Xdoor_8; + Next[x][y] = Xblank; } static void Lboom_1(int x, int y) { - Next[y][x] = Xboom_2; + Next[x][y] = Xboom_2; #if !PLAY_ELEMENT_SOUND if (x != lev.exit_x && y != lev.exit_y) play_sound(x, y, SOUND_boom); @@ -4961,7 +4941,7 @@ static void Lboom_1(int x, int y) static void Lboom_2(int x, int y) { - Next[y][x] = Boom[y][x]; + Next[x][y] = Boom[x][y]; } static void Lboom_android(int x, int y) @@ -4973,218 +4953,198 @@ static void Lboom_android(int x, int y) Lboom_1(x, y); } -void synchro_2(void) +static void handle_tile(int x, int y) { - int x = 0; - int y = 1; - short *cave_cache = Cave[y]; /* might be a win */ - int element; - - random_em = RandomEM; - score = 0; - - loop: - - element = cave_cache[++x]; - - switch (element) + switch (Cave[x][y]) { - case Xacid_1: Lacid_1(x, y); goto loop; - case Xacid_2: Lacid_2(x, y); goto loop; - case Xacid_3: Lacid_3(x, y); goto loop; - case Xacid_4: Lacid_4(x, y); goto loop; - case Xacid_5: Lacid_5(x, y); goto loop; - case Xacid_6: Lacid_6(x, y); goto loop; - case Xacid_7: Lacid_7(x, y); goto loop; - case Xacid_8: Lacid_8(x, y); goto loop; - - case Xfake_acid_1: Lfake_acid_1(x, y); goto loop; - case Xfake_acid_2: Lfake_acid_2(x, y); goto loop; - case Xfake_acid_3: Lfake_acid_3(x, y); goto loop; - case Xfake_acid_4: Lfake_acid_4(x, y); goto loop; - case Xfake_acid_5: Lfake_acid_5(x, y); goto loop; - case Xfake_acid_6: Lfake_acid_6(x, y); goto loop; - case Xfake_acid_7: Lfake_acid_7(x, y); goto loop; - case Xfake_acid_8: Lfake_acid_8(x, y); goto loop; - - case Xandroid: Landroid(x, y); goto loop; - case Xandroid_1_n: Landroid_1_n(x, y); goto loop; - case Xandroid_2_n: Landroid_2_n(x, y); goto loop; - case Xandroid_1_e: Landroid_1_e(x, y); goto loop; - case Xandroid_2_e: Landroid_2_e(x, y); goto loop; - case Xandroid_1_s: Landroid_1_s(x, y); goto loop; - case Xandroid_2_s: Landroid_2_s(x, y); goto loop; - case Xandroid_1_w: Landroid_1_w(x, y); goto loop; - case Xandroid_2_w: Landroid_2_w(x, y); goto loop; - - case Xeater_n: Leater_n(x, y); goto loop; - case Xeater_e: Leater_e(x, y); goto loop; - case Xeater_s: Leater_s(x, y); goto loop; - case Xeater_w: Leater_w(x, y); goto loop; - - case Xalien: Lalien(x, y); goto loop; - case Xalien_pause: Lalien_pause(x, y); goto loop; - - case Xbug_1_n: Lbug_1_n(x, y); goto loop; - case Xbug_2_n: Lbug_2_n(x, y); goto loop; - case Xbug_1_e: Lbug_1_e(x, y); goto loop; - case Xbug_2_e: Lbug_2_e(x, y); goto loop; - case Xbug_1_s: Lbug_1_s(x, y); goto loop; - case Xbug_2_s: Lbug_2_s(x, y); goto loop; - case Xbug_1_w: Lbug_1_w(x, y); goto loop; - case Xbug_2_w: Lbug_2_w(x, y); goto loop; - - case Xtank_1_n: Ltank_1_n(x, y); goto loop; - case Xtank_2_n: Ltank_2_n(x, y); goto loop; - case Xtank_1_e: Ltank_1_e(x, y); goto loop; - case Xtank_2_e: Ltank_2_e(x, y); goto loop; - case Xtank_1_s: Ltank_1_s(x, y); goto loop; - case Xtank_2_s: Ltank_2_s(x, y); goto loop; - case Xtank_1_w: Ltank_1_w(x, y); goto loop; - case Xtank_2_w: Ltank_2_w(x, y); goto loop; - - case Xemerald: Lemerald(x, y); goto loop; - case Xemerald_pause: Lemerald_pause(x, y); goto loop; - case Xemerald_fall: Lemerald_fall(x, y); goto loop; - - case Xdiamond: Ldiamond(x, y); goto loop; - case Xdiamond_pause: Ldiamond_pause(x, y); goto loop; - case Xdiamond_fall: Ldiamond_fall(x, y); goto loop; - - case Xstone: Lstone(x, y); goto loop; - case Xstone_pause: Lstone_pause(x, y); goto loop; - case Xstone_fall: Lstone_fall(x, y); goto loop; - - case Xbomb: Lbomb(x, y); goto loop; - case Xbomb_pause: Lbomb_pause(x, y); goto loop; - case Xbomb_fall: Lbomb_fall(x, y); goto loop; - - case Xnut: Lnut(x, y); goto loop; - case Xnut_pause: Lnut_pause(x, y); goto loop; - case Xnut_fall: Lnut_fall(x, y); goto loop; - - case Xspring: Lspring(x, y); goto loop; - case Xspring_pause: Lspring_pause(x, y); goto loop; - case Xspring_e: Lspring_e(x, y); goto loop; - case Xspring_w: Lspring_w(x, y); goto loop; - case Xspring_fall: Lspring_fall(x, y); goto loop; - - case Xpush_emerald_e: Lpush_emerald_e(x, y); goto loop; - case Xpush_emerald_w: Lpush_emerald_w(x, y); goto loop; - case Xpush_diamond_e: Lpush_diamond_e(x, y); goto loop; - case Xpush_diamond_w: Lpush_diamond_w(x, y); goto loop; - case Xpush_stone_e: Lpush_stone_e(x, y); goto loop; - case Xpush_stone_w: Lpush_stone_w(x, y); goto loop; - case Xpush_bomb_e: Lpush_bomb_e(x, y); goto loop; - case Xpush_bomb_w: Lpush_bomb_w(x, y); goto loop; - case Xpush_nut_e: Lpush_nut_e(x, y); goto loop; - case Xpush_nut_w: Lpush_nut_w(x, y); goto loop; - case Xpush_spring_e: Lpush_spring_e(x, y); goto loop; - case Xpush_spring_w: Lpush_spring_w(x, y); goto loop; - - case Xdynamite_1: Ldynamite_1(x, y); goto loop; - case Xdynamite_2: Ldynamite_2(x, y); goto loop; - case Xdynamite_3: Ldynamite_3(x, y); goto loop; - case Xdynamite_4: Ldynamite_4(x, y); goto loop; - - case Xfake_door_1: Lfake_door_1(x, y); goto loop; - case Xfake_door_2: Lfake_door_2(x, y); goto loop; - case Xfake_door_3: Lfake_door_3(x, y); goto loop; - case Xfake_door_4: Lfake_door_4(x, y); goto loop; - case Xfake_door_5: Lfake_door_5(x, y); goto loop; - case Xfake_door_6: Lfake_door_6(x, y); goto loop; - case Xfake_door_7: Lfake_door_7(x, y); goto loop; - case Xfake_door_8: Lfake_door_8(x, y); goto loop; - - case Xballoon: Lballoon(x, y); goto loop; - - case Xball_1: Lball_1(x, y); goto loop; - case Xball_2: Lball_2(x, y); goto loop; - - case Xdrip: Ldrip(x, y); goto loop; - case Xdrip_fall: Ldrip_fall(x, y); goto loop; - case Xdrip_stretch: Ldrip_stretch(x, y); goto loop; - case Xdrip_stretchB: Ldrip_stretchB(x, y); goto loop; - - case Xwonderwall: Lwonderwall(x, y); goto loop; - - case Xwheel: Lwheel(x, y); goto loop; - - case Xswitch: Lswitch(x, y); goto loop; - - case Xfake_blank: Lfake_blank(x, y); goto loop; - case Xfake_grass: Lfake_grass(x, y); goto loop; - case Xfake_amoeba: Lfake_amoeba(x, y); goto loop; - - case Xsand_stone: Lsand_stone(x, y); goto loop; - case Xsand_stonein_1: Lsand_stonein_1(x, y); goto loop; - case Xsand_stonein_2: Lsand_stonein_2(x, y); goto loop; - case Xsand_stonein_3: Lsand_stonein_3(x, y); goto loop; - case Xsand_stonein_4: Lsand_stonein_4(x, y); goto loop; - case Xsand_sandstone_1: Lsand_sandstone_1(x, y); goto loop; - case Xsand_sandstone_2: Lsand_sandstone_2(x, y); goto loop; - case Xsand_sandstone_3: Lsand_sandstone_3(x, y); goto loop; - case Xsand_sandstone_4: Lsand_sandstone_4(x, y); goto loop; - case Xsand_stonesand_1: Lsand_stonesand_1(x, y); goto loop; - case Xsand_stonesand_2: Lsand_stonesand_2(x, y); goto loop; - case Xsand_stonesand_3: Lsand_stonesand_3(x, y); goto loop; - case Xsand_stonesand_4: Lsand_stonesand_4(x, y); goto loop; - case Xsand_stoneout_1: Lsand_stoneout_1(x, y); goto loop; - case Xsand_stoneout_2: Lsand_stoneout_2(x, y); goto loop; -#if 1 - case Xsand_stonesand_quickout_1:Lsand_stonesand_quickout_1(x, y);goto loop; - case Xsand_stonesand_quickout_2:Lsand_stonesand_quickout_2(x, y);goto loop; + case Xacid_1: Lacid_1(x, y); break; + case Xacid_2: Lacid_2(x, y); break; + case Xacid_3: Lacid_3(x, y); break; + case Xacid_4: Lacid_4(x, y); break; + case Xacid_5: Lacid_5(x, y); break; + case Xacid_6: Lacid_6(x, y); break; + 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; + case Xfake_acid_4: Lfake_acid_4(x, y); break; + case Xfake_acid_5: Lfake_acid_5(x, y); break; + 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 Xslidewall_ns: Lslidewall_ns(x, y); goto loop; - case Xslidewall_ew: Lslidewall_ew(x, y); goto loop; - - case Xexit: Lexit(x, y); goto loop; - case Xexit_1: Lexit_1(x, y); goto loop; - case Xexit_2: Lexit_2(x, y); goto loop; - case Xexit_3: Lexit_3(x, y); goto loop; - - case Xpause: Lpause(x, y); goto loop; + case Xandroid: Landroid(x, y); break; + case Xandroid_1_n: Landroid_1_n(x, y); break; + case Xandroid_2_n: Landroid_2_n(x, y); break; + case Xandroid_1_e: Landroid_1_e(x, y); break; + case Xandroid_2_e: Landroid_2_e(x, y); break; + case Xandroid_1_s: Landroid_1_s(x, y); break; + case Xandroid_2_s: Landroid_2_s(x, y); break; + case Xandroid_1_w: Landroid_1_w(x, y); break; + case Xandroid_2_w: Landroid_2_w(x, y); break; + + case Xeater_n: Leater_n(x, y); break; + case Xeater_e: Leater_e(x, y); break; + case Xeater_s: Leater_s(x, y); break; + case Xeater_w: Leater_w(x, y); break; + + case Xalien: Lalien(x, y); break; + case Xalien_pause: Lalien_pause(x, y); break; + + case Xbug_1_n: Lbug_1_n(x, y); break; + case Xbug_2_n: Lbug_2_n(x, y); break; + case Xbug_1_e: Lbug_1_e(x, y); break; + case Xbug_2_e: Lbug_2_e(x, y); break; + case Xbug_1_s: Lbug_1_s(x, y); break; + case Xbug_2_s: Lbug_2_s(x, y); break; + case Xbug_1_w: Lbug_1_w(x, y); break; + case Xbug_2_w: Lbug_2_w(x, y); break; + + case Xtank_1_n: Ltank_1_n(x, y); break; + case Xtank_2_n: Ltank_2_n(x, y); break; + case Xtank_1_e: Ltank_1_e(x, y); break; + case Xtank_2_e: Ltank_2_e(x, y); break; + case Xtank_1_s: Ltank_1_s(x, y); break; + case Xtank_2_s: Ltank_2_s(x, y); break; + case Xtank_1_w: Ltank_1_w(x, y); break; + case Xtank_2_w: Ltank_2_w(x, y); break; + + case Xemerald: Lemerald(x, y); break; + case Xemerald_pause: Lemerald_pause(x, y); break; + case Xemerald_fall: Lemerald_fall(x, y); break; + + case Xdiamond: Ldiamond(x, y); break; + case Xdiamond_pause: Ldiamond_pause(x, y); break; + case Xdiamond_fall: Ldiamond_fall(x, y); break; + + case Xstone: Lstone(x, y); break; + case Xstone_pause: Lstone_pause(x, y); break; + case Xstone_fall: Lstone_fall(x, y); break; + + case Xbomb: Lbomb(x, y); break; + case Xbomb_pause: Lbomb_pause(x, y); break; + case Xbomb_fall: Lbomb_fall(x, y); break; + + case Xnut: Lnut(x, y); break; + case Xnut_pause: Lnut_pause(x, y); break; + case Xnut_fall: Lnut_fall(x, y); break; + + case Xspring: Lspring(x, y); break; + case Xspring_pause: Lspring_pause(x, y); break; + case Xspring_e: Lspring_e(x, y); break; + case Xspring_w: Lspring_w(x, y); break; + case Xspring_fall: Lspring_fall(x, y); break; + + case Xpush_emerald_e: Lpush_emerald_e(x, y); break; + case Xpush_emerald_w: Lpush_emerald_w(x, y); break; + case Xpush_diamond_e: Lpush_diamond_e(x, y); break; + case Xpush_diamond_w: Lpush_diamond_w(x, y); break; + case Xpush_stone_e: Lpush_stone_e(x, y); break; + case Xpush_stone_w: Lpush_stone_w(x, y); break; + case Xpush_bomb_e: Lpush_bomb_e(x, y); break; + case Xpush_bomb_w: Lpush_bomb_w(x, y); break; + case Xpush_nut_e: Lpush_nut_e(x, y); break; + case Xpush_nut_w: Lpush_nut_w(x, y); break; + case Xpush_spring_e: Lpush_spring_e(x, y); break; + case Xpush_spring_w: Lpush_spring_w(x, y); break; + + case Xdynamite_1: Ldynamite_1(x, y); break; + case Xdynamite_2: Ldynamite_2(x, y); break; + case Xdynamite_3: Ldynamite_3(x, y); break; + case Xdynamite_4: Ldynamite_4(x, y); break; + + case Xfake_door_1: Lfake_door_1(x, y); break; + case Xfake_door_2: Lfake_door_2(x, y); break; + case Xfake_door_3: Lfake_door_3(x, y); break; + case Xfake_door_4: Lfake_door_4(x, y); break; + case Xfake_door_5: Lfake_door_5(x, y); break; + case Xfake_door_6: Lfake_door_6(x, y); break; + case Xfake_door_7: Lfake_door_7(x, y); break; + case Xfake_door_8: Lfake_door_8(x, y); break; + + case Xballoon: Lballoon(x, y); break; + + case Xball_1: Lball_1(x, y); break; + case Xball_2: Lball_2(x, y); break; + + case Xdrip: Ldrip(x, y); break; + case Xdrip_fall: Ldrip_fall(x, y); break; + case Xdrip_stretch: Ldrip_stretch(x, y); break; + case Xdrip_stretchB: Ldrip_stretchB(x, y); break; + + case Xwonderwall: Lwonderwall(x, y); break; + + case Xwheel: Lwheel(x, y); break; + + case Xswitch: Lswitch(x, y); break; + + case Xfake_blank: Lfake_blank(x, y); break; + case Xfake_grass: Lfake_grass(x, y); break; + case Xfake_amoeba: Lfake_amoeba(x, y); break; + + case Xsand_stone: Lsand_stone(x, y); break; + case Xsand_stonein_1: Lsand_stonein_1(x, y); break; + case Xsand_stonein_2: Lsand_stonein_2(x, y); break; + case Xsand_stonein_3: Lsand_stonein_3(x, y); break; + case Xsand_stonein_4: Lsand_stonein_4(x, y); break; + case Xsand_sandstone_1: Lsand_sandstone_1(x, y); break; + case Xsand_sandstone_2: Lsand_sandstone_2(x, y); break; + case Xsand_sandstone_3: Lsand_sandstone_3(x, y); break; + case Xsand_sandstone_4: Lsand_sandstone_4(x, y); break; + case Xsand_stonesand_1: Lsand_stonesand_1(x, y); break; + case Xsand_stonesand_2: Lsand_stonesand_2(x, y); break; + case Xsand_stonesand_3: Lsand_stonesand_3(x, y); break; + 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 Xboom_bug: Lboom_bug(x, y); goto loop; - case Xboom_bomb: Lboom_tank(x, y); goto loop; - case Xboom_android: Lboom_android(x, y); goto loop; - case Xboom_1: Lboom_1(x, y); goto loop; - case Xboom_2: Lboom_2(x, y); goto loop; + case Xslidewall_ns: Lslidewall_ns(x, y); break; + case Xslidewall_ew: Lslidewall_ew(x, y); break; - case Zborder: - if (++y < HEIGHT - 1) - { - x = 0; - cave_cache = Cave[y]; - goto loop; - } + case Xexit: Lexit(x, y); break; + case Xexit_1: Lexit_1(x, y); break; + case Xexit_2: Lexit_2(x, y); break; + case Xexit_3: Lexit_3(x, y); break; - goto done; + case Xpause: Lpause(x, y); break; - default: - goto loop; + case Xboom_bug: Lboom_bug(x, y); break; + case Xboom_bomb: Lboom_tank(x, y); break; + case Xboom_android: Lboom_android(x, y); break; + case Xboom_1: Lboom_1(x, y); break; + case Xboom_2: Lboom_2(x, y); break; } +} + +void synchro_2(void) +{ + int x, y; -#undef RANDOM -#undef PLAY -#undef PLAY_FORCE + seed = RandomEM; + score = 0; - done: + for (y = 1; y < HEIGHT - 1; y++) + for (x = 0; x < WIDTH; x++) + handle_tile(x, y); if (ply[0].alive || ply[1].alive || ply[2].alive || ply[3].alive) lev.score += score; /* only add a score if someone is alive */ else game_em.game_over = TRUE; - RandomEM = random_em; + RandomEM = seed; - { - void *temp = Cave; - - /* triple buffering */ - Cave = Next; - Next = Draw; - Draw = temp; - } + /* triple buffering */ + void *temp = Cave; + Cave = Next; + Next = Draw; + Draw = temp; }