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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.102 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.103 by root, Sun Nov 8 20:55:39 2009 UTC

   /* Makes processing easier */
   if (params && *params == '\0')
     params = 0;
-  int cnt = MAX_ITEM_PER_DROP;
+  int cnt = MAX_ITEM_PER_ACTION;
   while (tmp)
     {
       next = tmp->below;
   if (!can_split (op, tmp, nrof))
     return;
   new_draw_info_format (NDI_UNIQUE, 0, op, "You put the %s in %s.", query_name (tmp), query_name (sack));
   sack->insert (tmp);
-}
-/*
- *  This function was part of drop, now is own function.
- *  Player 'op' tries to drop object 'tmp', if tmp is non zero, then
- *  nrof objects is tried to dropped.
- * This is used when dropping objects onto the floor.
- */
-void
-drop_object (object *op, object *tmp, uint32 nrof)
-{
-  if (QUERY_FLAG (tmp, FLAG_NO_DROP))
-    return;
-  if (QUERY_FLAG (tmp, FLAG_APPLIED))
-    if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
-      return;                   /* can't unapply it */
-  /* We are only dropping some of the items.  We split the current object
-   * off
-   */
-  if (!can_split (op, tmp, nrof))
-    return;
-  drop_object (op, tmp);
-  if (!tmp->destroyed () && !tmp->is_inserted ())
-    {
-      // if nothing happened with the object we give it back
-      op->insert (tmp);
-    }
 }
 /* In contrast to drop_object (op, tmp, nrof) above this function takes the
  * already split off object, and feeds it to the event handlers and does
  * other magic with it.
   if (is_in_shop (dropper) && !QUERY_FLAG (obj, FLAG_UNPAID) && obj->type != MONEY)
     if (!sell_item (obj, dropper))
       return;
+  if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
+    return;
   /* If nothing special happened with this object, the default action is to
    * insert it below the dropper:
    */
   obj->x = dropper->x;
   obj->y = dropper->y;
   insert_ob_in_map (obj, dropper->map, dropper, INS_BELOW_ORIGINATOR);
+}
+/*
+ * This function was part of drop, now is own function.
+ * Player 'op' tries to drop object 'tmp', if tmp is non zero, then
+ * nrof objects are tried to drop.
+ * This is used when dropping objects onto the floor.
+ */
+void
+drop_object (object *op, object *tmp, uint32 nrof)
+{
+  if (QUERY_FLAG (tmp, FLAG_NO_DROP))
+    return;
+  if (QUERY_FLAG (tmp, FLAG_APPLIED))
+    if (apply_special (op, tmp, AP_UNAPPLY | AP_NO_MERGE))
+      return;                   /* can't unapply it */
+  /* We are only dropping some of the items.  We split the current object
+   * off
+   */
+  if (!can_split (op, tmp, nrof))
+    return;
+  drop_object (op, tmp);
+  if (!tmp->destroyed () && !tmp->is_inserted ())
+    {
+      // if nothing happened with the object we give it back
+      op->insert (tmp);
+    }
 }
 void
 drop (object *op, object *tmp)
 {
            */
           tmp->destroy ();
           return;
         }
       else
-        {
-          while (tmp && tmp->invisible)
+        while (tmp && tmp->invisible)
-            tmp = tmp->below;
+          tmp = tmp->below;
-        }
     }
-  if (tmp == NULL)
+  if (!tmp)
     {
       new_draw_info (NDI_UNIQUE, 0, op, "You don't have anything to drop.");
       return;
     }
   /*
      Care must be taken that the next item pointer is not to money as
      the drop() routine will do unknown things to it when dropping
      in a shop. --Tero.Pelander@utu.fi
    */
-  int cnt = MAX_ITEM_PER_DROP;
+  int cnt = MAX_ITEM_PER_ACTION;
   if (!params)
     {
       while (curinv)
         {
           nextinv = curinv->below;
           while (nextinv && nextinv->type == MONEY)
             nextinv = nextinv->below;
-          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED) && curinv->type != MONEY &&
+          if (!QUERY_FLAG (curinv, FLAG_INV_LOCKED)
-              curinv->type != FOOD && curinv->type != KEY &&
+              && curinv->type != MONEY
-              curinv->type != SPECIAL_KEY && curinv->type != GEM &&
+              && curinv->type != FOOD
+              && curinv->type != KEY
+              && curinv->type != SPECIAL_KEY
+              && curinv->type != GEM
+              && !curinv->invisible
-              !curinv->invisible && (curinv->type != CONTAINER || op->container_ () != curinv))
+              && (curinv->type != CONTAINER || op->container_ () != curinv))
             {
               drop (op, curinv);
               if (--cnt <= 0) break;
             }
           if (item_matched_string (op, tmp, params))
             matched_objs.push_back (tmp);
         }
-      int cnt = MAX_ITEM_PER_DROP;
+      int cnt = MAX_ITEM_PER_ACTION;
       if (!drop_vector (op, matched_objs, &cnt))
         new_draw_info (NDI_UNIQUE, 0, op, "Nothing to drop.");
       if (cnt <= 0)
         }
   if (weight)
     buf.printf ("%s %3.3f kg.\r", nrof > 1 ? "They weigh" : "It weighs", weight * (nrof ? nrof : 1) / 1000.0);
+  if (flag [FLAG_STARTEQUIP])
+    buf << (nrof > 1 ? "They were" : "It was")
+        << " given by a god and will vanish when dropped.\r";
   if (value && !flag [FLAG_STARTEQUIP] && !flag [FLAG_NO_PICK] && who)
     {
       buf.printf ("You reckon %s worth %s.\r", nrof > 1 ? "they are" : "it is", query_cost_string (this, who, F_TRUE | F_APPROX));
       if (is_in_shop (who))

Diff Legend

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

Comparing deliantra/server/server/c_object.C (file contents): Revision 1.102 by root, Sat Nov 7 18:30:05 2009 UTC vs. Revision 1.103 by root, Sun Nov 8 20:55:39 2009 UTC

Diff Legend

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.102 by root, Sat Nov 7 18:30:05 2009 UTC vs.
Revision 1.103 by root, Sun Nov 8 20:55:39 2009 UTC