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.206 by root, Wed Sep 16 22:50:50 2009 UTC vs.
Revision 1.207 by root, Wed Sep 16 23:22:50 2009 UTC

491 return (uint64)total_weight () 491 return (uint64)total_weight ()
492 * 1000 492 * 1000
493 * (type == CONTAINER ? 1000 : 1) 493 * (type == CONTAINER ? 1000 : 1)
494 / dominant_material ()->density; 494 / dominant_material ()->density;
495 } 495 }
496
497 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
496 498
497 MTH bool is_wiz () const { return flag [FLAG_WIZ]; } 499 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
498 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } 500 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
499 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET 501 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
500 || type == CLOAK || type == BOOTS || type == GLOVES 502 || type == CLOAK || type == BOOTS || type == GLOVES

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines