From: Holger Schemel Date: Mon, 25 Mar 2024 10:33:20 +0000 (+0100) Subject: changed some game element tokens (BD engine) X-Git-Tag: 4.4.0.0-test-1~133 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=4d1c2e49b33707cc4832a9140709184da7c56f9f;p=rocksndiamonds.git changed some game element tokens (BD engine) --- diff --git a/src/conf_gfx.c b/src/conf_gfx.c index 83a7fd81..7e62f018 100644 --- a/src/conf_gfx.c +++ b/src/conf_gfx.c @@ -618,17 +618,17 @@ struct ConfigInfo image_config[] = { "bd_expandable_steelwall_any.EDITOR", UNDEFINED_FILENAME }, { "bd_expandable_steelwall_any.EDITOR.clone_from", "expandable_steelwall_any.EDITOR" }, - { "bd_expandable_wall_switch_horizontal", "boulder_rush.png" }, - { "bd_expandable_wall_switch_horizontal.xpos", "0" }, - { "bd_expandable_wall_switch_horizontal.ypos", "5" }, - { "bd_expandable_wall_switch_horizontal.frames", "1" }, - { "bd_expandable_wall_switch_horizontal.scale_up_factor", "2" }, - - { "bd_expandable_wall_switch_vertical", "boulder_rush.png" }, - { "bd_expandable_wall_switch_vertical.xpos", "1" }, - { "bd_expandable_wall_switch_vertical.ypos", "5" }, - { "bd_expandable_wall_switch_vertical.frames", "1" }, - { "bd_expandable_wall_switch_vertical.scale_up_factor", "2" }, + { "bd_expandable_wall_switch", "boulder_rush.png" }, + { "bd_expandable_wall_switch.xpos", "0" }, + { "bd_expandable_wall_switch.ypos", "5" }, + { "bd_expandable_wall_switch.frames", "1" }, + { "bd_expandable_wall_switch.scale_up_factor", "2" }, + + { "bd_expandable_wall_switch.active", "boulder_rush.png" }, + { "bd_expandable_wall_switch.active.xpos", "1" }, + { "bd_expandable_wall_switch.active.ypos", "5" }, + { "bd_expandable_wall_switch.active.frames", "1" }, + { "bd_expandable_wall_switch.active.scale_up_factor", "2" }, { "bd_inbox", "boulder_rush.png" }, { "bd_inbox.xpos", "6" }, @@ -797,17 +797,17 @@ struct ConfigInfo image_config[] = { "bd_conveyor_switch.active.frames", "1" }, { "bd_conveyor_switch.active.scale_up_factor", "2" }, - { "bd_conveyor_dir_switch_normal", "boulder_rush.png" }, - { "bd_conveyor_dir_switch_normal.xpos", "1" }, - { "bd_conveyor_dir_switch_normal.ypos", "44" }, - { "bd_conveyor_dir_switch_normal.frames", "1" }, - { "bd_conveyor_dir_switch_normal.scale_up_factor", "2" }, - - { "bd_conveyor_dir_switch_changed", "boulder_rush.png" }, - { "bd_conveyor_dir_switch_changed.xpos", "2" }, - { "bd_conveyor_dir_switch_changed.ypos", "44" }, - { "bd_conveyor_dir_switch_changed.frames", "1" }, - { "bd_conveyor_dir_switch_changed.scale_up_factor", "2" }, + { "bd_conveyor_dir_switch", "boulder_rush.png" }, + { "bd_conveyor_dir_switch.xpos", "1" }, + { "bd_conveyor_dir_switch.ypos", "44" }, + { "bd_conveyor_dir_switch.frames", "1" }, + { "bd_conveyor_dir_switch.scale_up_factor", "2" }, + + { "bd_conveyor_dir_switch.active", "boulder_rush.png" }, + { "bd_conveyor_dir_switch.active.xpos", "2" }, + { "bd_conveyor_dir_switch.active.ypos", "44" }, + { "bd_conveyor_dir_switch.active.frames", "1" }, + { "bd_conveyor_dir_switch.active.scale_up_factor", "2" }, { "bd_gravity_switch", "boulder_rush.png" }, { "bd_gravity_switch.xpos", "2" }, diff --git a/src/editor.c b/src/editor.c index 95d6f633..041a2759 100644 --- a/src/editor.c +++ b/src/editor.c @@ -5074,7 +5074,7 @@ static int editor_el_boulderdash_native[] = EL_BD_EXPANDABLE_WALL_HORIZONTAL, EL_BD_EXPANDABLE_WALL_VERTICAL, EL_BD_EXPANDABLE_WALL_ANY, - EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL, + EL_BD_EXPANDABLE_WALL_SWITCH, EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL, EL_BD_EXPANDABLE_STEELWALL_VERTICAL, @@ -5089,7 +5089,7 @@ static int editor_el_boulderdash_native[] = EL_BD_CONVEYOR_LEFT, EL_BD_CONVEYOR_RIGHT, EL_BD_CONVEYOR_SWITCH, - EL_BD_CONVEYOR_DIR_SWITCH_NORMAL, + EL_BD_CONVEYOR_DIR_SWITCH, EL_BD_CLOCK, EL_BD_TIME_PENALTY, diff --git a/src/main.c b/src/main.c index f605616c..bff898d0 100644 --- a/src/main.c +++ b/src/main.c @@ -6633,14 +6633,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Expandable steelwall (any direction)" }, { - "bd_expandable_wall_switch_horizontal", "bd_expandable_wall_switch", - "Expandable wall switch (horizontal)" + "bd_expandable_wall_switch", + "Expandable wall switch" }, { - "bd_expandable_wall_switch_vertical", + "bd_expandable_wall_switch.active", "bd_expandable_wall_switch", - "Expandable wall switch (vertical)" + "Expandable wall switch (active)" }, { "bd_inbox", @@ -6803,14 +6803,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] = "Conveyor belt power switch (active)" }, { - "bd_conveyor_dir_switch_normal", + "bd_conveyor_dir_switch", "bd_conveyor_dir_switch", "Conveyor belt direction switch" }, { - "bd_conveyor_dir_switch_changed", + "bd_conveyor_dir_switch.active", "bd_conveyor_dir_switch", - "Conveyor belt direction switch (changed)" + "Conveyor belt direction switch (active)" }, { "bd_gravity_switch", diff --git a/src/main.h b/src/main.h index ae06a99d..e6cdb47b 100644 --- a/src/main.h +++ b/src/main.h @@ -919,15 +919,15 @@ (e) == EL_BD_EXPANDABLE_STEELWALL_VERTICAL || \ (e) == EL_BD_EXPANDABLE_STEELWALL_ANY) -#define IS_BD_CONVEYOR_BELT(e) ((e) == EL_BD_CONVEYOR_LEFT || \ - (e) == EL_BD_CONVEYOR_LEFT_ACTIVE || \ - (e) == EL_BD_CONVEYOR_RIGHT || \ +#define IS_BD_CONVEYOR_BELT(e) ((e) == EL_BD_CONVEYOR_LEFT || \ + (e) == EL_BD_CONVEYOR_LEFT_ACTIVE || \ + (e) == EL_BD_CONVEYOR_RIGHT || \ (e) == EL_BD_CONVEYOR_RIGHT_ACTIVE) -#define IS_BD_CONVEYOR_BELT_SWITCH(e) ((e) == EL_BD_CONVEYOR_SWITCH || \ - (e) == EL_BD_CONVEYOR_SWITCH_ACTIVE || \ - (e) == EL_BD_CONVEYOR_DIR_SWITCH_NORMAL || \ - (e) == EL_BD_CONVEYOR_DIR_SWITCH_CHANGED) +#define IS_BD_CONVEYOR_BELT_SWITCH(e) ((e) == EL_BD_CONVEYOR_SWITCH || \ + (e) == EL_BD_CONVEYOR_SWITCH_ACTIVE || \ + (e) == EL_BD_CONVEYOR_DIR_SWITCH || \ + (e) == EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE) #define IS_SOKOBAN_OBJECT_OR_FIELD(e) ((e) == EL_SOKOBAN_OBJECT || \ (e) == EL_SOKOBAN_FIELD_EMPTY || \ @@ -2063,8 +2063,8 @@ #define EL_BD_EXPANDABLE_STEELWALL_HORIZONTAL 1284 #define EL_BD_EXPANDABLE_STEELWALL_VERTICAL 1285 #define EL_BD_EXPANDABLE_STEELWALL_ANY 1286 -#define EL_BD_EXPANDABLE_WALL_SWITCH_HORIZONTAL 1287 -#define EL_BD_EXPANDABLE_WALL_SWITCH_VERTICAL 1288 +#define EL_BD_EXPANDABLE_WALL_SWITCH 1287 +#define EL_BD_EXPANDABLE_WALL_SWITCH_ACTIVE 1288 #define EL_BD_INBOX 1289 #define EL_BD_EXIT_CLOSED 1290 #define EL_BD_EXIT_OPEN 1291 @@ -2097,8 +2097,8 @@ #define EL_BD_CONVEYOR_RIGHT_ACTIVE 1318 #define EL_BD_CONVEYOR_SWITCH 1319 #define EL_BD_CONVEYOR_SWITCH_ACTIVE 1320 -#define EL_BD_CONVEYOR_DIR_SWITCH_NORMAL 1321 -#define EL_BD_CONVEYOR_DIR_SWITCH_CHANGED 1322 +#define EL_BD_CONVEYOR_DIR_SWITCH 1321 +#define EL_BD_CONVEYOR_DIR_SWITCH_ACTIVE 1322 #define EL_BD_GRAVITY_SWITCH 1323 #define EL_BD_GRAVITY_SWITCH_ACTIVE 1324 #define EL_BD_ACID 1325 diff --git a/src/tools.c b/src/tools.c index 1ecb117b..36fc6e15 100644 --- a/src/tools.c +++ b/src/tools.c @@ -6296,7 +6296,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, @@ -6316,7 +6316,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, @@ -7387,11 +7387,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, @@ -7407,11 +7407,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,