--- deliantra/server/common/object.C 2007/07/05 08:10:29 1.164 +++ deliantra/server/common/object.C 2007/07/10 07:31:19 1.165 @@ -2642,13 +2642,10 @@ const materialtype_t * object::dominant_material () const { - if (materialtype_t *mat = name_to_material (materialname)) - return mat; + if (materialtype_t *mt = name_to_material (materialname)) + 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