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.205 by root, Tue Sep 1 21:59:55 2009 UTC vs.
Revision 1.207 by root, Wed Sep 16 23:22:50 2009 UTC

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 496
497 MTH bool is_arch () const { return this == (const object *)(const archetype *)arch; }
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
501 || type == BRACERS || type == GIRDLE; } 503 || type == BRACERS || type == GIRDLE; }
597 } 599 }
598 600
599 // returns the player that cna see this object, if any 601 // returns the player that cna see this object, if any
600 MTH object *visible_to () const; 602 MTH object *visible_to () const;
601 603
602 MTH std::string long_desc (object *who = 0); 604 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
603 MTH std::string describe_monster (object *who = 0); 605 MTH std::string describe_monster (object *who = 0);
604 MTH std::string describe_item (object *who = 0); 606 MTH std::string describe_item (object *who = 0);
605 MTH std::string describe (object *who = 0); 607 MTH std::string describe (object *who = 0); // long description, without name
606 608
607 MTH const char *query_weight () { return ::query_weight (this); } 609 MTH const char *query_weight () { return ::query_weight (this); }
608 MTH const char *query_name () { return ::query_name (this); } 610 MTH const char *query_name () { return ::query_name (this); }
609 MTH const char *query_short_name () { return ::query_short_name (this); } 611 MTH const char *query_short_name () { return ::query_short_name (this); }
610 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); } 612 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines