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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.250 by root, Wed Jul 16 14:29:40 2008 UTC vs.
Revision 1.251 by root, Sun Jul 20 16:56:34 2008 UTC

1535 if (!nr) 1535 if (!nr)
1536 return true; 1536 return true;
1537 1537
1538 nr = min (nr, nrof); 1538 nr = min (nr, nrof);
1539 1539
1540 if (nrof > nr)
1541 {
1540 nrof -= nr; 1542 nrof -= nr;
1541
1542 if (nrof)
1543 {
1544 adjust_weight (env, -weight * max (1, nr)); // carrying == 0 1543 adjust_weight (env, -weight * max (1, nr)); // carrying == 0
1545 1544
1546 if (object *pl = visible_to ()) 1545 if (object *pl = visible_to ())
1547 esrv_update_item (UPD_NROF, pl, this); 1546 esrv_update_item (UPD_NROF, pl, this);
1548 1547

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines