ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/server/c_object.C
(Generate patch)

Comparing deliantra/server/server/c_object.C (file contents):
Revision 1.130 by root, Mon Nov 12 03:14:33 2012 UTC vs.
Revision 1.131 by root, Mon Nov 12 03:48:34 2012 UTC

608 if (obj->destroyed () || obj->is_inserted ()) 608 if (obj->destroyed () || obj->is_inserted ())
609 return; 609 return;
610 610
611 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY) 611 if (dropper->is_in_shop () && !obj->flag [FLAG_UNPAID] && obj->type != MONEY)
612 if (!sell_item (obj, dropper)) 612 if (!sell_item (obj, dropper))
613 return; 613 return;
614 614
615 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper)) 615 if (!obj->can_drop_at (dropper->map, dropper->x, dropper->y, dropper))
616 return; 616 return;
617 617
618 /* If nothing special happened with this object, the default action is to 618 /* If nothing special happened with this object, the default action is to

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines