--- deliantra/server/common/utils.C	2006/12/18 03:00:02	1.26
+++ deliantra/server/common/utils.C	2006/12/25 14:54:44	1.31
@@ -208,9 +208,9 @@
   if (m->unique)
     return;
 
-  for (x = 0; x < MAP_WIDTH (m); x++)
-    for (y = 0; y < MAP_HEIGHT (m); y++)
-      for (op = get_map_ob (m, x, y); op; op = otmp)
+  for (x = 0; x < m->width; x++)
+    for (y = 0; y < m->height; y++)
+      for (op = GET_MAP_OB (m, x, y); op; op = otmp)
         {
           destroy = 0;
           otmp = op->above;
@@ -257,7 +257,7 @@
                 destroy = 1;
               if ((op->material & M_SOFT_METAL || op->material & M_BONE) && rndm (1, 3) == 1)
                 destroy = 1;
-              if (op->material & M_ICE && MAP_TEMP (m) > 32)
+              if (op->material & M_ICE && m->temp > 32)
                 destroy = 1;
             }
           /* adjust overall chance below */
@@ -546,23 +546,6 @@
 
 /////////////////////////////////////////////////////////////////////////////
 
-#if 0
-refcounted *refcounted::rc_first;
-
-refcounted::refcounted ()
-{
-  refcnt   = 0;
-  rc_next  = rc_first;
-  rc_first = this;
-}
-
-refcounted::~refcounted ()
-{
-  assert (!rc_next);
-  assert (!refcnt);
-}
-#endif
-
 void *salloc_ (int n) throw (std::bad_alloc)
 {
   void *ptr = g_slice_alloc (n);