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.242 by root, Tue Apr 13 03:44:21 2010 UTC vs.
Revision 1.243 by root, Tue Apr 13 22:05:42 2010 UTC

668 668
669 // makes sure the player has the named skill, 669 // makes sure the player has the named skill,
670 // and also makes it innate if can_use is true. 670 // and also makes it innate if can_use is true.
671 // returns the new skill or 0 if no such skill exists. 671 // returns the new skill or 0 if no such skill exists.
672 MTH object *give_skill (shstr_cmp name, bool can_use = false); 672 MTH object *give_skill (shstr_cmp name, bool can_use = false);
673 MTH void become_follower (object *new_god);
673 674
674 // insert object at same map position as 'where' 675 // insert object at same map position as 'where'
675 // handles both inventory and map "positions" 676 // handles both inventory and map "positions"
676 MTH object *insert_at (object *where, object *originator = 0, int flags = 0); 677 MTH object *insert_at (object *where, object *originator = 0, int flags = 0);
677 // check whether we can put this into the map, respect max_nrof, max_volume, max_items 678 // check whether we can put this into the map, respect max_nrof, max_volume, max_items

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines