--- deliantra/server/common/object.C 2006/09/08 16:51:42 1.18 +++ deliantra/server/common/object.C 2006/09/08 17:14:07 1.19 @@ -1,6 +1,6 @@ /* * static char *rcsid_object_c = - * "$Id: object.C,v 1.18 2006/09/08 16:51:42 root Exp $"; + * "$Id: object.C,v 1.19 2006/09/08 17:14:07 root Exp $"; */ /* @@ -625,32 +625,26 @@ update_ob_speed (op); } -/* - * get_object() grabs an object from the list of unused objects, makes - * sure it is initialised, and returns it. - * If there are no free objects, expand_objects() is called to get more. - */ - -object *get_object () +object::object () { - object *op = new object; + count = ++ob_count; - op->count = ++ob_count; - - op->next = objects; + next = objects; if (objects) - objects->prev = op; + objects->prev = this; - objects = op; + objects = this; - SET_FLAG (op, FLAG_REMOVED); + SET_FLAG (this, FLAG_REMOVED); - op->expmul = 1.0; - op->face = blank_face; - op->attacked_by_count = -1; + expmul = 1.0; + face = blank_face; + attacked_by_count = -1; +} - return op; +object::~object () +{ } /*