--- deliantra/server/include/object.h 2006/12/22 16:54:56 1.63 +++ deliantra/server/include/object.h 2006/12/23 06:21:02 1.64 @@ -90,9 +90,6 @@ * e.g. ->copy_to () */ -typedef refptr object_ptr; -typedef refptr arch_ptr; - // these are not being copied ACC_CLASS (object) struct object_keep : refcounted @@ -102,7 +99,7 @@ tag_t ACC (RW, count); /* Generation count for this object */ UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. - player *ACC (RW, contr); /* Pointer to the player which control this object */ + player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ object *ACC (RW, next); /* Pointer to the next object in the free/used list */ object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ object *ACC (RW, active_next);/* Next & previous object in the 'active' */