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

Comparing deliantra/server/include/object.h (file contents):
Revision 1.161 by root, Sun Apr 20 05:24:55 2008 UTC vs.
Revision 1.162 by root, Sun Apr 20 22:03:21 2008 UTC

384 return nrof ? nrof : 1; 384 return nrof ? nrof : 1;
385 } 385 }
386 386
387 uint64 total_weight () const 387 uint64 total_weight () const
388 { 388 {
389 return weight * number_of (); 389 return weight * number_of () + carrying;
390 } 390 }
391 391
392 // return the dominant material of this item, always return something 392 // return the dominant material of this item, always return something
393 const materialtype_t *dominant_material () const; 393 const materialtype_t *dominant_material () const;
394 394

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines