fixed always drawing BD style magic wall as normal wall if inactive

diff --git a/src/game_bd/bd_cave.c b/src/game_bd/bd_cave.c
index 7a579b4389330dc44b315d0178958cfb4a22cb9b..e32c5b36c02ee22a350e5e40d2f254c3136341f7 100644 (file)
--- a/src/game_bd/bd_cave.c
+++ b/src/game_bd/bd_cave.c
@@ -1422,11 +1422,11 @@ void gd_drawcave_game(const GdCave *cave,
   }
 
   elemmapping[O_MAGIC_WALL] = (cave->magic_wall_state == GD_MW_ACTIVE ?
-                               O_MAGIC_WALL :
-                               O_BRICK);
+                               O_MAGIC_WALL_ACTIVE :
+                               O_MAGIC_WALL);
   elemdrawing[O_MAGIC_WALL] = gd_element_properties[cave->magic_wall_state == GD_MW_ACTIVE ?
-                                                    O_MAGIC_WALL :
-                                                    O_BRICK].image_game;
+                                                    O_MAGIC_WALL_ACTIVE :
+                                                    O_MAGIC_WALL].image_game;
 
   elemmapping[O_CREATURE_SWITCH] = (cave->creatures_backwards ?
                                     O_CREATURE_SWITCH_ON :

diff --git a/src/game_bd/bd_cavedb.c b/src/game_bd/bd_cavedb.c
index 4290398b4404052d87bc205c1c82f36c18891c98..b633ef12d65214d462ef31f974156e9253f2f404 100644 (file)
--- a/src/game_bd/bd_cavedb.c
+++ b/src/game_bd/bd_cavedb.c
@@ -227,7 +227,7 @@ GdElementProperty gd_element_properties[] =
   {
     O_MAGIC_WALL, O_MAGIC_WALL, N_("Magic wall"),
     P_CAN_BE_HAMMERED,
-    "MAGICWALL", 'M', 184, -184, -184
+    "MAGICWALL", 'M', 5, 5, 5
   },
   {
     O_PRE_OUTBOX, O_PRE_OUTBOX, N_("Outbox"),

diff --git a/src/tools.c b/src/tools.c
index f3dbcf6fd6f6af91d66650e43108b3230a2cad21..b47d06c707f013d31803ca80ee69d5837451aafc 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -6192,7 +6192,7 @@ bd_object_mapping_list[] =
   },
   {
     O_MAGIC_WALL,                              TRUE,
-    EL_BDX_MAGIC_WALL,                         ACTION_ACTIVE, -1
+    EL_BDX_MAGIC_WALL,                         -1, -1
   },
   {
     O_PRE_OUTBOX,                              TRUE,
@@ -7862,7 +7862,7 @@ bd_object_mapping_list[] =
   },
   {
     O_MAGIC_WALL_ACTIVE,                       FALSE,
-    EL_BDX_MAGIC_WALL_ACTIVE,          -1, -1
+    EL_BDX_MAGIC_WALL_ACTIVE,                  -1, -1
   },
   {
     O_REPLICATOR_ACTIVE,                       FALSE,