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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

   if (QUERY_FLAG (ob1, FLAG_IDENTIFIED))
     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 ()
       || ob1->arch         != ob2->arch
       || ob1->name         != ob2->name
       || ob1->title        != ob2->title
     op = op->env;
   return op;
 }
 /*
- * Eneq(@csd.uu.se): Since we can have items buried in a character we need
- * a better check.  We basically keeping traversing up until we can't
- * or find a player.
- */
-object *
-is_player_inv (object *op)
-{
-  for (; op != NULL && op->type != PLAYER; op = op->env)
-    if (op->env == op)
-      op->env = NULL;
-  return op;
-}
-/*
  * Used by: Crossedit: dump. Server DM commands: dumpbelow, dump.
  *      Some error messages.
  * The result of the dump is stored in the static global errmsg array.
  */
       /* 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 = is_player_inv (env)) != NULL && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
+      if ((otmp = in_player ()) && otmp->contr && !QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
         fix_player (otmp);
       if (above != NULL)
         above->below = below;
       else
                 {
                   CLEAR_FLAG (this, FLAG_APPLIED);
                   tmp->container = 0;
                 }
-              tmp->contr->socket->update_look = 1;
+              tmp->contr->socket->floorbox_update ();
             }
           /* See if player moving off should effect something */
           if (check_walk_off
               && ((move_type & tmp->move_off)
    * it, so save a few ticks and start from there.
    */
   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
    * an inefficient way to do this, as it means los for all players
    * on the map will get recalculated.  The players could very well
   /* updates flags (blocked, alive, no magic, etc) for this map space */
   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
    * blocked() and wall() work properly), and these flags are updated by
    * update_object().
   if (i > op->nrof)
     i = op->nrof;
   if (QUERY_FLAG (op, FLAG_REMOVED))
     op->nrof -= i;
-  else if (op->env != NULL)
+  else if (op->env)
     {
       /* is this object in the players inventory, or sub container
        * therein?
        */
-      tmp = is_player_inv (op->env);
+      tmp = op->in_player ();
       /* nope.  Is this a container the player has opened?
        * If so, set tmp to that player.
        * 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 (pl = first_player; pl; pl = pl->next)
             if (pl->ob->container == op->env)
+              {
+                tmp = pl->ob;
-              break;
+                break;
-          if (pl)
+              }
-            tmp = pl->ob;
-          else
-            tmp = NULL;
         }
       if (i < op->nrof)
         {
           sub_weight (op->env, op->weight * i);
           op->nrof -= i;
           if (tmp)
-            {
-              esrv_send_item (tmp, op);
+            esrv_send_item (tmp, op);
-            }
         }
       else
         {
           op->remove ();
           op->nrof = 0;
           if (tmp)
-            {
-              esrv_del_item (tmp->contr, op->count);
+            esrv_del_item (tmp->contr, op->count);
-            }
         }
     }
   else
     {
       object *above = op->above;
           op->remove ();
           op->nrof = 0;
         }
       /* Since we just removed op, op->above is null */
-      for (tmp = above; tmp != NULL; tmp = tmp->above)
+      for (tmp = above; tmp; tmp = tmp->above)
         if (tmp->type == PLAYER)
           {
             if (op->nrof)
               esrv_send_item (tmp, op);
             else
   if (op->nrof)
     return op;
   else
     {
       op->destroy ();
-      return NULL;
+      return 0;
     }
 }
 /*
  * add_weight(object, weight) adds the specified weight to an object,
       add_weight (this, op->weight * op->nrof);
     }
   else
     add_weight (this, (op->weight + op->carrying));
-  otmp = is_player_inv (this);
+  otmp = this->in_player ();
   if (otmp && otmp->contr)
     if (!QUERY_FLAG (otmp, FLAG_NO_FIX_PLAYER))
       fix_player (otmp);
-  op->map = NULL;
+  op->map = 0;
   op->env = this;
-  op->above = NULL;
+  op->above = 0;
-  op->below = NULL;
+  op->below = 0;
   op->x = 0, op->y = 0;
   /* reset the light list and los of the players on the map */
   if ((op->glow_radius != 0) && map)
     {
        * if the space being examined only has a wall to the north and empty
        * spaces in all the other directions, this will reduce the search space
        * to only the spaces immediately surrounding the target area, and
        * won't look 2 spaces south of the target space.
        */
-      else if ((flag & AB_NO_PASS) && maxfree[i] < stop)
+      else if ((flag & P_NO_PASS) && maxfree[i] < stop)
         stop = maxfree[i];
     }
   if (!index)
     return -1;
   return altern[RANDOM () % index];
 }
 /*
  * find_first_free_spot(archetype, maptile, x, y) works like

Diff Legend

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

Comparing deliantra/server/common/object.C (file contents): Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC vs. Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC

Diff Legend

Comparing deliantra/server/common/object.C (file contents):
Revision 1.68 by root, Mon Dec 18 02:35:00 2006 UTC vs.
Revision 1.74 by root, Wed Dec 20 09:14:21 2006 UTC