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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.164 by root, Thu Jul 5 08:10:29 2007 UTC vs.
Revision 1.166 by elmex, Mon Jul 16 14:49:01 2007 UTC

                */
               if (last && last->below && last != floor)
                 top = last->below;
             }
         }                       /* If objects on this space */
       if (flag & INS_MAP_LOAD)
         top = ms.top;
       if (flag & INS_ABOVE_FLOOR_ONLY)
         top = floor;
 }
 const materialtype_t *
 object::dominant_material () const
 {
-  if (materialtype_t *mat = name_to_material (materialname))
+  if (materialtype_t *mt = name_to_material (materialname))
-    return mat;
+    return mt;
-  // omfg this is slow, this has to be temporary :)
-  shstr unknown ("unknown");
-  return name_to_material (unknown);
+  return name_to_material (shstr_unknown);
 }
 void
 object::open_container (object *new_container)
 {

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