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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.324 by root, Mon Apr 12 05:22:37 2010 UTC vs.
Revision 1.325 by root, Wed Apr 14 21:36:31 2010 UTC

2738 } 2738 }
2739 else 2739 else
2740 move_type = mt; 2740 move_type = mt;
2741} 2741}
2742 2742
2743/* object should be a player.
2744 * we return the object the player has marked with the 'mark' command
2745 * below. If no match is found (or object has changed), we return
2746 * NULL. We leave it up to the calling function to print messages if
2747 * nothing is found.
2748 */
2749object *
2750object::mark () const
2751{
2752 if (contr && contr->mark && contr->mark->env == this)
2753 return contr->mark;
2754 else
2755 return 0;
2756}
2757

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines