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

Comparing deliantra/server/socket/item.C (file contents):
Revision 1.65 by root, Tue May 6 16:32:34 2008 UTC vs.
Revision 1.67 by root, Tue May 6 19:47:56 2008 UTC

 /** Move an object to a new location */
 void
 esrv_move_object (object *pl, tag_t to, tag_t tag, long nrof)
 {
-  object *op, *env;
-  op = esrv_get_ob_from_count (pl, tag);
+  object *op = esrv_get_ob_from_count (pl, tag);
   if (!op)
     {
       LOG (llevDebug, "Player '%s' tried to move an unknown object (%ld)\n", &pl->name, tag);
       return;
     }
        */
       if (op->inv && QUERY_FLAG (op, FLAG_APPLIED))
         {
           int cnt = MAX_ITEM_PER_DROP;
-          for (object *current = op->inv; current; )
+          for (object *current = op->inv; current && cnt--; )
             {
               object *next = current->below;
               drop_object (pl, current, 0);
-              if (--cnt <= 0) break;
               current = next;
             }
           if (cnt <= 0)
             op->failmsg ("Only dropped some items, can't drop that many items at once.");
       pl->contr->count = nrof;
       pick_up (pl, op);
       return;
     }
-  env = esrv_get_ob_from_count (pl, to);
+  object *env = esrv_get_ob_from_count (pl, to);
   if (!env)
     {
       LOG (llevDebug, "Player '%s' tried to move object to the unknown location (%d)\n", &pl->name, to);
       return;
     }

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