cleanup of setup value fonts on setup screens

[rocksndiamonds.git] / src / tools.c

diff --git a/src/tools.c b/src/tools.c
index 1ecb117b915ac518312a778f0f1f3f5086ba47a6..e05a197392679a7f1f0a2df6683dbdfa88d63b63 100644 (file)
--- 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,
@@ -6894,6 +6894,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
@@ -6902,6 +6906,26 @@ 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
@@ -7387,11 +7411,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 +7431,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,