X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Ftools.c;h=1ecb117b915ac518312a778f0f1f3f5086ba47a6;hb=394fd0859ee1fd61606798b4683edd3bd5295c93;hp=babb4987171bd73559191c0429f79aed62e64432;hpb=be208e8ebb9fbe5a97e7ed1d63aa421ac303c0bc;p=rocksndiamonds.git diff --git a/src/tools.c b/src/tools.c index babb4987..1ecb117b 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6212,7 +6212,7 @@ bd_object_mapping_list[] = }, { O_FLYING_STONE_F, FALSE, - EL_BD_FLYING_ROCK, ACTION_FALLING, -1 + EL_BD_FLYING_ROCK, ACTION_FLYING, -1 }, { O_MEGA_STONE, TRUE, @@ -6248,7 +6248,7 @@ bd_object_mapping_list[] = }, { O_FLYING_DIAMOND_F, FALSE, - EL_BD_FLYING_DIAMOND, ACTION_FALLING, -1 + EL_BD_FLYING_DIAMOND, ACTION_FLYING, -1 }, { O_NUT, TRUE, @@ -6974,14 +6974,6 @@ bd_object_mapping_list[] = O_NITRO_PACK_F, FALSE, EL_BD_NITRO_PACK, ACTION_FALLING, -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_PRE_CLOCK_1, TRUE, EL_BD_CLOCK_GROWING_1, -1, -1 @@ -7254,6 +7246,14 @@ bd_object_mapping_list[] = 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 @@ -7327,11 +7327,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 },