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.40 by root, Sat Sep 16 22:24:12 2006 UTC vs.
Revision 1.41 by root, Tue Sep 19 22:05:55 2006 UTC

79 79
80/* However, if you're keeping a pointer of some sort, you probably 80/* However, if you're keeping a pointer of some sort, you probably
81 * don't just want it copied, so you'll need to add to common/object.C, 81 * don't just want it copied, so you'll need to add to common/object.C,
82 * e.g. copy_object. 82 * e.g. copy_object.
83 */ 83 */
84
85typedef refptr<object> object_ptr;
84 86
85// these are not being copied 87// these are not being copied
86ACC_CLASS (object) 88ACC_CLASS (object)
87struct object_keep : refcounted 89struct object_keep : refcounted
88{ 90{
125 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 127 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
126 shstr ACC (RW, lore); /* Obscure information about this object, */ 128 shstr ACC (RW, lore); /* Obscure information about this object, */
127 /* To get put into books and the like. */ 129 /* To get put into books and the like. */
128 shstr ACC (RW, materialname); /* specific material name */ 130 shstr ACC (RW, materialname); /* specific material name */
129 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 131 shstr ACC (RW, custom_name); /* Custom name assigned by player */
130 refptr<object> ACC (RW, owner); /* Pointer to the object which controls this one */ 132 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
131 refptr<object> ACC (RW, enemy); /* Monster/player to follow even if not closest */ 133 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
132 refptr<object> ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 134 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
133 refptr<object> ACC (RW, chosen_skill); /* the skill chosen to use */ 135 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
134 refptr<object> ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 136 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
135 refptr<object> ACC (RW, spell); /* Spell that was being cast */ 137 object_ptr ACC (RW, spell); /* Spell that was being cast */
136 refptr<object> ACC (RW, current_weapon); /* Pointer to the weapon currently used */ 138 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
137}; 139};
138 140
139// these are being copied and also cleared 141// these are being copied and also cleared
140struct object_pod 142struct object_pod
141{ 143{

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines