--- deliantra/server/common/object.C	2007/07/05 08:10:29	1.164
+++ deliantra/server/common/object.C	2007/07/16 14:49:01	1.166
@@ -1377,7 +1377,6 @@
                 top = last->below;
             }
         }                       /* If objects on this space */
-
       if (flag & INS_MAP_LOAD)
         top = ms.top;
 
@@ -2642,13 +2641,10 @@
 const materialtype_t *
 object::dominant_material () const
 {
-  if (materialtype_t *mat = name_to_material (materialname))
-    return mat;
-
-  // omfg this is slow, this has to be temporary :)
-  shstr unknown ("unknown");
+  if (materialtype_t *mt = name_to_material (materialname))
+    return mt;
 
-  return name_to_material (unknown);
+  return name_to_material (shstr_unknown);
 }
 
 void