[ViewVC] Diff of: cvs/deliantra/server/server/c

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.68 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC

 }
 static bool
 can_split (object *pl, object *&op, sint32 nrof)
 {
-  if (object *tmp = op->split (nrof))
+  if (object *tmp = op->split (nrof ? nrof : op->number_of ()))
     {
       op = tmp;
       return true;
     }
   else
   if (!can_split (pl, tmp, nrof))
     return;
   if (QUERY_FLAG (tmp, FLAG_UNPAID))
+    {
+      tmp->flag.reset (FLAG_UNPAID);
-    new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
+      new_draw_info_format (NDI_UNIQUE, 0, pl, "%s will cost you %s.", query_name (tmp), query_cost_string (tmp, pl, F_BUY | F_SHOP));
+      tmp->flag.set (FLAG_UNPAID);
+    }
   else
     new_draw_info_format (NDI_UNIQUE, 0, pl, "You pick up the %s.", query_name (tmp));
-  tmp = insert_ob_in_ob (tmp, op);
+  op->insert (tmp);
-  /* All the stuff below deals with client/server code, and is only
-   * usable by players
-   */
-  if (pl->contr)
-    {
-      esrv_send_item (pl, tmp);
-      /* These are needed to update the weight for the container we
-       * are putting the object in.
-       */
-      if (op != pl)
-        {
-          esrv_update_item (UPD_WEIGHT, pl, op);
-          esrv_send_item (pl, pl);
-        }
-      /* Update the container the object was in */
-      if (env && env != pl && env != op)
-        esrv_update_item (UPD_WEIGHT, pl, env);
-    }
 }
 /* modified slightly to allow monsters use this -b.t. 5-31-95 */
 void
 pick_up (object *op, object *alt)
       for (tmp2 = tmp->inv; tmp2; tmp2 = tmp)
         {
           tmp = tmp2->below;
           if ((sack->type == CONTAINER && sack_can_hold (op, op->container, tmp2, tmp2->nrof)))
-            {
-              put_object_in_sack (op, sack, tmp2, 0);
+            put_object_in_sack (op, sack, tmp2, 0);
-            }
           else
             {
               sprintf (buf, "Your %s fills up.", query_name (sack));
               new_draw_info (NDI_UNIQUE, 0, op, buf);
               break;
             }
         }
-      esrv_update_item (UPD_WEIGHT, op, sack2);
       return;
     }
   /* Don't worry about this for containers - our caller should have
    * already checked this.
   if (QUERY_FLAG (tmp, FLAG_APPLIED))
     if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
       return;
   /* we want to put some portion of the item into the container */
-  if (nrof && tmp->nrof != nrof)
-    {
-      if (!can_split (op, tmp, nrof))
+  if (!can_split (op, tmp, nrof))
-        return;
+    return;
-    }
-  else
-    tmp->remove ();
   new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
-  tmp2 = insert_ob_in_ob (tmp, sack);
+  sack->insert (tmp);
   // elmex: 2007-11-26: removed update_stats and replaced
   //                    it by update_after_inventory_change () in the caller
   //                    of this function
-  /* If an object merged (and thus, different object), we need to
-   * delete the original.
-   */
-  if (tmp2 != tmp)
-    esrv_del_item (op->contr, tmp->count);
-  esrv_send_item (op, tmp2);
-  /* update the sacks weight */
-  esrv_update_item (UPD_WEIGHT, op, sack);
 }
 /*
  *  This function was part of drop, now is own function.
  *  Player 'op' tries to drop object 'tmp', if tmp is non zero, then
  * This is used when dropping objects onto the floor.
  */
 void
 drop_object (object *op, object *tmp, uint32 nrof)
 {
-  object *floor;
   if (QUERY_FLAG (tmp, FLAG_NO_DROP))
     return;
   if (QUERY_FLAG (tmp, FLAG_APPLIED))
     if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
   //fprintf (stderr, "ui, on space is %ld\n", op->ms ().volume ());//D
   /* We are only dropping some of the items.  We split the current object
    * off
    */
-  if (nrof && tmp->nrof != nrof)
-    {
-      if (!can_split (op, tmp, nrof))
+  if (!can_split (op, tmp, nrof))
-        return;
-    }
-  else
-    tmp->remove ();
   if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
     return;
   if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
       tmp->destroy ();
       op->update_stats ();
       return;
     }
-  if (op->type == PLAYER)
-    esrv_del_item (op->contr, tmp->count);
   /* Call this before we update the various windows/players.  At least
    * that we, we know the weight is correct.
    */
   // 2007-11-26: moved op->update_stats away and calling it later after
   //             all items of a drop command have been processed.
-  for (floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
+  for (object *floor = GET_MAP_OB (op->map, op->x, op->y); floor; floor = floor->above)
     if (INVOKE_OBJECT (DROP_ON, floor, ARG_OBJECT (tmp), ARG_OBJECT (op)))
       return;
   if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
     sell_item (tmp, op);
   tmp->y = op->y;
   insert_ob_in_map (tmp, op->map, op, INS_BELOW_ORIGINATOR);
 }
+void
-void update_after_inventory_change (object *op)
+update_after_inventory_change (object *op)
 {
   /* Call this before we update the various windows/players.  At least
    * that we, we know the weight is correct.
    */
   op->update_stats ();

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.68 by root, Tue Apr 22 02:46:18 2008 UTC vs. Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.68 by root, Tue Apr 22 02:46:18 2008 UTC vs.
Revision 1.69 by root, Tue Apr 22 07:01:47 2008 UTC