--- deliantra/server/common/object.C	2006/12/14 04:30:32	1.67
+++ deliantra/server/common/object.C	2006/12/19 13:41:45	1.71
@@ -32,6 +32,8 @@
 #include <funcpoint.h>
 #include <loader.h>
 
+#include <bitset>
+
 int nrofallocobjects = 0;
 static UUID uuid;
 const uint64 UUID_SKIP = 1<<19;
@@ -221,37 +223,31 @@
   if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
     SET_FLAG (ob2, FLAG_BEEN_APPLIED);
 
-
-  /* the 0x400000 on flags2 is FLAG_INV_LOCK.  I don't think something
-   * being locked in inventory should prevent merging.
-   * 0x4 in flags3 is CLIENT_SENT
-   */
-  if ((ob1->arch != ob2->arch) ||
-      (ob1->flags[0] != ob2->flags[0]) ||
-      (ob1->flags[1] != ob2->flags[1]) ||
-      ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
-      ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
-      (ob1->name != ob2->name) ||
-      (ob1->title != ob2->title) ||
-      (ob1->msg != ob2->msg) ||
-      (ob1->weight != ob2->weight) ||
-      (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) ||
-      (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) ||
-      (ob1->attacktype != ob2->attacktype) ||
-      (ob1->magic != ob2->magic) ||
-      (ob1->slaying != ob2->slaying) ||
-      (ob1->skill != ob2->skill) ||
-      (ob1->value != ob2->value) ||
-      (ob1->animation_id != ob2->animation_id) ||
-      (ob1->client_type != ob2->client_type) ||
-      (ob1->materialname != ob2->materialname) ||
-      (ob1->lore != ob2->lore) ||
-      (ob1->subtype != ob2->subtype) ||
-      (ob1->move_type != ob2->move_type) ||
-      (ob1->move_block != ob2->move_block) ||
-      (ob1->move_allow != ob2->move_allow) ||
-      (ob1->move_on != ob2->move_on) ||
-      (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty))
+  if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
+      || ob1->arch         != ob2->arch
+      || ob1->name         != ob2->name
+      || ob1->title        != ob2->title
+      || ob1->msg          != ob2->msg
+      || ob1->weight       != ob2->weight
+      || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
+      || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
+      || ob1->attacktype   != ob2->attacktype
+      || ob1->magic        != ob2->magic
+      || ob1->slaying      != ob2->slaying
+      || ob1->skill        != ob2->skill
+      || ob1->value        != ob2->value
+      || ob1->animation_id != ob2->animation_id
+      || ob1->client_type  != ob2->client_type
+      || ob1->materialname != ob2->materialname
+      || ob1->lore         != ob2->lore
+      || ob1->subtype      != ob2->subtype
+      || ob1->move_type    != ob2->move_type
+      || ob1->move_block   != ob2->move_block
+      || ob1->move_allow   != ob2->move_allow
+      || ob1->move_on      != ob2->move_on
+      || ob1->move_off     != ob2->move_off
+      || ob1->move_slow    != ob2->move_slow
+      || ob1->move_slow_penalty != ob2->move_slow_penalty)
     return 0;
 
   /* This is really a spellbook check - really, we should
@@ -1142,7 +1138,7 @@
                   tmp->container = 0;
                 }
 
-              tmp->contr->socket->update_look = 1;
+              tmp->contr->socket->floorbox_update ();
             }
 
           /* See if player moving off should effect something */
@@ -1150,7 +1146,7 @@
               && ((move_type & tmp->move_off)
                   && (move_type & ~tmp->move_off & ~tmp->move_block) == 0))
             {
-              move_apply (tmp, this, 0);
+              move_apply (tmp, this, 0, false);
 
               if (destroyed ())
                 LOG (llevError, "BUG: remove_ob(): name %s, destroyed leaving object\n", tmp->debug_desc ());
@@ -1489,7 +1485,7 @@
   if (!(flag & INS_MAP_LOAD))
     for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
       if (tmp->type == PLAYER)
-        tmp->contr->socket->update_look = 1;
+        tmp->contr->socket->floorbox_update ();
 
   /* If this object glows, it may affect lighting conditions that are
    * visible to others on this map.  But update_all_los is really
@@ -1507,7 +1503,7 @@
   update_object (op, UP_OBJ_INSERT);
 
   /* Don't know if moving this to the end will break anything.  However,
-   * we want to have update_look set above before calling this.
+   * we want to have floorbox_update called before calling this.
    *
    * check_move_on() must be after this because code called from
    * check_move_on() depends on correct map flags (so functions like
@@ -1924,7 +1920,7 @@
       if ((!op->move_type && tmp->move_on & MOVE_WALK) ||
           ((op->move_type & tmp->move_on) && (op->move_type & ~tmp->move_on & ~tmp->move_block) == 0))
         {
-          move_apply (tmp, op, originator);
+          move_apply (tmp, op, originator, true);
 
           if (op->destroyed ())
             return 1;