removed code which has no effect anymore

diff --git a/src/game_bd/bd_cave.c b/src/game_bd/bd_cave.c
index b56e2ac780a371b7e1eb09030ce71d88ccd7459b..3cd4c64f156bfade74bf535f9ddec0298f61ec4b 100644 (file)
--- a/src/game_bd/bd_cave.c
+++ b/src/game_bd/bd_cave.c
@@ -1662,7 +1662,7 @@ void gd_cave_adler_checksum_more(GdCave *cave, unsigned int *a, unsigned int *b)
   for (y = 0; y < cave->h; y++)
     for (x = 0; x < cave->w; x++)
     {
-      *a += gd_element_properties[cave->map[y][x] & O_MASK].character;
+      *a += gd_element_properties[cave->map[y][x]].character;
       *b += *a;
 
       *a %= 65521;

diff --git a/src/game_bd/bd_caveengine.c b/src/game_bd/bd_caveengine.c
index ab9b3d6107a7d88765b9e7f0163581d2d1340046..252ff9f16ad78d365d454f82676f2294a86a05fd 100644 (file)
--- a/src/game_bd/bd_caveengine.c
+++ b/src/game_bd/bd_caveengine.c
@@ -135,7 +135,7 @@ static inline boolean has_property(int element, const int property)
   if (use_old_game_engine)
     element = non_scanned_pair(element);
 
-  return (gd_element_properties[element & O_MASK].properties & property) != 0;
+  return (gd_element_properties[element].properties & property) != 0;
 }
 
 // returns true if the element can fall
@@ -589,7 +589,7 @@ static inline boolean is_element_dir(const GdCave *cave, const int x, const int
 static inline boolean is_space_dir(const GdCave *cave, const int x, const int y,
                                   const GdDirection dir)
 {
-  GdElement e = get_dir(cave, x, y, dir) & O_MASK;
+  GdElement e = get_dir(cave, x, y, dir);
 
   return (e == O_SPACE || e == O_LAVA);
 }
@@ -825,7 +825,7 @@ static void bomb_explode(GdCave *cave, const int x, const int y)
  */
 static void explode(GdCave *cave, int x, int y)
 {
-  GdElement e = get(cave, x, y) & O_MASK;
+  GdElement e = get(cave, x, y);
 
   switch (e)
   {
@@ -1789,7 +1789,7 @@ void gd_cave_iterate(GdCave *cave, GdDirection player_move, boolean player_fire,
       }
 
       // add the ckdelay correction value for every element seen.
-      cave->ckdelay += gd_element_properties[get(cave, x, y) & O_MASK].ckdelay;
+      cave->ckdelay += gd_element_properties[get(cave, x, y)].ckdelay;
 
       switch (get(cave, x, y))
       {
@@ -4061,7 +4061,7 @@ void set_initial_cave_speed(GdCave *cave)
     for (x = 0; x < cave->w; x++)
     {
       // add the ckdelay correction value for every element seen.
-      cave->ckdelay += gd_element_properties[get(cave, x, y) & O_MASK].ckdelay;
+      cave->ckdelay += gd_element_properties[get(cave, x, y)].ckdelay;
     }
   }
 

diff --git a/src/game_bd/bd_elements.h b/src/game_bd/bd_elements.h
index 99bfa717675ed5e9f3c28b7e24e6f6618514f4b6..d318699ebf26b78e61d04a12d2b209d821136668 100644 (file)
--- a/src/game_bd/bd_elements.h
+++ b/src/game_bd/bd_elements.h
@@ -405,12 +405,7 @@ typedef enum _element
   O_OUT,
   O_EXCLAMATION_MARK,
 
-  O_MAX_ALL,
-
-  SCANNED = 0x400,
-
-  // binary AND this to elements to get rid of properties above.
-  O_MASK = ~SCANNED
+  O_MAX_ALL
 } GdElement;
 
 typedef enum _sound

diff --git a/src/game_bd/bd_graphics.c b/src/game_bd/bd_graphics.c
index 9138620aa30c051aceb48d59103b6bc472e42c9c..7bca451166f1d2ff1a46134ebb794058ef3ce7e7 100644 (file)
--- a/src/game_bd/bd_graphics.c
+++ b/src/game_bd/bd_graphics.c
@@ -545,7 +545,7 @@ Bitmap *gd_get_tile_bitmap(Bitmap *bitmap)
 // returns true if the element has a certain property
 static inline boolean has_property(const int element, const int property)
 {
-  return (gd_element_properties[element & O_MASK].properties & property) != 0;
+  return (gd_element_properties[element].properties & property) != 0;
 }
 
 // returns true if the element is a player

diff --git a/src/tools.c b/src/tools.c
index d94e5e0dbce6670cd418f4af6aa9d7f6bea5060a..7d1201e014d6889e2ded0639b44a15f9153a3d9b 100644 (file)
--- a/src/tools.c
+++ b/src/tools.c
@@ -8013,9 +8013,6 @@ int map_element_BD_to_RND_cave(int element_bd)
     mapping_initialized = TRUE;
   }
 
-  // always map (scanned) run-time elements to normal elements
-  element_bd &= O_MASK;
-
   if (element_bd < 0 || element_bd >= O_MAX_ALL)
   {
     Warn("invalid BD element %d", element_bd);
@@ -8046,9 +8043,6 @@ int map_element_BD_to_RND_game(int element_bd)
     mapping_initialized = TRUE;
   }
 
-  // always map (scanned) run-time elements to normal elements
-  element_bd &= O_MASK;
-
   if (element_bd < 0 || element_bd >= O_MAX_ALL)
   {
     Warn("invalid BD element %d", element_bd);