[ViewVC] Diff of: cvs/deliantra/server/common/utils.C

Comparing deliantra/server/common/utils.C (file contents):
Revision 1.28 by root, Sat Dec 23 16:05:19 2006 UTC vs.
Revision 1.31 by root, Mon Dec 25 14:54:44 2006 UTC

   object *op, *otmp;
   if (m->unique)
     return;
-  for (x = 0; x < MAP_WIDTH (m); x++)
+  for (x = 0; x < m->width; x++)
-    for (y = 0; y < MAP_HEIGHT (m); y++)
+    for (y = 0; y < m->height; y++)
       for (op = GET_MAP_OB (m, x, y); op; op = otmp)
         {
           destroy = 0;
           otmp = op->above;
           if (QUERY_FLAG (op, FLAG_IS_FLOOR) && QUERY_FLAG (op, FLAG_UNIQUE))
                 destroy = 1;
               if ((op->material & M_STONE || op->material & M_ADAMANT) && rndm (1, 10) == 1)
                 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 */
           if (destroy && rndm (0, 1))
             op->destroy ();
   return;
 }
 /////////////////////////////////////////////////////////////////////////////
-#if 0
-refcounted *refcounted::rc_first;
-refcounted::refcounted ()
-{
-  refcnt   = 0;
-  rc_next  = rc_first;
-  rc_first = this;
-}
-#endif
-refcounted::~refcounted ()
-{
-#if 0
-  assert (!rc_next);
-  assert (!refcnt);
-#endif
-}
 void *salloc_ (int n) throw (std::bad_alloc)
 {
   void *ptr = g_slice_alloc (n);
   if (!ptr)

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines