--- deliantra/server/include/object.h 2006/09/16 22:24:12 1.40 +++ deliantra/server/include/object.h 2006/09/19 22:05:55 1.41 @@ -82,6 +82,8 @@ * e.g. copy_object. */ +typedef refptr object_ptr; + // these are not being copied ACC_CLASS (object) struct object_keep : refcounted @@ -127,13 +129,13 @@ /* To get put into books and the like. */ shstr ACC (RW, materialname); /* specific material name */ shstr ACC (RW, custom_name); /* Custom name assigned by player */ - refptr ACC (RW, owner); /* Pointer to the object which controls this one */ - refptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ - refptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ - refptr ACC (RW, chosen_skill); /* the skill chosen to use */ - refptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ - refptr ACC (RW, spell); /* Spell that was being cast */ - refptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ + object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */ + object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */ + object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ + object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */ + object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */ + object_ptr ACC (RW, spell); /* Spell that was being cast */ + object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ }; // these are being copied and also cleared