[ViewVC] Diff of: cvs/deliantra/server/common/object.C

Comparing deliantra/server/common/object.C (file contents):
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC

     SET_FLAG (ob1, FLAG_BEEN_APPLIED);
   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
       || ob1->msg          != ob2->msg
       || ob1->weight       != ob2->weight
     }
   op->key_values = 0;
 }
-void object::clear ()
-{
-  attachable_base::clear ();
-  free_key_values (this);
-  owner = 0;
-  name = 0;
-  name_pl = 0;
-  title = 0;
-  race = 0;
-  slaying = 0;
-  skill = 0;
-  msg = 0;
-  lore = 0;
-  custom_name = 0;
-  materialname = 0;
-  contr = 0;
-  below = 0;
-  above = 0;
-  inv = 0;
-  container = 0;
-  env = 0;
-  more = 0;
-  head = 0;
-  map = 0;
-  active_next = 0;
-  active_prev = 0;
-  memset (static_cast<object_pod *>(this), 0, sizeof (object_pod));
-  SET_FLAG (this, FLAG_REMOVED);
-  /* What is not cleared is next, prev, and count */
-  expmul = 1.0;
-  face = blank_face;
-  if (settings.casting_time)
-    casting_time = -1;
-}
 /*
  * copy_to first frees everything allocated by the dst object,
  * and then copies the contents of itself into the second
  * object, allocating what needs to be allocated.  Basically, any
  * data that is malloc'd needs to be re-malloc/copied.  Otherwise,
 {
   bool is_freed   = QUERY_FLAG (dst, FLAG_FREED);
   bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
   *(object_copy *)dst = *this;
-  *(object_pod  *)dst = *this;
   if (self || cb)
     INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
   if (is_freed)
       abort ();
 #endif
       return;
     }
-  mapspace &m = op->map->at (op->x, op->y);
+  mapspace &m = op->ms ();
   if (m.flags_ & P_NEED_UPDATE)
     /* nop */;
   else if (action == UP_OBJ_INSERT)
     {
       /* NO_FIX_PLAYER is set when a great many changes are being
        * made to players inventory.  If set, avoiding the call
        * to save cpu time.
        */
       if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
-        fix_player (otmp);
+        otmp->update_stats ();
       if (above != NULL)
         above->below = below;
       else
         env->inv = below;
                 {
                   CLEAR_FLAG (this, FLAG_APPLIED);
                   tmp->container = 0;
                 }
-              tmp->contr->socket->floorbox_update ();
+              tmp->contr->ns->floorbox_update ();
             }
           /* See if player moving off should effect something */
           if (check_walk_off
               && ((move_type & tmp->move_off)
       op->below = originator->below;
       if (op->below)
         op->below->above = op;
       else
-        op->map->at (op->x, op->y).bottom = op;
+        op->ms ().bottom = op;
       /* since *below* originator, no need to update top */
       originator->below = op;
     }
   else
           if (op->above)
             op->above->below = op;
           op->below = NULL;
-          op->map->at (op->x, op->y).bottom = op;
+          op->ms ().bottom = op;
         }
       else
         {                       /* get inserted into the stack above top */
           op->above = top->above;
           op->below = top;
           top->above = op;
         }
       if (op->above == NULL)
-        op->map->at (op->x, op->y).top = op;
+        op->ms ().top = op;
     }                           /* else not INS_BELOW_ORIGINATOR */
   if (op->type == PLAYER)
     op->contr->do_los = 1;
   /* If we have a floor, we know the player, if any, will be above
    * it, so save a few ticks and start from there.
    */
   if (!(flag & INS_MAP_LOAD))
-    if (object *pl = op->map->at (op->x, op->y).player ())
+    if (object *pl = op->ms ().player ())
-      pl->contr->socket->floorbox_update ();
+      pl->contr->ns->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
    * an inefficient way to do this, as it means los for all players
    * on the map will get recalculated.  The players could very well
 object *
 decrease_ob_nr (object *op, uint32 i)
 {
   object *tmp;
-  player *pl;
   if (i == 0)                   /* objects with op->nrof require this check */
     return op;
   if (i > op->nrof)
        * IMO, searching through all the players will mostly
        * likely be quicker than following op->env to the map,
        * and then searching the map for a player.
        */
       if (!tmp)
-        {
+        for_all_players (pl)
-          for (pl = first_player; pl; pl = pl->next)
-            if (pl->ob->container == op->env)
+          if (pl->ob->container == op->env)
-              {
+            {
-                tmp = pl->ob;
+              tmp = pl->ob;
-                break;
+              break;
-              }
+            }
-        }
       if (i < op->nrof)
         {
           sub_weight (op->env, op->weight * i);
           op->nrof -= i;
     add_weight (this, (op->weight + op->carrying));
   otmp = this->in_player ();
   if (otmp && otmp->contr)
     if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
-      fix_player (otmp);
+      otmp->update_stats ();
   op->map = 0;
   op->env = this;
   op->above = 0;
   op->below = 0;

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing deliantra/server/common/object.C (file contents): Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC vs. Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.75 by root, Wed Dec 20 11:36:38 2006 UTC vs.
Revision 1.81 by root, Sat Dec 23 13:56:25 2006 UTC