--- deliantra/server/common/map.C	2006/09/08 12:56:42	1.27
+++ deliantra/server/common/map.C	2006/09/08 18:26:22	1.28
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.27 2006/09/08 12:56:42 root Exp $";
+ *   "$Id: map.C,v 1.28 2006/09/08 18:26:22 root Exp $";
  */
 
 /*
@@ -257,10 +257,8 @@
     if (newmap) *newmap = mp;
     if (nx) *nx = newx;
     if (ny) *ny = newy;
-    retval |= mp->spaces[newx + mp->width * newy].flags;
 
-    if (retval & P_SAFE)
-      retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
+    retval |= mp->spaces[newx + mp->width * newy].flags;
 
     return retval;
 }
@@ -1807,7 +1805,7 @@
         if (QUERY_FLAG(tmp,FLAG_DAMNED))
             flags |= P_NO_CLERIC;
         if (tmp->type == SAFE_GROUND)
-            flags |= P_SAFE | P_NO_CLERIC | P_NO_MAGIC;
+            flags |= P_SAFE;
 
         if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW))
             flags |= P_BLOCKSVIEW;