[ViewVC] Diff of: cvs/deliantra/server/socket/item.C

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC

 /*
  * This file is part of Deliantra, the Roguelike Realtime MMORPG.
  *
- * Copyright (©) 2005,2006,2007 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
+ * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
  * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
  * Copyright (©) 1992,2007 Frank Tore Johansen
  *
  * Deliantra is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
   if (QUERY_FLAG (head, FLAG_ANIMATE) && !ns.anims_sent[head->animation_id])
     ns.send_animation (head->animation_id);
   sl << uint32 (head->count)
      << uint32 (flags)
-     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : WEIGHT (head))
+     << uint32 (QUERY_FLAG (head, FLAG_NO_PICK) ? -1 : head->client_weight ())
      << uint32 (head->face);
   if (!head->custom_name)
     {
       strncpy (item_n, query_base_name (head, 0), 127);
   else
     pl->ns->update_look = 0;
   if (QUERY_FLAG (ob, FLAG_REMOVED)
       || !ob->map
-      || ob->map->in_memory != MAP_IN_MEMORY
+      || ob->map->in_memory != MAP_ACTIVE
       || out_of_map (ob->map, ob->x, ob->y))
     return;
   pl->ns->send_packet ("delinv 0");
   if (flags & UPD_FLAGS)
     sl << uint32 (query_flags (op));
   if (flags & UPD_WEIGHT)
     {
-      sint32 weight = WEIGHT (op);
+      sint32 weight = op->client_weight ();
       sl << uint32 (QUERY_FLAG (op, FLAG_NO_PICK) ? -1 : weight);
+#if 0
       if (pl == op)
         ns->last_weight = weight;
+#endif
     }
   if (flags & UPD_FACE)
     {
       ns->send_face (op->face, -50);
     return;
   /* If this is not the player object, do some more checks */
   if (op != pl)
     {
-      /* We only send 'visibile' objects to the client */
+      /* We only send 'visible' objects to the client */
       if (!op->client_visible ())
         return;
       /* if the item is on the ground, mark that the look needs to
        * be updated.
   pl->contr->ns->send_packet (sl);
   SET_FLAG (op, FLAG_CLIENT_SENT);
 }
 /**
- * Tells the client to delete an item.  Uses the item
+ * Tells the client to delete an item.
- * command with a -1 location.
  */
 void
 esrv_del_item (player *pl, int tag)
 {
   if (!pl->ns)
   tag_t tag = net_uint32 ((uint8 *)data + 1);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
-      new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to lock/unlock");
+      pl->failmsg ("Could not find object to lock/unlock");
       return;
     }
   if (!flag)
     CLEAR_FLAG (op, FLAG_INV_LOCKED);
   tag_t tag = net_uint32 ((uint8 *)data);
   object *op = esrv_get_ob_from_count (pl->ob, tag);
   if (!op)
     {
-      new_draw_info (NDI_UNIQUE, 0, pl->ob, "Could not find object to mark");
+      pl->failmsg ("Could not find object to mark");
       return;
     }
   pl->mark = op;
-  new_draw_info_format (NDI_UNIQUE, 0, pl->ob, "Marked item %s", query_name (op));
+  pl->ob->statusmsg (format ("Marked item %s", query_name (op)));
 }
 /**
  * look_at prints items on the specified square.
  *
       /* If it is an active container, then we should drop all objects
        * in the container and not the container itself.
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
-          object *current, *next;
           int cnt = MAX_ITEM_PER_DROP;
-          for (current = op->inv; current != NULL; current = next)
+          for (object *current = op->inv; current; )
             {
-              next = current->below;
+              object *next = current->below;
               drop_object (pl, current, 0);
               if (--cnt <= 0) break;
+              current = next;
             }
           if (cnt <= 0)
-            pl->failmsg (format (
+            op->failmsg ("Only dropped some items, can't drop that many items at once.");
-              "Moved only %d items, you can't move more than that at once.",
-              MAX_ITEM_PER_DROP
-            ));
-          esrv_update_item (UPD_WEIGHT, pl, op);
         }
       else
         drop_object (pl, op, nrof);
+      update_after_inventory_change (pl);
       return;
     }
   else if (to == pl->count)
     {                           /* pick it up to the inventory */
    * has already been done (eg, it can be picked up and fits in
    * in a sack, so check for those things.  We should also check
    * an make sure env is in fact a container for that matter.
    */
   if (env->type == CONTAINER && can_pick (pl, op) && sack_can_hold (pl, env, op, nrof))
+    {
-    put_object_in_sack (pl, env, op, nrof);
+      put_object_in_sack (pl, env, op, nrof);
+      update_after_inventory_change (pl);
+    }
 }

Diff Legend

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

Comparing deliantra/server/socket/item.C (file contents): Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC vs. Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC

Diff Legend

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.56 by elmex, Mon Nov 26 11:41:02 2007 UTC vs.
Revision 1.60 by root, Tue Apr 22 07:01:47 2008 UTC