From: Holger Schemel <holger.schemel@virtion.de>
Date: Sun, 6 Oct 2024 18:39:14 +0000 (+0200)
Subject: fixed always drawing BD style magic wall as normal wall if inactive
X-Git-Tag: 4.4.0.0-test-4~150
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=d9b41fdb514807e14f24ec2d9b48aba9c1878d6a;p=rocksndiamonds.git

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 7a579b43..e32c5b36 100644
--- 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 4290398b..b633ef12 100644
--- 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 f3dbcf6f..b47d06c7 100644
--- 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,