--- deliantra/server/common/object.C 2006/12/18 02:35:00 1.68 +++ deliantra/server/common/object.C 2006/12/19 13:41:45 1.71 @@ -223,7 +223,6 @@ 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 () || ob1->arch != ob2->arch || ob1->name != ob2->name @@ -1139,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 */ @@ -1147,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 ()); @@ -1486,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 @@ -1504,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 @@ -1921,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;