From: Holger Schemel Date: Sun, 11 Aug 2024 13:35:49 +0000 (+0200) Subject: changed internal element name in BD engine X-Git-Tag: 4.4.0.0-test-4~312 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=3e487d217aea705d83d98dd583fddb3c68eb4174;p=rocksndiamonds.git changed internal element name in BD engine --- diff --git a/src/game_bd/bd_cavedb.c b/src/game_bd/bd_cavedb.c index d5230b8e..26d52ce9 100644 --- a/src/game_bd/bd_cavedb.c +++ b/src/game_bd/bd_cavedb.c @@ -1236,25 +1236,28 @@ GdElementProperty gd_element_properties[] = P_EXPLOSION, "AMOEBA2EXPLOSION4", 0, 295, 295, 295, 280 }, // has ckdelay + + // nut "explosions" are not real explosions, but the stages of a cracked nut opening. + // therefore they are sloped { - O_NUT_EXPL_1, N_("Nut explosion (1)"), + O_NUT_CRACK_1, N_("Nut crack (1)"), P_SLOPED | P_EXPLOSION | P_EXPLOSION_FIRST_STAGE, - "NUTEXPLOSION1", 0, 360, 360, 360, 280 + "NUTCRACK1", 0, 360, 360, 360, 280 }, // has ckdelay { - O_NUT_EXPL_2, N_("Nut explosion (2)"), + O_NUT_CRACK_2, N_("Nut crack (2)"), P_SLOPED | P_EXPLOSION, - "NUTEXPLOSION2", 0, 361, 361, 361, 280 + "NUTCRACK2", 0, 361, 361, 361, 280 }, /* has ckdelay */ /* these are rounded!! */ { - O_NUT_EXPL_3, N_("Nut explosion (3)"), + O_NUT_CRACK_3, N_("Nut crack (3)"), P_SLOPED | P_EXPLOSION, - "NUTEXPLOSION3", 0, 362, 362, 362, 280 + "NUTCRACK3", 0, 362, 362, 362, 280 }, // has ckdelay { - O_NUT_EXPL_4, N_("Nut explosion (4)"), + O_NUT_CRACK_4, N_("Nut crack (4)"), P_SLOPED | P_EXPLOSION, - "NUTEXPLOSION4", 0, 363, 363, 363, 280 + "NUTCRACK4", 0, 363, 363, 363, 280 }, // has ckdelay { @@ -2734,7 +2737,7 @@ GdPropertyDefault gd_cave_defaults_gdash[] = { CAVE_OFFSET(water_does_not_flow_down), FALSE }, // nut - { CAVE_OFFSET(nut_turns_to_when_crushed), O_NUT_EXPL_1 }, + { CAVE_OFFSET(nut_turns_to_when_crushed), O_NUT_CRACK_1 }, // replicator { CAVE_OFFSET(replicator_delay_frame), 4 }, diff --git a/src/game_bd/bd_caveengine.c b/src/game_bd/bd_caveengine.c index 44da27df..1b743c5a 100644 --- a/src/game_bd/bd_caveengine.c +++ b/src/game_bd/bd_caveengine.c @@ -3444,7 +3444,7 @@ void gd_cave_iterate(GdCave *cave, GdDirection player_move, boolean player_fire, store(cave, x, y, cave->explosion_effect); break; - case O_NUT_EXPL_4: + case O_NUT_CRACK_4: store(cave, x, y, O_DIAMOND); break; @@ -3537,9 +3537,9 @@ void gd_cave_iterate(GdCave *cave, GdDirection player_move, boolean player_fire, case O_BOMB_EXPL_1: case O_BOMB_EXPL_2: case O_BOMB_EXPL_3: - case O_NUT_EXPL_1: - case O_NUT_EXPL_2: - case O_NUT_EXPL_3: + case O_NUT_CRACK_1: + case O_NUT_CRACK_2: + case O_NUT_CRACK_3: case O_GHOST_EXPL_1: case O_GHOST_EXPL_2: case O_GHOST_EXPL_3: diff --git a/src/game_bd/bd_elements.h b/src/game_bd/bd_elements.h index 9beef2fe..1737915f 100644 --- a/src/game_bd/bd_elements.h +++ b/src/game_bd/bd_elements.h @@ -251,10 +251,10 @@ typedef enum _element O_AMOEBA_2_EXPL_2, O_AMOEBA_2_EXPL_3, O_AMOEBA_2_EXPL_4, - O_NUT_EXPL_1, - O_NUT_EXPL_2, - O_NUT_EXPL_3, - O_NUT_EXPL_4, + O_NUT_CRACK_1, + O_NUT_CRACK_2, + O_NUT_CRACK_3, + O_NUT_CRACK_4, // these are used internally for the pneumatic hammer, and should not be used in the editor! // (not even as an effect destination or something like that) diff --git a/src/tools.c b/src/tools.c index 09933f1d..bfcaaed0 100644 --- a/src/tools.c +++ b/src/tools.c @@ -7401,35 +7401,35 @@ bd_object_mapping_list[] = EL_BDX_AMOEBA_2, ACTION_EXPLODING, -1 }, { - O_NUT_EXPL_1, TRUE, + O_NUT_CRACK_1, TRUE, EL_BDX_NUT_BREAKING_1, -1, -1 }, { - O_NUT_EXPL_1, FALSE, + O_NUT_CRACK_1, FALSE, EL_BDX_NUT, ACTION_BREAKING, -1 }, { - O_NUT_EXPL_2, TRUE, + O_NUT_CRACK_2, TRUE, EL_BDX_NUT_BREAKING_2, -1, -1 }, { - O_NUT_EXPL_2, FALSE, + O_NUT_CRACK_2, FALSE, EL_BDX_NUT, ACTION_BREAKING, -1 }, { - O_NUT_EXPL_3, TRUE, + O_NUT_CRACK_3, TRUE, EL_BDX_NUT_BREAKING_3, -1, -1 }, { - O_NUT_EXPL_3, FALSE, + O_NUT_CRACK_3, FALSE, EL_BDX_NUT, ACTION_BREAKING, -1 }, { - O_NUT_EXPL_4, TRUE, + O_NUT_CRACK_4, TRUE, EL_BDX_NUT_BREAKING_4, -1, -1 }, { - O_NUT_EXPL_4, FALSE, + O_NUT_CRACK_4, FALSE, EL_BDX_NUT, ACTION_BREAKING, -1 }, { @@ -10763,7 +10763,7 @@ void InitGraphicInfo_BD(void) BD_GFX_RANGE(O_PRE_STEEL_1, 4, i) ? BD_GFX_FRAME(O_PRE_STEEL_1, i) : BD_GFX_RANGE(O_BOMB_TICK_1, 7, i) ? BD_GFX_FRAME(O_BOMB_TICK_1, i) : BD_GFX_RANGE(O_BOMB_EXPL_1, 4, i) ? BD_GFX_FRAME(O_BOMB_EXPL_1, i) : - BD_GFX_RANGE(O_NUT_EXPL_1, 4, i) ? BD_GFX_FRAME(O_NUT_EXPL_1, i) : + BD_GFX_RANGE(O_NUT_CRACK_1, 4, i) ? BD_GFX_FRAME(O_NUT_CRACK_1, i) : BD_GFX_RANGE(O_GHOST_EXPL_1, 4, i) ? BD_GFX_FRAME(O_GHOST_EXPL_1, i) : BD_GFX_RANGE(O_EXPLODE_1, 5, i) ? BD_GFX_FRAME(O_EXPLODE_1, i) : BD_GFX_RANGE(O_PRE_CLOCK_1, 4, i) ? BD_GFX_FRAME(O_PRE_CLOCK_1, i) :