--- deliantra/server/common/item.C	2006/09/21 00:05:24	1.7
+++ deliantra/server/common/item.C	2006/12/20 09:14:21	1.9
@@ -670,7 +670,7 @@
   use_buf %= 5;
 
 #ifdef NEW_MATERIAL_CODE
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
     {
       mt = name_to_material (op->materialname);
       if (mt)
@@ -777,11 +777,11 @@
   if (!op->nrof && !op->weight && !op->title && !is_magical (op))
     return op->name;            /* To speed things up (or make things slower?) */
 
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname)
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname)
     mt = name_to_material (op->materialname);
 
 #ifdef NEW_MATERIAL_CODE
-  if ((IS_ARMOR (op) || IS_WEAPON (op)) && op->materialname && mt &&
+  if ((op->is_armor () || op->is_weapon ()) && op->materialname && mt &&
       op->arch->clone.materialname != mt->name && !(op->material & M_SPECIAL))
     {
       strcpy (buf, mt->description);
@@ -1504,11 +1504,9 @@
   return 0;
 }
 
-
 /*
  * Supposed to fix face-values as well here, but later.
  */
-
 void
 identify (object *op)
 {
@@ -1540,7 +1538,7 @@
     update_object (op, UP_OBJ_FACE);
   else
     {
-      pl = is_player_inv (op->env);
+      pl = op->in_player ();
       if (pl)
         /* A lot of the values can change from an update - might as well send
          * it all.
@@ -1548,3 +1546,4 @@
         esrv_send_item (pl, op);
     }
 }
+