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.205 by root, Tue Sep 1 21:59:55 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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines