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

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.77 by root, Mon Sep 22 01:46:52 2008 UTC vs.
Revision 1.80 by elmex, Sun Oct 5 12:40:21 2008 UTC

   /* We are only dropping some of the items.  We split the current object
    * off
    */
   if (!can_split (op, tmp, nrof))
+    return;
   if (INVOKE_OBJECT (DROP, tmp, ARG_OBJECT (op)))
     return;
   if (QUERY_FLAG (tmp, FLAG_STARTEQUIP))
     {
       op->statusmsg (format ("You drop the %s.", query_name (tmp)));
-      op->statusmsg ("The gods who lent it to you retrieves it.");
+      op->statusmsg ("The god who lent it to you retrieves it.");
       tmp->destroy ();
       op->update_stats ();
       return;
     }
       return;
   if (is_in_shop (op) && !QUERY_FLAG (tmp, FLAG_UNPAID) && tmp->type != MONEY)
     {
       if (!sell_item (tmp, op))
-        return; // if we can't sell it we don't drop it
+        {
+          // if we can't sell it we don't drop it, so give it back to the seller
+          op->insert (tmp);
+          return;
+        }
     }
   tmp->x = op->x;
   tmp->y = op->y;
       if (tmp->env && tmp->env->type != PLAYER)
         {
           /* Just toss the object - probably shouldn't be hanging
            * around anyways
            */
-          tmp->remove ();
           tmp->destroy ();
           return;
         }
       else
         {

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