--- deliantra/server/include/object.h 2006/12/03 01:06:37 1.46 +++ deliantra/server/include/object.h 2006/12/06 13:59:01 1.47 @@ -245,6 +245,8 @@ static object *create (); void destroy (bool destroy_inventory = false); + void remove (); + object *insert (object *item); // insert into inventory static void free_mortals (); static bool can_merge (object *op1, object *op2); @@ -313,6 +315,7 @@ ~object (); }; +// compatibility functions/macros #define get_object() object::create () #define free_object(op) (op)->destroy (0) #define free_object2(op, free_inv) (op)->destroy (free_inv) @@ -327,6 +330,12 @@ op->set_owner (owner); } +static inline void +remove_ob (object *op) +{ + op->remove (); +} + #define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2))) typedef struct oblnk