--- deliantra/server/common/map.C	2006/08/15 15:00:20	1.2
+++ deliantra/server/common/map.C	2006/08/15 17:35:50	1.3
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.2 2006/08/15 15:00:20 elmex Exp $";
+ *   "$Id: map.C,v 1.3 2006/08/15 17:35:50 elmex Exp $";
  */
 
 /*
@@ -270,8 +270,10 @@
     if (nx) *nx = newx;
     if (ny) *ny = newy;
     retval |= mp->spaces[newx + mp->width * newy].flags;
-    if (mp->safe_map)
-      retval |= P_NO_MAGIC | P_NO_CLERIC | P_SAFE_MAP;
+
+    if (retval & P_SAFE)
+      retval |= P_NO_MAGIC | P_NO_CLERIC; // P_SAFE does imply these
+
     return retval;
 }
 
@@ -1826,6 +1828,8 @@
 	    flags |= P_NO_MAGIC;
 	if (QUERY_FLAG(tmp,FLAG_DAMNED))
 	    flags |= P_NO_CLERIC;
+        if (tmp->type == SAFE_FLOOR)
+            flags |= P_SAFE;
 
 	if (QUERY_FLAG(tmp,FLAG_BLOCKSVIEW))
 	    flags |= P_BLOCKSVIEW;