--- deliantra/server/common/material.C	2009/11/10 16:02:06	1.6
+++ deliantra/server/common/material.C	2009/11/29 10:55:18	1.8
@@ -112,7 +112,7 @@
   if (!op->is_armor ())
     return;
 
-  if (op->material == &material_null)
+  if (op->material == MATERIAL_NULL)
     return;
 
   if (op->material != change->material)
@@ -134,7 +134,7 @@
 void
 select_material (object *op, int difficulty)
 {
-  if (op->material != &material_null || !op->materials)
+  if (op->material != MATERIAL_NULL || !op->materials)
     return;
 
   materialtype_t *lmt = 0;
@@ -192,7 +192,7 @@
 //-GPL
 
 void
-load_materials (void)
+load_materials ()
 {
   char filename[MAX_BUF];