X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_em%2Ftab_generate.c;h=bcdecfe5c27cb664125e9ebd37601b9872bfea52;hb=afeec80878187293b10f7dcdd6ff3c094cc97e5d;hp=2828ecd32b672ba3d7ab4f6eef9e83a180343d50;hpb=88c9b68c44a16e7df62557b63cc7e86731e028c9;p=rocksndiamonds.git diff --git a/src/game_em/tab_generate.c b/src/game_em/tab_generate.c index 2828ecd3..bcdecfe5 100644 --- a/src/game_em/tab_generate.c +++ b/src/game_em/tab_generate.c @@ -2,7 +2,7 @@ * * construct some tables to be included directly in emerald mine source. * i made this because dynamically building the tables every time sucks and i - * need to be able to easily modify tile.h. + * need to be able to easily modify tile definitions. * * this is key data which almost everything depends on. * @@ -11,18 +11,17 @@ * modify. */ -#include "tile.h" -#include "display.h" +#include "main_em.h" -/* ---------------------------------------------------------------------- */ +/* ------------------------------------------------------------------------- */ /* 0=stop 1=blank */ int tile_blank[] = { Xblank, 1, - Yacid_splash_eB, 1, - Yacid_splash_wB, 1, + Xacid_splash_e, 1, + Xacid_splash_w, 1, TILE_MAX }; @@ -30,8 +29,8 @@ int tile_blank[] = int tile_acid[] = { Xblank, 1, - Yacid_splash_eB, 1, - Yacid_splash_wB, 1, + Xacid_splash_e, 1, + Xacid_splash_w, 1, Xacid_1, 1, Xacid_2, 1, Xacid_3, 1, @@ -46,8 +45,8 @@ int tile_acid[] = /* 0=stop 1=amoeba */ int tile_amoeba[] = { - Xdripper, 1, - XdripperB, 1, + Xfake_amoeba, 1, + Xfake_amoebaB, 1, Xamoeba_1, 1, Xamoeba_2, 1, Xamoeba_3, 1, @@ -63,19 +62,20 @@ int tile_amoeba[] = int tile_android_move[] = { Xblank, 1, - Yacid_splash_eB, 1, - Yacid_splash_wB, 1, + Xacid_splash_e, 1, + Xacid_splash_w, 1, Xplant, 1, TILE_MAX }; -/* ---------------------------------------------------------------------- */ + +/* ------------------------------------------------------------------------- */ /* explosions: special format */ /* everything is initially filled with Xboom_1 */ int tile_explode[] = { - ZBORDER, + Zborder, Znormal, Zdynamite, Xboom_bug, @@ -127,14 +127,14 @@ int tile_explode[] = Xsteel_4, TILE_MAX, /* up till here are indestructable */ - Xbug_n, Xboom_bug, - Xbug_e, Xboom_bug, - Xbug_s, Xboom_bug, - Xbug_w, Xboom_bug, - Xbug_gon, Xboom_bug, - Xbug_goe, Xboom_bug, - Xbug_gos, Xboom_bug, - Xbug_gow, Xboom_bug, + Xbug_1_n, Xboom_bug, + Xbug_1_e, Xboom_bug, + Xbug_1_s, Xboom_bug, + Xbug_1_w, Xboom_bug, + Xbug_2_n, Xboom_bug, + Xbug_2_e, Xboom_bug, + Xbug_2_s, Xboom_bug, + Xbug_2_w, Xboom_bug, Xbomb, Xboom_bomb, Xbomb_pause, Xboom_bomb, Xbomb_fall, Xboom_bomb, @@ -152,7 +152,8 @@ int tile_explode[] = TILE_MAX /* up until here are dynamite explosions */ }; -/* ---------------------------------------------------------------------- */ + +/* ------------------------------------------------------------------------- */ /* map the graphics file to internal tiles and animations * @@ -244,22 +245,22 @@ int obj_map[] = Xstone_fall, 7, #ifdef BAD_ROLL - Xstone_force_e, 0, - Xstone_force_e, 1, - Xstone_force_e, 2, - Xstone_force_e, 3, - Xstone_force_e, 4, - Xstone_force_e, 5, - Xstone_force_e, 6, - Xstone_force_e, 7, - Xstone_force_w, 0, - Xstone_force_w, 1, - Xstone_force_w, 2, - Xstone_force_w, 3, - Xstone_force_w, 4, - Xstone_force_w, 5, - Xstone_force_w, 6, - Xstone_force_w, 7, + Xpush_stone_e, 0, + Xpush_stone_e, 1, + Xpush_stone_e, 2, + Xpush_stone_e, 3, + Xpush_stone_e, 4, + Xpush_stone_e, 5, + Xpush_stone_e, 6, + Xpush_stone_e, 7, + Xpush_stone_w, 0, + Xpush_stone_w, 1, + Xpush_stone_w, 2, + Xpush_stone_w, 3, + Xpush_stone_w, 4, + Xpush_stone_w, 5, + Xpush_stone_w, 6, + Xpush_stone_w, 7, #endif Ystone_s, 7, @@ -364,22 +365,22 @@ int obj_map[] = Xnut_fall, 7, #ifdef BAD_ROLL - Xnut_force_e, 0, - Xnut_force_e, 1, - Xnut_force_e, 2, - Xnut_force_e, 3, - Xnut_force_e, 4, - Xnut_force_e, 5, - Xnut_force_e, 6, - Xnut_force_e, 7, - Xnut_force_w, 0, - Xnut_force_w, 1, - Xnut_force_w, 2, - Xnut_force_w, 3, - Xnut_force_w, 4, - Xnut_force_w, 5, - Xnut_force_w, 6, - Xnut_force_w, 7, + Xpush_nut_e, 0, + Xpush_nut_e, 1, + Xpush_nut_e, 2, + Xpush_nut_e, 3, + Xpush_nut_e, 4, + Xpush_nut_e, 5, + Xpush_nut_e, 6, + Xpush_nut_e, 7, + Xpush_nut_w, 0, + Xpush_nut_w, 1, + Xpush_nut_w, 2, + Xpush_nut_w, 3, + Xpush_nut_w, 4, + Xpush_nut_w, 5, + Xpush_nut_w, 6, + Xpush_nut_w, 7, #endif -1, @@ -424,14 +425,14 @@ int obj_map[] = Xfake_blank, 5, Xfake_blank, 6, Xfake_blank, 7, - Xdripper, 0, - Xdripper, 1, - Xdripper, 2, - Xdripper, 3, - Xdripper, 4, - Xdripper, 5, - Xdripper, 6, - Xdripper, 7, + Xfake_amoeba, 0, + Xfake_amoeba, 1, + Xfake_amoeba, 2, + Xfake_amoeba, 3, + Xfake_amoeba, 4, + Xfake_amoeba, 5, + Xfake_amoeba, 6, + Xfake_amoeba, 7, Zplayer, 0, Zplayer, 1, Zplayer, 2, @@ -440,11 +441,11 @@ int obj_map[] = Zplayer, 5, Zplayer, 6, Zplayer, 7, - Ydynamite_eat, 3, - Ydynamite_eat, 4, - Ydynamite_eat, 5, - Ydynamite_eat, 6, - Ydynamite_eat, 7, + Ydynamite_blank, 3, + Ydynamite_blank, 4, + Ydynamite_blank, 5, + Ydynamite_blank, 6, + Ydynamite_blank, 7, -1, -1, -1, @@ -540,82 +541,82 @@ int obj_map[] = Ybug_w_n, 7, Ybug_e_n, 7, Ybug_n, 7, - Xbug_n, 0, - Xbug_n, 1, - Xbug_n, 2, - Xbug_n, 3, - Xbug_n, 4, - Xbug_n, 5, - Xbug_n, 6, - Xbug_n, 7, - Xbug_gon, 0, - Xbug_gon, 1, - Xbug_gon, 2, - Xbug_gon, 3, - Xbug_gon, 4, - Xbug_gon, 5, - Xbug_gon, 6, - Xbug_gon, 7, + Xbug_1_n, 0, + Xbug_1_n, 1, + Xbug_1_n, 2, + Xbug_1_n, 3, + Xbug_1_n, 4, + Xbug_1_n, 5, + Xbug_1_n, 6, + Xbug_1_n, 7, + Xbug_2_n, 0, + Xbug_2_n, 1, + Xbug_2_n, 2, + Xbug_2_n, 3, + Xbug_2_n, 4, + Xbug_2_n, 5, + Xbug_2_n, 6, + Xbug_2_n, 7, -1, Ybug_n_e, 7, Ybug_s_e, 7, Ybug_e, 7, - Xbug_e, 0, - Xbug_e, 1, - Xbug_e, 2, - Xbug_e, 3, - Xbug_e, 4, - Xbug_e, 5, - Xbug_e, 6, - Xbug_e, 7, - Xbug_goe, 0, - Xbug_goe, 1, - Xbug_goe, 2, - Xbug_goe, 3, - Xbug_goe, 4, - Xbug_goe, 5, - Xbug_goe, 6, - Xbug_goe, 7, + Xbug_1_e, 0, + Xbug_1_e, 1, + Xbug_1_e, 2, + Xbug_1_e, 3, + Xbug_1_e, 4, + Xbug_1_e, 5, + Xbug_1_e, 6, + Xbug_1_e, 7, + Xbug_2_e, 0, + Xbug_2_e, 1, + Xbug_2_e, 2, + Xbug_2_e, 3, + Xbug_2_e, 4, + Xbug_2_e, 5, + Xbug_2_e, 6, + Xbug_2_e, 7, -1, Ybug_e_s, 7, Ybug_w_s, 7, Ybug_s, 7, - Xbug_s, 0, - Xbug_s, 1, - Xbug_s, 2, - Xbug_s, 3, - Xbug_s, 4, - Xbug_s, 5, - Xbug_s, 6, - Xbug_s, 7, - Xbug_gos, 0, - Xbug_gos, 1, - Xbug_gos, 2, - Xbug_gos, 3, - Xbug_gos, 4, - Xbug_gos, 5, - Xbug_gos, 6, - Xbug_gos, 7, + Xbug_1_s, 0, + Xbug_1_s, 1, + Xbug_1_s, 2, + Xbug_1_s, 3, + Xbug_1_s, 4, + Xbug_1_s, 5, + Xbug_1_s, 6, + Xbug_1_s, 7, + Xbug_2_s, 0, + Xbug_2_s, 1, + Xbug_2_s, 2, + Xbug_2_s, 3, + Xbug_2_s, 4, + Xbug_2_s, 5, + Xbug_2_s, 6, + Xbug_2_s, 7, -1, Ybug_n_w, 7, Ybug_s_w, 7, Ybug_w, 7, - Xbug_w, 0, - Xbug_w, 1, - Xbug_w, 2, - Xbug_w, 3, - Xbug_w, 4, - Xbug_w, 5, - Xbug_w, 6, - Xbug_w, 7, - Xbug_gow, 0, - Xbug_gow, 1, - Xbug_gow, 2, - Xbug_gow, 3, - Xbug_gow, 4, - Xbug_gow, 5, - Xbug_gow, 6, - Xbug_gow, 7, + Xbug_1_w, 0, + Xbug_1_w, 1, + Xbug_1_w, 2, + Xbug_1_w, 3, + Xbug_1_w, 4, + Xbug_1_w, 5, + Xbug_1_w, 6, + Xbug_1_w, 7, + Xbug_2_w, 0, + Xbug_2_w, 1, + Xbug_2_w, 2, + Xbug_2_w, 3, + Xbug_2_w, 4, + Xbug_2_w, 5, + Xbug_2_w, 6, + Xbug_2_w, 7, -1, Ybug_n, 0, -1, @@ -845,82 +846,82 @@ int obj_map[] = Ytank_w_n, 7, Ytank_e_n, 7, Ytank_n, 7, - Xtank_n, 0, - Xtank_n, 1, - Xtank_n, 2, - Xtank_n, 3, - Xtank_n, 4, - Xtank_n, 5, - Xtank_n, 6, - Xtank_n, 7, - Xtank_gon, 0, - Xtank_gon, 1, - Xtank_gon, 2, - Xtank_gon, 3, - Xtank_gon, 4, - Xtank_gon, 5, - Xtank_gon, 6, - Xtank_gon, 7, + Xtank_1_n, 0, + Xtank_1_n, 1, + Xtank_1_n, 2, + Xtank_1_n, 3, + Xtank_1_n, 4, + Xtank_1_n, 5, + Xtank_1_n, 6, + Xtank_1_n, 7, + Xtank_2_n, 0, + Xtank_2_n, 1, + Xtank_2_n, 2, + Xtank_2_n, 3, + Xtank_2_n, 4, + Xtank_2_n, 5, + Xtank_2_n, 6, + Xtank_2_n, 7, -1, Ytank_n_e, 7, Ytank_s_e, 7, Ytank_e, 7, - Xtank_e, 0, - Xtank_e, 1, - Xtank_e, 2, - Xtank_e, 3, - Xtank_e, 4, - Xtank_e, 5, - Xtank_e, 6, - Xtank_e, 7, - Xtank_goe, 0, - Xtank_goe, 1, - Xtank_goe, 2, - Xtank_goe, 3, - Xtank_goe, 4, - Xtank_goe, 5, - Xtank_goe, 6, - Xtank_goe, 7, + Xtank_1_e, 0, + Xtank_1_e, 1, + Xtank_1_e, 2, + Xtank_1_e, 3, + Xtank_1_e, 4, + Xtank_1_e, 5, + Xtank_1_e, 6, + Xtank_1_e, 7, + Xtank_2_e, 0, + Xtank_2_e, 1, + Xtank_2_e, 2, + Xtank_2_e, 3, + Xtank_2_e, 4, + Xtank_2_e, 5, + Xtank_2_e, 6, + Xtank_2_e, 7, -1, Ytank_e_s, 7, Ytank_w_s, 7, Ytank_s, 7, - Xtank_s, 0, - Xtank_s, 1, - Xtank_s, 2, - Xtank_s, 3, - Xtank_s, 4, - Xtank_s, 5, - Xtank_s, 6, - Xtank_s, 7, - Xtank_gos, 0, - Xtank_gos, 1, - Xtank_gos, 2, - Xtank_gos, 3, - Xtank_gos, 4, - Xtank_gos, 5, - Xtank_gos, 6, - Xtank_gos, 7, + Xtank_1_s, 0, + Xtank_1_s, 1, + Xtank_1_s, 2, + Xtank_1_s, 3, + Xtank_1_s, 4, + Xtank_1_s, 5, + Xtank_1_s, 6, + Xtank_1_s, 7, + Xtank_2_s, 0, + Xtank_2_s, 1, + Xtank_2_s, 2, + Xtank_2_s, 3, + Xtank_2_s, 4, + Xtank_2_s, 5, + Xtank_2_s, 6, + Xtank_2_s, 7, -1, Ytank_n_w, 7, Ytank_s_w, 7, Ytank_w, 7, - Xtank_w, 0, - Xtank_w, 1, - Xtank_w, 2, - Xtank_w, 3, - Xtank_w, 4, - Xtank_w, 5, - Xtank_w, 6, - Xtank_w, 7, - Xtank_gow, 0, - Xtank_gow, 1, - Xtank_gow, 2, - Xtank_gow, 3, - Xtank_gow, 4, - Xtank_gow, 5, - Xtank_gow, 6, - Xtank_gow, 7, + Xtank_1_w, 0, + Xtank_1_w, 1, + Xtank_1_w, 2, + Xtank_1_w, 3, + Xtank_1_w, 4, + Xtank_1_w, 5, + Xtank_1_w, 6, + Xtank_1_w, 7, + Xtank_2_w, 0, + Xtank_2_w, 1, + Xtank_2_w, 2, + Xtank_2_w, 3, + Xtank_2_w, 4, + Xtank_2_w, 5, + Xtank_2_w, 6, + Xtank_2_w, 7, -1, Ytank_n, 0, -1, @@ -1413,8 +1414,8 @@ int obj_map[] = Yspring_e, 7, Yspring_w, 7, - Yspring_kill_e, 7, - Yspring_kill_w, 7, + Yspring_alien_e, 7, + Yspring_alien_w, 7, Yspring_s, 7, Xspring, 0, Xspring, 1, @@ -1458,22 +1459,22 @@ int obj_map[] = Xspring_fall, 7, #ifdef BAD_ROLL - Xspring_force_e, 0, - Xspring_force_e, 1, - Xspring_force_e, 2, - Xspring_force_e, 3, - Xspring_force_e, 4, - Xspring_force_e, 5, - Xspring_force_e, 6, - Xspring_force_e, 7, - Xspring_force_w, 0, - Xspring_force_w, 1, - Xspring_force_w, 2, - Xspring_force_w, 3, - Xspring_force_w, 4, - Xspring_force_w, 5, - Xspring_force_w, 6, - Xspring_force_w, 7, + Xpush_spring_e, 0, + Xpush_spring_e, 1, + Xpush_spring_e, 2, + Xpush_spring_e, 3, + Xpush_spring_e, 4, + Xpush_spring_e, 5, + Xpush_spring_e, 6, + Xpush_spring_e, 7, + Xpush_spring_w, 0, + Xpush_spring_w, 1, + Xpush_spring_w, 2, + Xpush_spring_w, 3, + Xpush_spring_w, 4, + Xpush_spring_w, 5, + Xpush_spring_w, 6, + Xpush_spring_w, 7, #endif -1, @@ -1547,61 +1548,61 @@ int obj_map[] = Yspring_e, 0, Yspring_wB, 6, -1, - Yspring_kill_eB, 6, + Yspring_alien_eB, 6, -1, - Yspring_kill_e, 6, + Yspring_alien_e, 6, -1, - Yspring_kill_eB, 5, + Yspring_alien_eB, 5, -1, - Yspring_kill_e, 5, + Yspring_alien_e, 5, -1, - Yspring_kill_eB, 4, + Yspring_alien_eB, 4, -1, - Yspring_kill_e, 4, + Yspring_alien_e, 4, -1, - Yspring_kill_eB, 3, + Yspring_alien_eB, 3, -1, - Yspring_kill_e, 3, + Yspring_alien_e, 3, -1, - Yspring_kill_eB, 2, + Yspring_alien_eB, 2, -1, - Yspring_kill_e, 2, + Yspring_alien_e, 2, -1, - Yspring_kill_eB, 1, + Yspring_alien_eB, 1, -1, - Yspring_kill_e, 1, + Yspring_alien_e, 1, -1, - Yspring_kill_eB, 0, + Yspring_alien_eB, 0, -1, - Yspring_kill_e, 0, + Yspring_alien_e, 0, -1, - Yspring_kill_w, 0, + Yspring_alien_w, 0, -1, - Yspring_kill_wB, 0, + Yspring_alien_wB, 0, -1, - Yspring_kill_w, 1, + Yspring_alien_w, 1, -1, - Yspring_kill_wB, 1, + Yspring_alien_wB, 1, -1, - Yspring_kill_w, 2, + Yspring_alien_w, 2, -1, - Yspring_kill_wB, 2, + Yspring_alien_wB, 2, -1, - Yspring_kill_w, 3, + Yspring_alien_w, 3, -1, - Yspring_kill_wB, 3, + Yspring_alien_wB, 3, -1, - Yspring_kill_w, 4, + Yspring_alien_w, 4, -1, - Yspring_kill_wB, 4, + Yspring_alien_wB, 4, -1, - Yspring_kill_w, 5, + Yspring_alien_w, 5, -1, - Yspring_kill_wB, 5, + Yspring_alien_wB, 5, -1, - Yspring_kill_w, 6, + Yspring_alien_w, 6, -1, - Yspring_kill_wB, 6, + Yspring_alien_wB, 6, -1, Xeater_n, 0, @@ -1920,27 +1921,27 @@ int obj_map[] = Xemerald_fall, 7, #ifdef BAD_ROLL - Xemerald_force_e, 0, - Xemerald_force_e, 1, - Xemerald_force_e, 2, - Xemerald_force_e, 3, - Xemerald_force_e, 4, - Xemerald_force_e, 5, - Xemerald_force_e, 6, - Xemerald_force_e, 7, - Xemerald_force_w, 0, - Xemerald_force_w, 1, - Xemerald_force_w, 2, - Xemerald_force_w, 3, - Xemerald_force_w, 4, - Xemerald_force_w, 5, - Xemerald_force_w, 6, - Xemerald_force_w, 7, + Xpush_emerald_e, 0, + Xpush_emerald_e, 1, + Xpush_emerald_e, 2, + Xpush_emerald_e, 3, + Xpush_emerald_e, 4, + Xpush_emerald_e, 5, + Xpush_emerald_e, 6, + Xpush_emerald_e, 7, + Xpush_emerald_w, 0, + Xpush_emerald_w, 1, + Xpush_emerald_w, 2, + Xpush_emerald_w, 3, + Xpush_emerald_w, 4, + Xpush_emerald_w, 5, + Xpush_emerald_w, 6, + Xpush_emerald_w, 7, #endif Xemerald_shine, 0, Xemerald_shine, 7, - Yemerald_stone, 7, + Ynut_stone, 7, Yemerald_s, 7, Yemerald_e, 7, Yemerald_w, 7, @@ -2024,33 +2025,33 @@ int obj_map[] = Yemerald_e, 0, Yemerald_wB, 6, -1, - Yemerald_eat, 6, + Yemerald_blank, 6, -1, - Yemerald_eat, 5, + Yemerald_blank, 5, -1, - Yemerald_eat, 4, + Yemerald_blank, 4, -1, - Yemerald_eat, 3, + Yemerald_blank, 3, -1, - Yemerald_eat, 2, + Yemerald_blank, 2, -1, - Yemerald_eat, 1, + Yemerald_blank, 1, -1, - Yemerald_eat, 0, + Yemerald_blank, 0, -1, - Yemerald_stone, 0, + Ynut_stone, 0, -1, - Yemerald_stone, 1, + Ynut_stone, 1, -1, - Yemerald_stone, 2, + Ynut_stone, 2, -1, - Yemerald_stone, 3, + Ynut_stone, 3, -1, - Yemerald_stone, 4, + Ynut_stone, 4, -1, - Yemerald_stone, 5, + Ynut_stone, 5, -1, - Yemerald_stone, 6, + Ynut_stone, 6, -1, Xdiamond, 0, @@ -2079,22 +2080,22 @@ int obj_map[] = Xdiamond_fall, 7, #ifdef BAD_ROLL - Xdiamond_force_e, 0, - Xdiamond_force_e, 1, - Xdiamond_force_e, 2, - Xdiamond_force_e, 3, - Xdiamond_force_e, 4, - Xdiamond_force_e, 5, - Xdiamond_force_e, 6, - Xdiamond_force_e, 7, - Xdiamond_force_w, 0, - Xdiamond_force_w, 1, - Xdiamond_force_w, 2, - Xdiamond_force_w, 3, - Xdiamond_force_w, 4, - Xdiamond_force_w, 5, - Xdiamond_force_w, 6, - Xdiamond_force_w, 7, + Xpush_diamond_e, 0, + Xpush_diamond_e, 1, + Xpush_diamond_e, 2, + Xpush_diamond_e, 3, + Xpush_diamond_e, 4, + Xpush_diamond_e, 5, + Xpush_diamond_e, 6, + Xpush_diamond_e, 7, + Xpush_diamond_w, 0, + Xpush_diamond_w, 1, + Xpush_diamond_w, 2, + Xpush_diamond_w, 3, + Xpush_diamond_w, 4, + Xpush_diamond_w, 5, + Xpush_diamond_w, 6, + Xpush_diamond_w, 7, #endif Xdiamond_shine, 0, @@ -2182,19 +2183,19 @@ int obj_map[] = Ydiamond_e, 0, Ydiamond_wB, 6, -1, - Ydiamond_eat, 6, + Ydiamond_blank, 6, -1, - Ydiamond_eat, 5, + Ydiamond_blank, 5, -1, - Ydiamond_eat, 4, + Ydiamond_blank, 4, -1, - Ydiamond_eat, 3, + Ydiamond_blank, 3, -1, - Ydiamond_eat, 2, + Ydiamond_blank, 2, -1, - Ydiamond_eat, 1, + Ydiamond_blank, 1, -1, - Ydiamond_eat, 0, + Ydiamond_blank, 0, -1, Ydiamond_stone, 0, -1, @@ -2219,36 +2220,36 @@ int obj_map[] = Xdrip_fall, 5, Xdrip_fall, 6, Xdrip_fall, 7, - Xdrip_eat, 7, - Ydrip_s2, 7, + Xdrip, 7, + Ydrip_2_s, 7, -1, - Ydrip_s2B, 6, + Ydrip_2_sB, 6, -1, - Ydrip_s2, 6, + Ydrip_2_s, 6, -1, - Ydrip_s2B, 5, + Ydrip_2_sB, 5, -1, - Ydrip_s2, 5, + Ydrip_2_s, 5, -1, - Ydrip_s2B, 4, + Ydrip_2_sB, 4, -1, - Ydrip_s2, 4, + Ydrip_2_s, 4, -1, - Ydrip_s2B, 3, + Ydrip_2_sB, 3, -1, - Ydrip_s2, 3, + Ydrip_2_s, 3, -1, - Ydrip_s2B, 2, + Ydrip_2_sB, 2, -1, - Ydrip_s2, 2, + Ydrip_2_s, 2, -1, - Ydrip_s2B, 1, + Ydrip_2_sB, 1, -1, - Ydrip_s2, 1, + Ydrip_2_s, 1, -1, - Ydrip_s2B, 0, + Ydrip_2_sB, 0, -1, - Ydrip_s2, 0, + Ydrip_2_s, 0, -1, Xdrip_stretchB, 0, Xdrip_stretchB, 1, @@ -2258,7 +2259,7 @@ int obj_map[] = Xdrip_stretchB, 5, Xdrip_stretchB, 6, Xdrip_stretchB, 7, - Ydrip_s1B, 7, + Ydrip_1_sB, 7, -1, Xdrip_stretch, 0, Xdrip_stretch, 1, @@ -2268,49 +2269,49 @@ int obj_map[] = Xdrip_stretch, 5, Xdrip_stretch, 6, Xdrip_stretch, 7, - Ydrip_s1, 7, + Ydrip_1_s, 7, -1, - Ydrip_s1B, 6, + Ydrip_1_sB, 6, -1, - Ydrip_s1, 6, + Ydrip_1_s, 6, -1, - Ydrip_s1B, 5, + Ydrip_1_sB, 5, -1, - Ydrip_s1, 5, + Ydrip_1_s, 5, -1, - Ydrip_s1B, 4, + Ydrip_1_sB, 4, -1, - Ydrip_s1, 4, + Ydrip_1_s, 4, -1, - Ydrip_s1B, 3, + Ydrip_1_sB, 3, -1, - Ydrip_s1, 3, + Ydrip_1_s, 3, -1, - Ydrip_s1B, 2, + Ydrip_1_sB, 2, -1, - Ydrip_s1, 2, + Ydrip_1_s, 2, -1, - Ydrip_s1B, 1, + Ydrip_1_sB, 1, -1, - Ydrip_s1, 1, + Ydrip_1_s, 1, -1, - Ydrip_s1B, 0, + Ydrip_1_sB, 0, -1, - Ydrip_s1, 0, + Ydrip_1_s, 0, -1, - Xdrip_eat, 0, + Xdrip, 0, -1, - Xdrip_eat, 1, + Xdrip, 1, -1, - Xdrip_eat, 2, + Xdrip, 2, -1, - Xdrip_eat, 3, + Xdrip, 3, -1, - Xdrip_eat, 4, + Xdrip, 4, -1, - Xdrip_eat, 5, + Xdrip, 5, -1, - Xdrip_eat, 6, + Xdrip, 6, -1, Xbomb, 0, @@ -2339,22 +2340,22 @@ int obj_map[] = Xbomb_fall, 7, #ifdef BAD_ROLL - Xbomb_force_e, 0, - Xbomb_force_e, 1, - Xbomb_force_e, 2, - Xbomb_force_e, 3, - Xbomb_force_e, 4, - Xbomb_force_e, 5, - Xbomb_force_e, 6, - Xbomb_force_e, 7, - Xbomb_force_w, 0, - Xbomb_force_w, 1, - Xbomb_force_w, 2, - Xbomb_force_w, 3, - Xbomb_force_w, 4, - Xbomb_force_w, 5, - Xbomb_force_w, 6, - Xbomb_force_w, 7, + Xpush_bomb_e, 0, + Xpush_bomb_e, 1, + Xpush_bomb_e, 2, + Xpush_bomb_e, 3, + Xpush_bomb_e, 4, + Xpush_bomb_e, 5, + Xpush_bomb_e, 6, + Xpush_bomb_e, 7, + Xpush_bomb_w, 0, + Xpush_bomb_w, 1, + Xpush_bomb_w, 2, + Xpush_bomb_w, 3, + Xpush_bomb_w, 4, + Xpush_bomb_w, 5, + Xpush_bomb_w, 6, + Xpush_bomb_w, 7, #endif Ybomb_s, 7, @@ -2431,19 +2432,19 @@ int obj_map[] = Ybomb_e, 0, Ybomb_wB, 6, -1, - Ybomb_eat, 6, + Ybomb_blank, 6, -1, - Ybomb_eat, 5, + Ybomb_blank, 5, -1, - Ybomb_eat, 4, + Ybomb_blank, 4, -1, - Ybomb_eat, 3, + Ybomb_blank, 3, -1, - Ybomb_eat, 2, + Ybomb_blank, 2, -1, - Ybomb_eat, 1, + Ybomb_blank, 1, -1, - Ybomb_eat, 0, + Ybomb_blank, 0, -1, Yballoon_n, 7, @@ -2801,26 +2802,26 @@ int obj_map[] = Xacid_8, 6, Xacid_8, 7, -1, - Yacid_splash_wB, 4, - Yacid_splash_wB, 5, + Xacid_splash_w, 4, + Xacid_splash_w, 5, -1, - Yacid_splash_wB, 2, - Yacid_splash_wB, 3, + Xacid_splash_w, 2, + Xacid_splash_w, 3, -1, - Yacid_splash_wB, 0, - Yacid_splash_wB, 1, + Xacid_splash_w, 0, + Xacid_splash_w, 1, -1, - Yacid_splash_eB, 4, - Yacid_splash_eB, 5, + Xacid_splash_e, 4, + Xacid_splash_e, 5, -1, - Yacid_splash_eB, 2, - Yacid_splash_eB, 3, + Xacid_splash_e, 2, + Xacid_splash_e, 3, -1, - Yacid_splash_eB, 0, - Yacid_splash_eB, 1, + Xacid_splash_e, 0, + Xacid_splash_e, 1, -1, - Xball_2B, 7, + Yball_2, 7, Xball_1, 0, Xball_1, 1, Xball_1, 2, @@ -2830,21 +2831,21 @@ int obj_map[] = Xball_1, 6, Xball_1, 7, -1, - Xball_1B, 0, + Yball_1, 0, -1, - Xball_1B, 1, + Yball_1, 1, -1, - Xball_1B, 2, + Yball_1, 2, -1, - Xball_1B, 3, + Yball_1, 3, -1, - Xball_1B, 4, + Yball_1, 4, -1, - Xball_1B, 5, + Yball_1, 5, -1, - Xball_1B, 6, + Yball_1, 6, -1, - Xball_1B, 7, + Yball_1, 7, Xball_2, 0, Xball_2, 1, Xball_2, 2, @@ -2854,68 +2855,68 @@ int obj_map[] = Xball_2, 6, Xball_2, 7, -1, - Xball_2B, 0, + Yball_2, 0, -1, - Xball_2B, 1, + Yball_2, 1, -1, - Xball_2B, 2, + Yball_2, 2, -1, - Xball_2B, 3, + Yball_2, 3, -1, - Xball_2B, 4, + Yball_2, 4, -1, - Xball_2B, 5, + Yball_2, 5, -1, - Xball_2B, 6, + Yball_2, 6, -1, - Ygrow_ew_eat, 7, - Xgrow_ew, 0, - Xgrow_ew, 1, - Xgrow_ew, 2, - Xgrow_ew, 3, - Xgrow_ew, 4, - Xgrow_ew, 5, - Xgrow_ew, 6, - Xgrow_ew, 7, + Yslidewall_ew_blank, 7, + Xslidewall_ew, 0, + Xslidewall_ew, 1, + Xslidewall_ew, 2, + Xslidewall_ew, 3, + Xslidewall_ew, 4, + Xslidewall_ew, 5, + Xslidewall_ew, 6, + Xslidewall_ew, 7, -1, - Ygrow_ew_eat, 0, + Yslidewall_ew_blank, 0, -1, - Ygrow_ew_eat, 1, + Yslidewall_ew_blank, 1, -1, - Ygrow_ew_eat, 2, + Yslidewall_ew_blank, 2, -1, - Ygrow_ew_eat, 3, + Yslidewall_ew_blank, 3, -1, - Ygrow_ew_eat, 4, + Yslidewall_ew_blank, 4, -1, - Ygrow_ew_eat, 5, + Yslidewall_ew_blank, 5, -1, - Ygrow_ew_eat, 6, + Yslidewall_ew_blank, 6, -1, - Ygrow_ns_eat, 7, - Xgrow_ns, 0, - Xgrow_ns, 1, - Xgrow_ns, 2, - Xgrow_ns, 3, - Xgrow_ns, 4, - Xgrow_ns, 5, - Xgrow_ns, 6, - Xgrow_ns, 7, + Yslidewall_ns_blank, 7, + Xslidewall_ns, 0, + Xslidewall_ns, 1, + Xslidewall_ns, 2, + Xslidewall_ns, 3, + Xslidewall_ns, 4, + Xslidewall_ns, 5, + Xslidewall_ns, 6, + Xslidewall_ns, 7, -1, - Ygrow_ns_eat, 0, + Yslidewall_ns_blank, 0, -1, - Ygrow_ns_eat, 1, + Yslidewall_ns_blank, 1, -1, - Ygrow_ns_eat, 2, + Yslidewall_ns_blank, 2, -1, - Ygrow_ns_eat, 3, + Yslidewall_ns_blank, 3, -1, - Ygrow_ns_eat, 4, + Yslidewall_ns_blank, 4, -1, - Ygrow_ns_eat, 5, + Yslidewall_ns_blank, 5, -1, - Ygrow_ns_eat, 6, + Yslidewall_ns_blank, 6, -1, XwonderwallB, 7, @@ -3197,14 +3198,14 @@ int obj_map[] = Xwind_w, 6, Xwind_w, 7, -1, - Xwind_nesw, 0, - Xwind_nesw, 1, - Xwind_nesw, 2, - Xwind_nesw, 3, - Xwind_nesw, 4, - Xwind_nesw, 5, - Xwind_nesw, 6, - Xwind_nesw, 7, + Xwind_any, 0, + Xwind_any, 1, + Xwind_any, 2, + Xwind_any, 3, + Xwind_any, 4, + Xwind_any, 5, + Xwind_any, 6, + Xwind_any, 7, -1, Xwind_stop, 0, Xwind_stop, 1, @@ -3255,9 +3256,9 @@ int obj_map[] = Xexit_2, 6, -1, - Ydynamite_eat, 0, - Ydynamite_eat, 1, - Ydynamite_eat, 2, + Ydynamite_blank, 0, + Ydynamite_blank, 1, + Ydynamite_blank, 2, Xdynamite, 0, Xdynamite, 1, Xdynamite, 2, @@ -3483,14 +3484,14 @@ int obj_map[] = Xmagnify, 7, -1, - XdripperB, 0, - XdripperB, 1, - XdripperB, 2, - XdripperB, 3, - XdripperB, 4, - XdripperB, 5, - XdripperB, 6, - XdripperB, 7, + Xfake_amoebaB, 0, + Xfake_amoebaB, 1, + Xfake_amoebaB, 2, + Xfake_amoebaB, 3, + Xfake_amoebaB, 4, + Xfake_amoebaB, 5, + Xfake_amoebaB, 6, + Xfake_amoebaB, 7, -1, Xfake_blankB, 0, @@ -3651,41 +3652,41 @@ int obj_map[] = Xwall_4, 6, Xwall_4, 7, -1, - Xround_wall_1, 0, - Xround_wall_1, 1, - Xround_wall_1, 2, - Xround_wall_1, 3, - Xround_wall_1, 4, - Xround_wall_1, 5, - Xround_wall_1, 6, - Xround_wall_1, 7, - -1, - Xround_wall_2, 0, - Xround_wall_2, 1, - Xround_wall_2, 2, - Xround_wall_2, 3, - Xround_wall_2, 4, - Xround_wall_2, 5, - Xround_wall_2, 6, - Xround_wall_2, 7, - -1, - Xround_wall_3, 0, - Xround_wall_3, 1, - Xround_wall_3, 2, - Xround_wall_3, 3, - Xround_wall_3, 4, - Xround_wall_3, 5, - Xround_wall_3, 6, - Xround_wall_3, 7, - -1, - Xround_wall_4, 0, - Xround_wall_4, 1, - Xround_wall_4, 2, - Xround_wall_4, 3, - Xround_wall_4, 4, - Xround_wall_4, 5, - Xround_wall_4, 6, - Xround_wall_4, 7, + Xroundwall_1, 0, + Xroundwall_1, 1, + Xroundwall_1, 2, + Xroundwall_1, 3, + Xroundwall_1, 4, + Xroundwall_1, 5, + Xroundwall_1, 6, + Xroundwall_1, 7, + -1, + Xroundwall_2, 0, + Xroundwall_2, 1, + Xroundwall_2, 2, + Xroundwall_2, 3, + Xroundwall_2, 4, + Xroundwall_2, 5, + Xroundwall_2, 6, + Xroundwall_2, 7, + -1, + Xroundwall_3, 0, + Xroundwall_3, 1, + Xroundwall_3, 2, + Xroundwall_3, 3, + Xroundwall_3, 4, + Xroundwall_3, 5, + Xroundwall_3, 6, + Xroundwall_3, 7, + -1, + Xroundwall_4, 0, + Xroundwall_4, 1, + Xroundwall_4, 2, + Xroundwall_4, 3, + Xroundwall_4, 4, + Xroundwall_4, 5, + Xroundwall_4, 6, + Xroundwall_4, 7, -1, Xdecor_1, 0, Xdecor_1, 1, @@ -4210,118 +4211,118 @@ int obj_map[] = Xalpha_copyr, 7, -1, - Yball_eat, 7, - Yball_eat, 6, - Yball_eat, 5, - Ykey_1_eat, 7, - Ykey_1_eat, 6, - Ykey_1_eat, 5, - Ykey_2_eat, 7, - Ykey_2_eat, 6, - Ykey_2_eat, 5, - Ykey_3_eat, 7, - Ykey_3_eat, 6, - Ykey_3_eat, 5, - Ykey_4_eat, 7, - Ykey_4_eat, 6, - Ykey_4_eat, 5, - Ykey_5_eat, 7, - Ykey_5_eat, 6, - Ykey_5_eat, 5, - Ykey_6_eat, 7, - Ykey_6_eat, 6, - Ykey_6_eat, 5, - Ykey_7_eat, 7, - Ykey_7_eat, 6, - Ykey_7_eat, 5, - Ykey_8_eat, 7, - Ykey_8_eat, 6, - Ykey_8_eat, 5, - Ylenses_eat, 7, - Ylenses_eat, 6, - Ylenses_eat, 5, - Ymagnify_eat, 7, - Ymagnify_eat, 6, - Ymagnify_eat, 5, - Ygrass_eat, 7, - Ygrass_eat, 6, - Ygrass_eat, 5, - Ydirt_eat, 7, - Ydirt_eat, 6, - Ydirt_eat, 5, + Yball_blank, 7, + Yball_blank, 6, + Yball_blank, 5, + Ykey_1_blank, 7, + Ykey_1_blank, 6, + Ykey_1_blank, 5, + Ykey_2_blank, 7, + Ykey_2_blank, 6, + Ykey_2_blank, 5, + Ykey_3_blank, 7, + Ykey_3_blank, 6, + Ykey_3_blank, 5, + Ykey_4_blank, 7, + Ykey_4_blank, 6, + Ykey_4_blank, 5, + Ykey_5_blank, 7, + Ykey_5_blank, 6, + Ykey_5_blank, 5, + Ykey_6_blank, 7, + Ykey_6_blank, 6, + Ykey_6_blank, 5, + Ykey_7_blank, 7, + Ykey_7_blank, 6, + Ykey_7_blank, 5, + Ykey_8_blank, 7, + Ykey_8_blank, 6, + Ykey_8_blank, 5, + Ylenses_blank, 7, + Ylenses_blank, 6, + Ylenses_blank, 5, + Ymagnify_blank, 7, + Ymagnify_blank, 6, + Ymagnify_blank, 5, + Ygrass_blank, 7, + Ygrass_blank, 6, + Ygrass_blank, 5, + Ydirt_blank, 7, + Ydirt_blank, 6, + Ydirt_blank, 5, Xboom_2, 7, Xboom_2, 6, Xboom_2, 5, -1, - Yball_eat, 4, - Yball_eat, 3, - Yball_eat, 2, - Ykey_1_eat, 4, - Ykey_1_eat, 3, - Ykey_1_eat, 2, - Ykey_2_eat, 4, - Ykey_2_eat, 3, - Ykey_2_eat, 2, - Ykey_3_eat, 4, - Ykey_3_eat, 3, - Ykey_3_eat, 2, - Ykey_4_eat, 4, - Ykey_4_eat, 3, - Ykey_4_eat, 2, - Ykey_5_eat, 4, - Ykey_5_eat, 3, - Ykey_5_eat, 2, - Ykey_6_eat, 4, - Ykey_6_eat, 3, - Ykey_6_eat, 2, - Ykey_7_eat, 4, - Ykey_7_eat, 3, - Ykey_7_eat, 2, - Ykey_8_eat, 4, - Ykey_8_eat, 3, - Ykey_8_eat, 2, - Ylenses_eat, 4, - Ylenses_eat, 3, - Ylenses_eat, 2, - Ymagnify_eat, 4, - Ymagnify_eat, 3, - Ymagnify_eat, 2, - Ygrass_eat, 4, - Ygrass_eat, 3, - Ygrass_eat, 2, - Ydirt_eat, 4, - Ydirt_eat, 3, - Ydirt_eat, 2, + Yball_blank, 4, + Yball_blank, 3, + Yball_blank, 2, + Ykey_1_blank, 4, + Ykey_1_blank, 3, + Ykey_1_blank, 2, + Ykey_2_blank, 4, + Ykey_2_blank, 3, + Ykey_2_blank, 2, + Ykey_3_blank, 4, + Ykey_3_blank, 3, + Ykey_3_blank, 2, + Ykey_4_blank, 4, + Ykey_4_blank, 3, + Ykey_4_blank, 2, + Ykey_5_blank, 4, + Ykey_5_blank, 3, + Ykey_5_blank, 2, + Ykey_6_blank, 4, + Ykey_6_blank, 3, + Ykey_6_blank, 2, + Ykey_7_blank, 4, + Ykey_7_blank, 3, + Ykey_7_blank, 2, + Ykey_8_blank, 4, + Ykey_8_blank, 3, + Ykey_8_blank, 2, + Ylenses_blank, 4, + Ylenses_blank, 3, + Ylenses_blank, 2, + Ymagnify_blank, 4, + Ymagnify_blank, 3, + Ymagnify_blank, 2, + Ygrass_blank, 4, + Ygrass_blank, 3, + Ygrass_blank, 2, + Ydirt_blank, 4, + Ydirt_blank, 3, + Ydirt_blank, 2, Xboom_2, 4, Xboom_2, 3, Xboom_2, 2, -1, - Yball_eat, 1, - Yball_eat, 0, - Ykey_1_eat, 1, - Ykey_1_eat, 0, - Ykey_2_eat, 1, - Ykey_2_eat, 0, - Ykey_3_eat, 1, - Ykey_3_eat, 0, - Ykey_4_eat, 1, - Ykey_4_eat, 0, - Ykey_5_eat, 1, - Ykey_5_eat, 0, - Ykey_6_eat, 1, - Ykey_6_eat, 0, - Ykey_7_eat, 1, - Ykey_7_eat, 0, - Ykey_8_eat, 1, - Ykey_8_eat, 0, - Ylenses_eat, 1, - Ylenses_eat, 0, - Ymagnify_eat, 1, - Ymagnify_eat, 0, - Ygrass_eat, 1, - Ygrass_eat, 0, - Ydirt_eat, 1, - Ydirt_eat, 0, + Yball_blank, 1, + Yball_blank, 0, + Ykey_1_blank, 1, + Ykey_1_blank, 0, + Ykey_2_blank, 1, + Ykey_2_blank, 0, + Ykey_3_blank, 1, + Ykey_3_blank, 0, + Ykey_4_blank, 1, + Ykey_4_blank, 0, + Ykey_5_blank, 1, + Ykey_5_blank, 0, + Ykey_6_blank, 1, + Ykey_6_blank, 0, + Ykey_7_blank, 1, + Ykey_7_blank, 0, + Ykey_8_blank, 1, + Ykey_8_blank, 0, + Ylenses_blank, 1, + Ylenses_blank, 0, + Ymagnify_blank, 1, + Ymagnify_blank, 0, + Ygrass_blank, 1, + Ygrass_blank, 0, + Ydirt_blank, 1, + Ydirt_blank, 0, Xboom_2, 1, Xboom_2, 0, Xboom_1, 7, @@ -4361,46 +4362,46 @@ int obj_map[] = Yeater_spring, 7, Yalien_stone, 7, Yalien_spring, 7, - Ybomb_eat, 7, + Ybomb_blank, 7, -1 }; -int spr_map[] = +int ply_map[] = { - SPR_walk + 0, 0, 0, 1, 2, 3, 4, 5, 6, 7, - SPR_walk + 1, 0, 8, 9, 10, 11, 12, 13, 14, 15, - SPR_walk + 2, 0, 16, 17, 18, 19, 20, 21, 22, 23, - SPR_walk + 3, 0, 24, 25, 26, 27, 28, 29, 30, 31, - - SPR_push + 0, 0, 32, 33, 34, 35, 36, 35, 34, 33, - SPR_push + 1, 0, 37, 38, 39, 40, 41, 40, 39, 38, - SPR_push + 2, 0, 42, 43, 44, 45, 46, 45, 44, 43, - SPR_push + 3, 0, 47, 48, 49, 50, 51, 50, 49, 48, - - SPR_spray + 0, 0, 52, 52, 52, 52, 52, 52, 52, 52, - SPR_spray + 1, 0, 53, 53, 53, 53, 53, 53, 53, 53, - SPR_spray + 2, 0, 54, 54, 54, 54, 54, 54, 54, 54, - SPR_spray + 3, 0, 55, 55, 55, 55, 55, 55, 55, 55, - - SPR_walk + 0, 1, 56, 57, 58, 59, 60, 61, 62, 63, - SPR_walk + 1, 1, 64, 65, 66, 67, 68, 69, 70, 71, - SPR_walk + 2, 1, 72, 73, 74, 75, 76, 77, 78, 79, - SPR_walk + 3, 1, 80, 81, 82, 83, 84, 85, 86, 87, - - SPR_push + 0, 1, 88, 89, 90, 91, 92, 91, 90, 89, - SPR_push + 1, 1, 93, 94, 95, 96, 97, 96, 95, 94, - SPR_push + 2, 1, 98, 99, 100, 101, 102, 101, 100, 99, - SPR_push + 3, 1, 103, 104, 105, 106, 107, 106, 105, 104, - - SPR_spray + 0, 1, 108, 108, 108, 108, 108, 108, 108, 108, - SPR_spray + 1, 1, 109, 109, 109, 109, 109, 109, 109, 109, - SPR_spray + 2, 1, 110, 110, 110, 110, 110, 110, 110, 110, - SPR_spray + 3, 1, 111, 111, 111, 111, 111, 111, 111, 111, - - SPR_still, 0, 112,112, 112, 112, 112, 112, 112, 112, - SPR_still, 1, 113,113, 113, 113, 113, 113, 113, 113, - - SPR_MAX + PLY_walk_n, 0, 0, 1, 2, 3, 4, 5, 6, 7, + PLY_walk_e, 0, 8, 9, 10, 11, 12, 13, 14, 15, + PLY_walk_s, 0, 16, 17, 18, 19, 20, 21, 22, 23, + PLY_walk_w, 0, 24, 25, 26, 27, 28, 29, 30, 31, + + PLY_push_n, 0, 32, 33, 34, 35, 36, 35, 34, 33, + PLY_push_e, 0, 37, 38, 39, 40, 41, 40, 39, 38, + PLY_push_s, 0, 42, 43, 44, 45, 46, 45, 44, 43, + PLY_push_w, 0, 47, 48, 49, 50, 51, 50, 49, 48, + + PLY_shoot_n, 0, 52, 52, 52, 52, 52, 52, 52, 52, + PLY_shoot_e, 0, 53, 53, 53, 53, 53, 53, 53, 53, + PLY_shoot_s, 0, 54, 54, 54, 54, 54, 54, 54, 54, + PLY_shoot_w, 0, 55, 55, 55, 55, 55, 55, 55, 55, + + PLY_walk_n, 1, 56, 57, 58, 59, 60, 61, 62, 63, + PLY_walk_e, 1, 64, 65, 66, 67, 68, 69, 70, 71, + PLY_walk_s, 1, 72, 73, 74, 75, 76, 77, 78, 79, + PLY_walk_w, 1, 80, 81, 82, 83, 84, 85, 86, 87, + + PLY_push_n, 1, 88, 89, 90, 91, 92, 91, 90, 89, + PLY_push_e, 1, 93, 94, 95, 96, 97, 96, 95, 94, + PLY_push_s, 1, 98, 99, 100, 101, 102, 101, 100, 99, + PLY_push_w, 1, 103, 104, 105, 106, 107, 106, 105, 104, + + PLY_shoot_n, 1, 108, 108, 108, 108, 108, 108, 108, 108, + PLY_shoot_e, 1, 109, 109, 109, 109, 109, 109, 109, 109, + PLY_shoot_s, 1, 110, 110, 110, 110, 110, 110, 110, 110, + PLY_shoot_w, 1, 111, 111, 111, 111, 111, 111, 111, 111, + + PLY_still, 0, 112,112, 112, 112, 112, 112, 112, 112, + PLY_still, 1, 113,113, 113, 113, 113, 113, 113, 113, + + PLY_MAX }; @@ -4422,11 +4423,11 @@ unsigned short tab_explode_normal[TILE_MAX]; /* dynamite explosion */ unsigned short tab_explode_dynamite[TILE_MAX]; -/* map tiles to coords */ +/* map objects to coords */ unsigned short map_obj[8][TILE_MAX]; -/* map sprites to coords */ -unsigned short map_spr[2][8][13]; +/* map players to coords */ +unsigned short map_ply[2][8][13]; /* map ascii to coords */ unsigned short map_ttl[128]; @@ -4435,9 +4436,9 @@ unsigned short map_ttl[128]; struct GraphicInfo_EM graphic_info_em_object[TILE_MAX][8]; /* map player number, frames and action to graphic info */ -struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][SPR_MAX][8]; +struct GraphicInfo_EM graphic_info_em_player[MAX_PLAYERS][PLY_MAX][8]; -void create_tab(int *invert, unsigned char *array) +static void create_tab(int *invert, unsigned char *array) { int i; int buffer[TILE_MAX]; @@ -4452,7 +4453,7 @@ void create_tab(int *invert, unsigned char *array) array[i] = buffer[i]; } -void create_explode() +static void create_explode(void) { int i; int *tile = tile_explode; @@ -4475,85 +4476,12 @@ void create_explode() tab_explode_dynamite[i] = buffer[i]; } -void create_obj() +static void create_obj(void) { int i, j; int *map = obj_map; int buffer[8][TILE_MAX]; -#if 0 - - int debug = 0; - - for (i = 0; i < 8; i++) - for (j = 0; j < TILE_MAX; j++) - buffer[i][j] = 0; - - for (i = 0; i < 64; i++) - { - for (;*map != -1; map += 2) - { - if (map[0] < 0 || map[0] >= TILE_MAX || map[1] < 0 || map[1] >= 8) - { - fprintf(stderr, "obj_map: bad tile (%d, %d) @ %d+%d\n", - map[0], map[1], i / 16, i % 16); - debug = 1; - continue; - } - buffer[map[1]][map[0]]++; - } - map++; - } - - for (i = 0; i < 896; i++) - { - for (;*map != -1; map += 2) - { - if (map[0] < 0 || map[0] >= TILE_MAX || map[1] < 0 || map[1] >= 8) - { - fprintf(stderr, "obj_map: bad tile (%d, %d) @ %d\n", map[0], map[1], i); - debug = 1; - continue; - } - buffer[map[1]][map[0]]++; - } - map++; - } - - for (i = 0; i < TILE_MAX; i++) - { - for (j = 0; j < 8; j++) - { - switch(buffer[j][i]) - { - case 0: - fprintf(stderr, "obj_map: uninitialized (%d, %d)\n", i, j); - debug = 1; - break; - case 1: - break; /* good */ - default: - fprintf(stderr, "obj_map: duplicate (%d, %d)\n", i, j); - debug = 1; - break; - } - } - } - - if (sizeof(obj_map) / sizeof(*obj_map) != map - obj_map) - { - fprintf(stderr, "obj_map: bad end (%d != %d)\n", - sizeof(obj_map) / sizeof(*obj_map), map - obj_map); - debug = 1; - } - - if (debug == 0) - fprintf(stderr, "obj_map: looks good, now disable debug code\n"); - - abort(); - -#else - for (i = 0; i < 8; i++) for (j = 0; j < TILE_MAX; j++) buffer[i][j] = Xblank; @@ -4577,11 +4505,9 @@ void create_obj() for (i = 0; i < 8; i++) for (j = 0; j < TILE_MAX; j++) map_obj[i][j] = buffer[7 - i][j]; - -#endif } -void create_obj_graphics_info_em() +static void create_obj_graphics_info_em(void) { int i, j; @@ -4606,6 +4532,7 @@ void create_obj_graphics_info_em() g->crumbled_src_x = 0; g->crumbled_src_y = 0; g->crumbled_border_size = 0; + g->crumbled_tile_size = 0; g->has_crumbled_graphics = FALSE; g->preserve_background = FALSE; @@ -4616,13 +4543,13 @@ void create_obj_graphics_info_em() } } -void create_spr() +static void create_ply(void) { int i, j, k; - int *map = spr_map; - int buffer[2][8][SPR_MAX]; + int *map = ply_map; + int buffer[2][8][PLY_MAX]; - while (*map < SPR_MAX) + while (*map < PLY_MAX) { i = *map++; j = *map++; @@ -4633,22 +4560,22 @@ void create_spr() for (i = 0; i < 2; i++) for (j = 0; j < 8; j++) - for (k = 0; k < SPR_MAX; k++) - map_spr[i][j][k] = buffer[i][7 - j][k]; + for (k = 0; k < PLY_MAX; k++) + map_ply[i][j][k] = buffer[i][7 - j][k]; } -void create_spr_graphics_info_em() +static void create_ply_graphics_info_em(void) { int i, j, k; for (i = 0; i < MAX_PLAYERS; i++) { - for (j = 0; j < SPR_MAX; j++) + for (j = 0; j < PLY_MAX; j++) { for (k = 0; k < 8; k++) { struct GraphicInfo_EM *g = &graphic_info_em_player[i][j][k]; - int spr = map_spr[i % 2][k][j]; + int spr = map_ply[i % 2][k][j]; g->bitmap = sprBitmap; g->src_x = (spr / 8) * TILEX; @@ -4672,7 +4599,7 @@ void create_spr_graphics_info_em() } } -void tab_generate() +void tab_generate(void) { create_tab(tile_blank, tab_blank); create_tab(tile_acid, tab_acid); @@ -4680,13 +4607,13 @@ void tab_generate() create_tab(tile_android_move, tab_android_move); create_explode(); create_obj(); - create_spr(); + create_ply(); } -void tab_generate_graphics_info_em() +void tab_generate_graphics_info_em(void) { create_obj_graphics_info_em(); - create_spr_graphics_info_em(); + create_ply_graphics_info_em(); InitGraphicInfo_EM(); }