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.204 by root, Tue Sep 1 20:56:05 2009 UTC vs.
Revision 1.206 by root, Wed Sep 16 22:50:50 2009 UTC

546 } 546 }
547 547
548 // returns the outermost environment, may return 0 548 // returns the outermost environment, may return 0
549 MTH object *outer_env () const 549 MTH object *outer_env () const
550 { 550 {
551 return env ? outer_env () : 0; 551 return env ? outer_env_or_self () : 0;
552 } 552 }
553 553
554 // returns the player that has this object in his inventory, or 0 554 // returns the player that has this object in his inventory, or 0
555 // we assume the player is always the outer env 555 // we assume the player is always the outer env
556 MTH object *in_player () const 556 MTH object *in_player () const
597 } 597 }
598 598
599 // returns the player that cna see this object, if any 599 // returns the player that cna see this object, if any
600 MTH object *visible_to () const; 600 MTH object *visible_to () const;
601 601
602 MTH std::string long_desc (object *who = 0); 602 MTH std::string long_desc (object *who = 0); // query_name . " " . describe
603 MTH std::string describe_monster (object *who = 0); 603 MTH std::string describe_monster (object *who = 0);
604 MTH std::string describe_item (object *who = 0); 604 MTH std::string describe_item (object *who = 0);
605 MTH std::string describe (object *who = 0); 605 MTH std::string describe (object *who = 0); // long description, without name
606 606
607 MTH const char *query_weight () { return ::query_weight (this); } 607 MTH const char *query_weight () { return ::query_weight (this); }
608 MTH const char *query_name () { return ::query_name (this); } 608 MTH const char *query_name () { return ::query_name (this); }
609 MTH const char *query_short_name () { return ::query_short_name (this); } 609 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); } 610 MTH const char *query_base_name (bool plural) { return ::query_base_name (this, plural); }

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines