From: Holger Schemel <info@artsoft.org>
Date: Fri, 22 Mar 2024 10:06:54 +0000 (+0100)
Subject: fixed conveyor belt direction switch names for BD engine
X-Git-Tag: 4.4.0.0-test-1~166
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;ds=sidebyside;h=4f06890d9e4a9d115ec6b84d21dcc20ed8b7d1cd;p=rocksndiamonds.git

fixed conveyor belt direction switch names for BD engine
---

diff --git a/src/conf_gfx.c b/src/conf_gfx.c
index ae95ea37..68096777 100644
--- a/src/conf_gfx.c
+++ b/src/conf_gfx.c
@@ -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_left",			"boulder_rush.png"		},
-  { "bd_conveyor_dir_switch_left.xpos",			"2"				},
-  { "bd_conveyor_dir_switch_left.ypos",			"44"				},
-  { "bd_conveyor_dir_switch_left.frames",		"1"				},
-  { "bd_conveyor_dir_switch_left.scale_up_factor",	"2"				},
-
-  { "bd_conveyor_dir_switch_right",			"boulder_rush.png"		},
-  { "bd_conveyor_dir_switch_right.xpos",		"1"				},
-  { "bd_conveyor_dir_switch_right.ypos",		"44"				},
-  { "bd_conveyor_dir_switch_right.frames",		"1"				},
-  { "bd_conveyor_dir_switch_right.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_gravity_switch",				"boulder_rush.png"		},
   { "bd_gravity_switch.xpos",				"2"				},
diff --git a/src/editor.c b/src/editor.c
index ab2350d4..25853f86 100644
--- a/src/editor.c
+++ b/src/editor.c
@@ -4872,7 +4872,7 @@ static int editor_el_boulderdash_native[] =
   EL_BD_CONVEYOR_LEFT,
   EL_BD_CONVEYOR_RIGHT,
   EL_BD_CONVEYOR_SWITCH,
-  EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,
+  EL_BD_CONVEYOR_DIR_SWITCH_NORMAL,
 
   EL_BD_CLOCK,
   EL_BD_TIME_PENALTY,
diff --git a/src/main.c b/src/main.c
index ba0e1802..1bcd101e 100644
--- a/src/main.c
+++ b/src/main.c
@@ -6803,14 +6803,14 @@ struct ElementNameInfo element_name_info[MAX_NUM_ELEMENTS + 1] =
     "Switch for conveyor belt (on)"
   },
   {
-    "bd_conveyor_dir_switch_left",
+    "bd_conveyor_dir_switch_normal",
     "bd_conveyor_dir_switch",
-    "Switch for conveyor belt direction (left)"
+    "Switch for conveyor belt direction (normal)"
   },
   {
-    "bd_conveyor_dir_switch_right",
+    "bd_conveyor_dir_switch_changed",
     "bd_conveyor_dir_switch",
-    "Switch for conveyor belt direction (right)"
+    "Switch for conveyor belt direction (changed)"
   },
   {
     "bd_gravity_switch",
diff --git a/src/main.h b/src/main.h
index fdda6505..f18bfb1d 100644
--- a/src/main.h
+++ b/src/main.h
@@ -925,8 +925,8 @@
 
 #define IS_BD_CONVEYOR_BELT_SWITCH(e)	((e) == EL_BD_CONVEYOR_SWITCH ||		\
 					 (e) == EL_BD_CONVEYOR_SWITCH_ACTIVE ||		\
-					 (e) == EL_BD_CONVEYOR_DIR_SWITCH_LEFT ||	\
-					 (e) == EL_BD_CONVEYOR_DIR_SWITCH_RIGHT)
+					 (e) == EL_BD_CONVEYOR_DIR_SWITCH_NORMAL ||	\
+					 (e) == EL_BD_CONVEYOR_DIR_SWITCH_CHANGED)
 
 #define IS_SOKOBAN_OBJECT_OR_FIELD(e)	((e) == EL_SOKOBAN_OBJECT ||		\
 					 (e) == EL_SOKOBAN_FIELD_EMPTY ||	\
@@ -2096,8 +2096,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_LEFT		1321
-#define EL_BD_CONVEYOR_DIR_SWITCH_RIGHT		1322
+#define EL_BD_CONVEYOR_DIR_SWITCH_NORMAL	1321
+#define EL_BD_CONVEYOR_DIR_SWITCH_CHANGED	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 537a0e21..2fdcd0b8 100644
--- a/src/tools.c
+++ b/src/tools.c
@@ -6284,7 +6284,7 @@ bd_object_mapping_list[] =
   },
   {
     O_CONVEYOR_DIR_SWITCH,			TRUE,
-    EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH_NORMAL,		-1, -1
   },
   {
     O_ACID,					TRUE,
@@ -7031,11 +7031,11 @@ bd_object_mapping_list[] =
   },
   {
     O_CONVEYOR_DIR_NORMAL,			FALSE,
-    EL_BD_CONVEYOR_DIR_SWITCH_RIGHT,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH_NORMAL,		-1, -1
   },
   {
     O_CONVEYOR_DIR_CHANGED,			FALSE,
-    EL_BD_CONVEYOR_DIR_SWITCH_LEFT,		-1, -1
+    EL_BD_CONVEYOR_DIR_SWITCH_CHANGED,		-1, -1
   },
   {
     O_CONVEYOR_SWITCH_OFF,			FALSE,