X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=d83cb75aada4810bf6a2b235d695e45d54976c10;hb=00e52ef0b245eadf05f9dd416b29ebec5a47c767;hp=2fdcd0b8c7c265ff93ba1cfd2b934df486e683e0;hpb=4f06890d9e4a9d115ec6b84d21dcc20ed8b7d1cd;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index 2fdcd0b8..d83cb75a 100644 --- a/src/tools.c +++ b/src/tools.c @@ -5515,6 +5515,10 @@ unsigned int MoveDoor(unsigned int door_state) } } + SetDoorBackgroundImage(IMG_BACKGROUND_DOOR); + + game.any_door_active = TRUE; + for (k = start; k < num_move_steps; k++) { int last_frame = num_move_steps - 1; // last frame of this "for" loop @@ -5580,8 +5584,8 @@ unsigned int MoveDoor(unsigned int door_state) if (!door_panel_drawn[door_index]) { - ClearRectangle(drawto, door_rect->x, door_rect->y, - door_rect->width, door_rect->height); + ClearRectangleOnBackground(drawto, door_rect->x, door_rect->y, + door_rect->width, door_rect->height); door_panel_drawn[door_index] = TRUE; } @@ -5709,6 +5713,8 @@ unsigned int MoveDoor(unsigned int door_state) BackToFront(); } } + + game.any_door_active = FALSE; } if (door_state & DOOR_ACTION_1) @@ -6017,7 +6023,7 @@ static struct Mapping_BD_to_RND_object } bd_object_mapping_list[] = { - // additional RND style elements mapped to BD style elements must be listed first + // additional RND style elements mapped to BD style elements (must be listed first) { O_DIRT, TRUE, @@ -6090,6 +6096,10 @@ bd_object_mapping_list[] = O_DIRT_BALL, TRUE, EL_BD_SAND_BALL, -1, -1 }, + { + O_DIRT_BALL_F, TRUE, + EL_BD_SAND_BALL_FALLING, -1, -1 + }, { O_DIRT_BALL_F, FALSE, EL_BD_SAND_BALL, ACTION_FALLING, -1 @@ -6098,6 +6108,10 @@ bd_object_mapping_list[] = O_DIRT_LOOSE, TRUE, EL_BD_SAND_LOOSE, -1, -1 }, + { + O_DIRT_LOOSE_F, TRUE, + EL_BD_SAND_LOOSE_FALLING, -1, -1 + }, { O_DIRT_LOOSE_F, FALSE, EL_BD_SAND_LOOSE, ACTION_FALLING, -1 @@ -6186,6 +6200,10 @@ bd_object_mapping_list[] = O_STONE, TRUE, EL_BD_ROCK, -1, -1 }, + { + O_STONE_F, TRUE, + EL_BD_ROCK_FALLING, -1, -1 + }, { O_STONE_F, FALSE, EL_BD_ROCK, ACTION_FALLING, -1 @@ -6194,14 +6212,22 @@ bd_object_mapping_list[] = O_FLYING_STONE, TRUE, EL_BD_FLYING_ROCK, -1, -1 }, + { + O_FLYING_STONE_F, TRUE, + EL_BD_FLYING_ROCK_FLYING, -1, -1 + }, { O_FLYING_STONE_F, FALSE, - EL_BD_FLYING_ROCK, ACTION_FALLING, -1 + EL_BD_FLYING_ROCK, ACTION_FLYING, -1 }, { O_MEGA_STONE, TRUE, EL_BD_MEGA_ROCK, -1, -1 }, + { + O_MEGA_STONE_F, TRUE, + EL_BD_MEGA_ROCK_FALLING, -1, -1 + }, { O_MEGA_STONE_F, FALSE, EL_BD_MEGA_ROCK, ACTION_FALLING, -1 @@ -6210,6 +6236,10 @@ bd_object_mapping_list[] = O_DIAMOND, TRUE, EL_BD_DIAMOND, -1, -1 }, + { + O_DIAMOND_F, TRUE, + EL_BD_DIAMOND_FALLING, -1, -1 + }, { O_DIAMOND_F, FALSE, EL_BD_DIAMOND, ACTION_FALLING, -1 @@ -6218,14 +6248,22 @@ bd_object_mapping_list[] = O_FLYING_DIAMOND, TRUE, EL_BD_FLYING_DIAMOND, -1, -1 }, + { + O_FLYING_DIAMOND_F, TRUE, + EL_BD_FLYING_DIAMOND_FLYING, -1, -1 + }, { O_FLYING_DIAMOND_F, FALSE, - EL_BD_FLYING_DIAMOND, ACTION_FALLING, -1 + EL_BD_FLYING_DIAMOND, ACTION_FLYING, -1 }, { O_NUT, TRUE, EL_BD_NUT, -1, -1 }, + { + O_NUT_F, TRUE, + EL_BD_NUT_FALLING, -1, -1 + }, { O_NUT_F, FALSE, EL_BD_NUT, ACTION_FALLING, -1 @@ -6264,7 +6302,7 @@ bd_object_mapping_list[] = }, { O_EXPANDING_WALL_SWITCH, TRUE, - EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH, -1, -1 }, { O_CREATURE_SWITCH, TRUE, @@ -6284,7 +6322,7 @@ bd_object_mapping_list[] = }, { O_CONVEYOR_DIR_SWITCH, TRUE, - EL_BD_CONVEYOR_DIR_SWITCH_NORMAL, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH, -1, -1 }, { O_ACID, TRUE, @@ -6294,6 +6332,10 @@ bd_object_mapping_list[] = O_FALLING_WALL, TRUE, EL_BD_FALLING_WALL, -1, -1 }, + { + O_FALLING_WALL_F, TRUE, + EL_BD_FALLING_WALL_FALLING, -1, -1 + }, { O_FALLING_WALL_F, FALSE, EL_BD_FALLING_WALL, ACTION_FALLING, -1 @@ -6382,66 +6424,130 @@ bd_object_mapping_list[] = O_WATER, TRUE, EL_BD_WATER, -1, -1 }, + { + O_WATER_1, TRUE, + EL_BD_WATER_1, -1, -1 + }, { O_WATER_1, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_2, TRUE, + EL_BD_WATER_2, -1, -1 + }, { O_WATER_2, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_3, TRUE, + EL_BD_WATER_3, -1, -1 + }, { O_WATER_3, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_4, TRUE, + EL_BD_WATER_4, -1, -1 + }, { O_WATER_4, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_5, TRUE, + EL_BD_WATER_5, -1, -1 + }, { O_WATER_5, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_6, TRUE, + EL_BD_WATER_6, -1, -1 + }, { O_WATER_6, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_7, TRUE, + EL_BD_WATER_7, -1, -1 + }, { O_WATER_7, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_8, TRUE, + EL_BD_WATER_8, -1, -1 + }, { O_WATER_8, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_9, TRUE, + EL_BD_WATER_9, -1, -1 + }, { O_WATER_9, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_10, TRUE, + EL_BD_WATER_10, -1, -1 + }, { O_WATER_10, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_11, TRUE, + EL_BD_WATER_11, -1, -1 + }, { O_WATER_11, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_12, TRUE, + EL_BD_WATER_12, -1, -1 + }, { O_WATER_12, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_13, TRUE, + EL_BD_WATER_13, -1, -1 + }, { O_WATER_13, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_14, TRUE, + EL_BD_WATER_14, -1, -1 + }, { O_WATER_14, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_15, TRUE, + EL_BD_WATER_15, -1, -1 + }, { O_WATER_15, FALSE, EL_BD_WATER, -1, -1 }, + { + O_WATER_16, TRUE, + EL_BD_WATER_16, -1, -1 + }, { O_WATER_16, FALSE, EL_BD_WATER, -1, -1 @@ -6462,30 +6568,58 @@ bd_object_mapping_list[] = O_COW_4, TRUE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_1, TRUE, + EL_BD_COW_ENCLOSED_1, -1, -1 + }, { O_COW_ENCLOSED_1, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_2, TRUE, + EL_BD_COW_ENCLOSED_2, -1, -1 + }, { O_COW_ENCLOSED_2, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_3, TRUE, + EL_BD_COW_ENCLOSED_3, -1, -1 + }, { O_COW_ENCLOSED_3, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_4, TRUE, + EL_BD_COW_ENCLOSED_4, -1, -1 + }, { O_COW_ENCLOSED_4, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_5, TRUE, + EL_BD_COW_ENCLOSED_5, -1, -1 + }, { O_COW_ENCLOSED_5, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_6, TRUE, + EL_BD_COW_ENCLOSED_6, -1, -1 + }, { O_COW_ENCLOSED_6, FALSE, EL_BD_COW_DOWN, -1, -1 }, + { + O_COW_ENCLOSED_7, TRUE, + EL_BD_COW_ENCLOSED_7, -1, -1 + }, { O_COW_ENCLOSED_7, FALSE, EL_BD_COW_DOWN, -1, -1 @@ -6546,34 +6680,66 @@ bd_object_mapping_list[] = O_BLADDER, TRUE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_1, TRUE, + EL_BD_BLADDER_1, -1, -1 + }, { O_BLADDER_1, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_2, TRUE, + EL_BD_BLADDER_2, -1, -1 + }, { O_BLADDER_2, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_3, TRUE, + EL_BD_BLADDER_3, -1, -1 + }, { O_BLADDER_3, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_4, TRUE, + EL_BD_BLADDER_4, -1, -1 + }, { O_BLADDER_4, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_5, TRUE, + EL_BD_BLADDER_5, -1, -1 + }, { O_BLADDER_5, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_6, TRUE, + EL_BD_BLADDER_6, -1, -1 + }, { O_BLADDER_6, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_7, TRUE, + EL_BD_BLADDER_7, -1, -1 + }, { O_BLADDER_7, FALSE, EL_BD_BLADDER, -1, -1 }, + { + O_BLADDER_8, TRUE, + EL_BD_BLADDER_8, -1, -1 + }, { O_BLADDER_8, FALSE, EL_BD_BLADDER, -1, -1 @@ -6702,14 +6868,26 @@ bd_object_mapping_list[] = O_DRAGONFLY_4, TRUE, EL_BD_DRAGONFLY_DOWN, -1, -1 }, + { + O_PRE_PL_1, TRUE, + EL_BD_PLAYER_GROWING_1, -1, -1 + }, { O_PRE_PL_1, FALSE, EL_BD_PLAYER, ACTION_GROWING, -1 }, + { + O_PRE_PL_2, TRUE, + EL_BD_PLAYER_GROWING_2, -1, -1 + }, { O_PRE_PL_2, FALSE, EL_BD_PLAYER, ACTION_GROWING, -1 }, + { + O_PRE_PL_3, TRUE, + EL_BD_PLAYER_GROWING_3, -1, -1 + }, { O_PRE_PL_3, FALSE, EL_BD_PLAYER, ACTION_GROWING, -1 @@ -6722,6 +6900,10 @@ bd_object_mapping_list[] = O_PLAYER_BOMB, TRUE, EL_BD_PLAYER_WITH_BOMB, -1, -1 }, + { + O_PLAYER_ROCKET_LAUNCHER, TRUE, + EL_BD_PLAYER_WITH_ROCKET_LAUNCHER, -1, -1 + }, { O_PLAYER_GLUED, TRUE, EL_BD_PLAYER_GLUED, -1, -1 @@ -6730,34 +6912,82 @@ bd_object_mapping_list[] = O_PLAYER_STIRRING, TRUE, EL_BD_PLAYER_STIRRING, -1, -1 }, + { + O_ROCKET_LAUNCHER, TRUE, + EL_BD_ROCKET_LAUNCHER, -1, -1 + }, + { + O_ROCKET_1, TRUE, + EL_BD_ROCKET_RIGHT, -1, -1 + }, + { + O_ROCKET_2, TRUE, + EL_BD_ROCKET_UP, -1, -1 + }, + { + O_ROCKET_3, TRUE, + EL_BD_ROCKET_LEFT, -1, -1 + }, + { + O_ROCKET_4, TRUE, + EL_BD_ROCKET_DOWN, -1, -1 + }, { O_BOMB, TRUE, EL_BD_BOMB, -1, -1 }, + { + O_BOMB_TICK_1, TRUE, + EL_BD_BOMB_TICKING_1, -1, -1 + }, { O_BOMB_TICK_1, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_2, TRUE, + EL_BD_BOMB_TICKING_2, -1, -1 + }, { O_BOMB_TICK_2, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_3, TRUE, + EL_BD_BOMB_TICKING_3, -1, -1 + }, { O_BOMB_TICK_3, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_4, TRUE, + EL_BD_BOMB_TICKING_4, -1, -1 + }, { O_BOMB_TICK_4, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_5, TRUE, + EL_BD_BOMB_TICKING_5, -1, -1 + }, { O_BOMB_TICK_5, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_6, TRUE, + EL_BD_BOMB_TICKING_6, -1, -1 + }, { O_BOMB_TICK_6, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 }, + { + O_BOMB_TICK_7, TRUE, + EL_BD_BOMB_TICKING_7, -1, -1 + }, { O_BOMB_TICK_7, FALSE, EL_BD_BOMB, ACTION_ACTIVE, -1 @@ -6766,178 +6996,354 @@ bd_object_mapping_list[] = O_NITRO_PACK, TRUE, EL_BD_NITRO_PACK, -1, -1 }, + { + O_NITRO_PACK_F, TRUE, + EL_BD_NITRO_PACK_FALLING, -1, -1 + }, { O_NITRO_PACK_F, FALSE, EL_BD_NITRO_PACK, ACTION_FALLING, -1 }, { - O_NITRO_PACK_EXPLODE, FALSE, - EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 + O_PRE_CLOCK_1, TRUE, + EL_BD_CLOCK_GROWING_1, -1, -1 }, { O_PRE_CLOCK_1, FALSE, EL_BD_CLOCK, ACTION_GROWING, -1 }, + { + O_PRE_CLOCK_2, TRUE, + EL_BD_CLOCK_GROWING_2, -1, -1 + }, { O_PRE_CLOCK_2, FALSE, EL_BD_CLOCK, ACTION_GROWING, -1 }, + { + O_PRE_CLOCK_3, TRUE, + EL_BD_CLOCK_GROWING_3, -1, -1 + }, { O_PRE_CLOCK_3, FALSE, EL_BD_CLOCK, ACTION_GROWING, -1 }, + { + O_PRE_CLOCK_4, TRUE, + EL_BD_CLOCK_GROWING_4, -1, -1 + }, { O_PRE_CLOCK_4, FALSE, EL_BD_CLOCK, ACTION_GROWING, -1 }, + { + O_PRE_DIA_1, TRUE, + EL_BD_DIAMOND_GROWING_1, -1, -1 + }, { O_PRE_DIA_1, FALSE, EL_BD_DIAMOND, ACTION_GROWING, -1 }, + { + O_PRE_DIA_2, TRUE, + EL_BD_DIAMOND_GROWING_2, -1, -1 + }, { O_PRE_DIA_2, FALSE, EL_BD_DIAMOND, ACTION_GROWING, -1 }, + { + O_PRE_DIA_3, TRUE, + EL_BD_DIAMOND_GROWING_3, -1, -1 + }, { O_PRE_DIA_3, FALSE, EL_BD_DIAMOND, ACTION_GROWING, -1 }, + { + O_PRE_DIA_4, TRUE, + EL_BD_DIAMOND_GROWING_4, -1, -1 + }, { O_PRE_DIA_4, FALSE, EL_BD_DIAMOND, ACTION_GROWING, -1 }, + { + O_PRE_DIA_5, TRUE, + EL_BD_DIAMOND_GROWING_5, -1, -1 + }, { O_PRE_DIA_5, FALSE, EL_BD_DIAMOND, ACTION_GROWING, -1 }, + { + O_EXPLODE_1, TRUE, + EL_BD_EXPLODING_1, -1, -1 + }, { O_EXPLODE_1, FALSE, EL_DEFAULT, ACTION_EXPLODING, -1 }, + { + O_EXPLODE_2, TRUE, + EL_BD_EXPLODING_2, -1, -1 + }, { O_EXPLODE_2, FALSE, EL_DEFAULT, ACTION_EXPLODING, -1 }, + { + O_EXPLODE_3, TRUE, + EL_BD_EXPLODING_3, -1, -1 + }, { O_EXPLODE_3, FALSE, EL_DEFAULT, ACTION_EXPLODING, -1 }, + { + O_EXPLODE_4, TRUE, + EL_BD_EXPLODING_4, -1, -1 + }, { O_EXPLODE_4, FALSE, EL_DEFAULT, ACTION_EXPLODING, -1 }, + { + O_EXPLODE_5, TRUE, + EL_BD_EXPLODING_5, -1, -1 + }, { O_EXPLODE_5, FALSE, EL_DEFAULT, ACTION_EXPLODING, -1 }, + { + O_PRE_STONE_1, TRUE, + EL_BD_ROCK_GROWING_1, -1, -1 + }, { O_PRE_STONE_1, FALSE, EL_BD_ROCK, ACTION_GROWING, -1 }, + { + O_PRE_STONE_2, TRUE, + EL_BD_ROCK_GROWING_2, -1, -1 + }, { O_PRE_STONE_2, FALSE, EL_BD_ROCK, ACTION_GROWING, -1 }, + { + O_PRE_STONE_3, TRUE, + EL_BD_ROCK_GROWING_3, -1, -1 + }, { O_PRE_STONE_3, FALSE, EL_BD_ROCK, ACTION_GROWING, -1 }, + { + O_PRE_STONE_4, TRUE, + EL_BD_ROCK_GROWING_4, -1, -1 + }, { O_PRE_STONE_4, FALSE, EL_BD_ROCK, ACTION_GROWING, -1 }, + { + O_PRE_STEEL_1, TRUE, + EL_BD_STEELWALL_GROWING_1, -1, -1 + }, { O_PRE_STEEL_1, FALSE, EL_BD_STEELWALL, ACTION_GROWING, -1 }, + { + O_PRE_STEEL_2, TRUE, + EL_BD_STEELWALL_GROWING_2, -1, -1 + }, { O_PRE_STEEL_2, FALSE, EL_BD_STEELWALL, ACTION_GROWING, -1 }, + { + O_PRE_STEEL_3, TRUE, + EL_BD_STEELWALL_GROWING_3, -1, -1 + }, { O_PRE_STEEL_3, FALSE, EL_BD_STEELWALL, ACTION_GROWING, -1 }, + { + O_PRE_STEEL_4, TRUE, + EL_BD_STEELWALL_GROWING_4, -1, -1 + }, { O_PRE_STEEL_4, FALSE, EL_BD_STEELWALL, ACTION_GROWING, -1 }, + { + O_GHOST_EXPL_1, TRUE, + EL_BD_GHOST_EXPLODING_1, -1, -1 + }, { O_GHOST_EXPL_1, FALSE, EL_BD_GHOST, ACTION_EXPLODING, -1 }, + { + O_GHOST_EXPL_2, TRUE, + EL_BD_GHOST_EXPLODING_2, -1, -1 + }, { O_GHOST_EXPL_2, FALSE, EL_BD_GHOST, ACTION_EXPLODING, -1 }, + { + O_GHOST_EXPL_3, TRUE, + EL_BD_GHOST_EXPLODING_3, -1, -1 + }, { O_GHOST_EXPL_3, FALSE, EL_BD_GHOST, ACTION_EXPLODING, -1 }, + { + O_GHOST_EXPL_4, TRUE, + EL_BD_GHOST_EXPLODING_4, -1, -1 + }, { O_GHOST_EXPL_4, FALSE, EL_BD_GHOST, ACTION_EXPLODING, -1 }, + { + O_BOMB_EXPL_1, TRUE, + EL_BD_BOMB_EXPLODING_1, -1, -1 + }, { O_BOMB_EXPL_1, FALSE, EL_BD_BOMB, ACTION_EXPLODING, -1 }, + { + O_BOMB_EXPL_2, TRUE, + EL_BD_BOMB_EXPLODING_2, -1, -1 + }, { O_BOMB_EXPL_2, FALSE, EL_BD_BOMB, ACTION_EXPLODING, -1 }, + { + O_BOMB_EXPL_3, TRUE, + EL_BD_BOMB_EXPLODING_3, -1, -1 + }, { O_BOMB_EXPL_3, FALSE, EL_BD_BOMB, ACTION_EXPLODING, -1 }, + { + O_BOMB_EXPL_4, TRUE, + EL_BD_BOMB_EXPLODING_4, -1, -1 + }, { O_BOMB_EXPL_4, FALSE, EL_BD_BOMB, ACTION_EXPLODING, -1 }, + { + O_NITRO_EXPL_1, TRUE, + EL_BD_NITRO_PACK_EXPLODING_1, -1, -1 + }, { O_NITRO_EXPL_1, FALSE, EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 }, + { + O_NITRO_EXPL_2, TRUE, + EL_BD_NITRO_PACK_EXPLODING_2, -1, -1 + }, { O_NITRO_EXPL_2, FALSE, EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 }, + { + O_NITRO_EXPL_3, TRUE, + EL_BD_NITRO_PACK_EXPLODING_3, -1, -1 + }, { O_NITRO_EXPL_3, FALSE, EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 }, + { + O_NITRO_EXPL_4, TRUE, + EL_BD_NITRO_PACK_EXPLODING_4, -1, -1 + }, { O_NITRO_EXPL_4, FALSE, EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 }, + { + O_NITRO_PACK_EXPLODE, TRUE, + EL_BD_NITRO_PACK_EXPLODING, -1, -1 + }, + { + O_NITRO_PACK_EXPLODE, FALSE, + EL_BD_NITRO_PACK, ACTION_EXPLODING, -1 + }, + { + O_AMOEBA_2_EXPL_1, TRUE, + EL_BD_AMOEBA_2_EXPLODING_1, -1, -1 + }, { O_AMOEBA_2_EXPL_1, FALSE, EL_BD_AMOEBA_2, ACTION_EXPLODING, -1 }, + { + O_AMOEBA_2_EXPL_2, TRUE, + EL_BD_AMOEBA_2_EXPLODING_2, -1, -1 + }, { O_AMOEBA_2_EXPL_2, FALSE, EL_BD_AMOEBA_2, ACTION_EXPLODING, -1 }, + { + O_AMOEBA_2_EXPL_3, TRUE, + EL_BD_AMOEBA_2_EXPLODING_3, -1, -1 + }, { O_AMOEBA_2_EXPL_3, FALSE, EL_BD_AMOEBA_2, ACTION_EXPLODING, -1 }, + { + O_AMOEBA_2_EXPL_4, TRUE, + EL_BD_AMOEBA_2_EXPLODING_4, -1, -1 + }, { O_AMOEBA_2_EXPL_4, FALSE, EL_BD_AMOEBA_2, ACTION_EXPLODING, -1 }, + { + O_NUT_EXPL_1, TRUE, + EL_BD_NUT_BREAKING_1, -1, -1 + }, { O_NUT_EXPL_1, FALSE, EL_BD_NUT, ACTION_BREAKING, -1 }, + { + O_NUT_EXPL_2, TRUE, + EL_BD_NUT_BREAKING_2, -1, -1 + }, { O_NUT_EXPL_2, FALSE, EL_BD_NUT, ACTION_BREAKING, -1 }, + { + O_NUT_EXPL_3, TRUE, + EL_BD_NUT_BREAKING_3, -1, -1 + }, { O_NUT_EXPL_3, FALSE, EL_BD_NUT, ACTION_BREAKING, -1 }, + { + O_NUT_EXPL_4, TRUE, + EL_BD_NUT_BREAKING_4, -1, -1 + }, { O_NUT_EXPL_4, FALSE, EL_BD_NUT, ACTION_BREAKING, -1 @@ -6951,11 +7357,11 @@ bd_object_mapping_list[] = EL_BD_PLAYER, ACTION_HITTING, MV_BIT_RIGHT }, { - O_PNEUMATIC_ACTIVE_LEFT, TRUE, + O_PNEUMATIC_ACTIVE_LEFT, FALSE, EL_BD_PNEUMATIC_HAMMER, ACTION_HITTING, MV_BIT_LEFT }, { - O_PNEUMATIC_ACTIVE_RIGHT, TRUE, + O_PNEUMATIC_ACTIVE_RIGHT, FALSE, EL_BD_PNEUMATIC_HAMMER, ACTION_HITTING, MV_BIT_RIGHT }, @@ -7011,11 +7417,11 @@ bd_object_mapping_list[] = }, { O_EXPANDING_WALL_SWITCH_HORIZ, FALSE, - EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH, -1, -1 }, { O_EXPANDING_WALL_SWITCH_VERT, FALSE, - EL_BD_EXPANDABLE_WALL_SWITCH_VERTICAL, -1, -1 + EL_BD_EXPANDABLE_WALL_SWITCH_ACTIVE, -1, -1 }, { O_GRAVITY_SWITCH_ACTIVE, FALSE, @@ -7031,11 +7437,11 @@ bd_object_mapping_list[] = }, { O_CONVEYOR_DIR_NORMAL, FALSE, - EL_BD_CONVEYOR_DIR_SWITCH_NORMAL, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH, -1, -1 }, { O_CONVEYOR_DIR_CHANGED, FALSE, - EL_BD_CONVEYOR_DIR_SWITCH_CHANGED, -1, -1 + EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE, -1, -1 }, { O_CONVEYOR_SWITCH_OFF, FALSE, @@ -7084,7 +7490,7 @@ bd_object_mapping_list[] = } }; -int map_element_RND_to_BD(int element_rnd) +int map_element_RND_to_BD_cave(int element_rnd) { static unsigned short mapping_RND_to_BD[NUM_FILE_ELEMENTS]; static boolean mapping_initialized = FALSE; @@ -7115,7 +7521,82 @@ int map_element_RND_to_BD(int element_rnd) return mapping_RND_to_BD[element_rnd]; } -int map_element_BD_to_RND(int element_bd) +int map_element_RND_to_BD_effect(int element_rnd, int action) +{ + static unsigned short mapping_RND_to_BD[NUM_FILE_ELEMENTS][NUM_ACTIONS]; + static boolean mapping_initialized = FALSE; + + if (!mapping_initialized) + { + int i, j; + + // return "O_UNKNOWN" for all undefined elements in mapping array + for (i = 0; i < NUM_FILE_ELEMENTS; i++) + for (j = 0; j < NUM_ACTIONS; j++) + mapping_RND_to_BD[i][j] = O_UNKNOWN; + + for (i = 0; bd_object_mapping_list[i].element_bd != -1; i++) + { + int element_rnd = bd_object_mapping_list[i].element_rnd; + int element_bd = bd_object_mapping_list[i].element_bd; + int action = bd_object_mapping_list[i].action; + + if (action != -1) + mapping_RND_to_BD[element_rnd][action] = element_bd; + } + + mapping_initialized = TRUE; + } + + if (element_rnd < 0 || element_rnd >= NUM_FILE_ELEMENTS) + { + Warn("invalid RND element %d", element_rnd); + + return O_UNKNOWN; + } + + if (action < 0 || action >= NUM_ACTIONS) + { + Warn("invalid action %d", action); + + return O_UNKNOWN; + } + + return mapping_RND_to_BD[element_rnd][action]; +} + +int map_element_BD_to_RND_cave(int element_bd) +{ + static unsigned short mapping_BD_to_RND[O_MAX_ALL]; + static boolean mapping_initialized = FALSE; + + if (!mapping_initialized) + { + int i; + + // return "EL_UNKNOWN" for all undefined elements in mapping array + for (i = 0; i < O_MAX_ALL; i++) + mapping_BD_to_RND[i] = EL_UNKNOWN; + + for (i = 0; bd_object_mapping_list[i].element_bd != -1; i++) + if (bd_object_mapping_list[i].is_rnd_to_bd_mapping) + mapping_BD_to_RND[bd_object_mapping_list[i].element_bd] = + bd_object_mapping_list[i].element_rnd; + + mapping_initialized = TRUE; + } + + if (element_bd < 0 || element_bd >= O_MAX_ALL) + { + Warn("invalid BD element %d", element_bd); + + return EL_UNKNOWN; + } + + return mapping_BD_to_RND[element_bd]; +} + +int map_element_BD_to_RND_game(int element_bd) { static unsigned short mapping_BD_to_RND[O_MAX_ALL]; static boolean mapping_initialized = FALSE; @@ -10171,6 +10652,9 @@ void InitGraphicInfo_BD(void) g_bd->src_y = src_y; g_bd->width = TILEX; g_bd->height = TILEY; + + g_bd->graphic = graphic; + g_bd->frame = frame; } } @@ -10187,6 +10671,9 @@ void InitGraphicInfo_BD(void) g_bd->src_y = src_y; g_bd->width = TILEX; g_bd->height = TILEY; + + g_bd->graphic = graphic; + g_bd->frame = 0; } void InitGraphicInfo_EM(void)