--- deliantra/server/common/map.C	2006/08/31 06:23:19	1.17
+++ deliantra/server/common/map.C	2006/08/31 18:59:23	1.19
@@ -1,6 +1,6 @@
 /*
  * static char *rcsid_map_c =
- *   "$Id: map.C,v 1.17 2006/08/31 06:23:19 root Exp $";
+ *   "$Id: map.C,v 1.19 2006/08/31 18:59:23 root Exp $";
  */
 
 /*
@@ -530,7 +530,7 @@
          * or editor will not be able to do anything with it either.
          */
         if (op->arch==NULL) {
-            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?op->name:"(null)");
+            LOG(llevDebug,"Discarding object without arch: %s\n", op->name?(const char *)op->name:"(null)");
             continue;
         }
 
@@ -1395,18 +1395,6 @@
                 free_object(op);
             }
         }
-#ifdef MANY_CORES
-    /* I see periodic cores on metalforge where a map has been swapped out, but apparantly
-     * an item on that map was not saved - look for that condition and die as appropriate -
-     * this leaves more of the map data intact for better debugging.
-     */
-    for (op=objects; op!=NULL; op=op->next) {
-        if (!QUERY_FLAG(op, FLAG_REMOVED) && op->map == m) {
-            LOG(llevDebug,"free_all_objects: object %s still on map after it should have been freed\n", op->name);
-            abort();
-        }
-    }
-#endif
 }
 
 /*