--- deliantra/server/common/object.C	2006/12/23 06:30:49	1.79
+++ deliantra/server/common/object.C	2006/12/23 13:56:25	1.81
@@ -223,7 +223,7 @@
   if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
     SET_FLAG (ob2, FLAG_BEEN_APPLIED);
 
-  if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
+  if ((ob1->flag ^ ob2->flag).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
       || ob1->arch         != ob2->arch
       || ob1->name         != ob2->name
       || ob1->title        != ob2->title
@@ -1507,7 +1507,6 @@
 decrease_ob_nr (object *op, uint32 i)
 {
   object *tmp;
-  player *pl;
 
   if (i == 0)                   /* objects with op->nrof require this check */
     return op;
@@ -1530,14 +1529,12 @@
        * and then searching the map for a player.
        */
       if (!tmp)
-        {
-          for (pl = first_player; pl; pl = pl->next)
-            if (pl->ob->container == op->env)
-              {
-                tmp = pl->ob;
-                break;
-              }
-        }
+        for_all_players (pl)
+          if (pl->ob->container == op->env)
+            {
+              tmp = pl->ob;
+              break;
+            }
 
       if (i < op->nrof)
         {