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.47 by root, Wed Dec 6 13:59:01 2006 UTC vs.
Revision 1.48 by root, Tue Dec 12 20:53:03 2006 UTC

… …
315 ~object (); 315 ~object ();
316}; 316};
317 317
318// compatibility functions/macros 318// compatibility functions/macros
319#define get_object() object::create () 319#define get_object() object::create ()
320#define free_object(op) (op)->destroy (0)
321#define free_object2(op, free_inv) (op)->destroy (free_inv)
322#define clear_owner(op) (op)->owner = 0 320#define clear_owner(op) (op)->owner = 0
323#define copy_owner(op,other) (op)->owner = (other)->owner 321#define copy_owner(op,other) (op)->owner = (other)->owner
324#define get_owner(op) (op)->owner 322#define get_owner(op) (op)->owner
325#define clear_object(op) (op)->clear () 323#define clear_object(op) (op)->clear ()
326 324
327static inline void 325static inline void
328set_owner (object *op, object *owner) 326set_owner (object *op, object *owner)
329{ 327{
330 op->set_owner (owner); 328 op->set_owner (owner);
331}
332
333static inline void
334remove_ob (object *op)
335{
336 op->remove ();
337} 329}
338 330
339#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2))) 331#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
340 332
341typedef struct oblnk 333typedef struct oblnk

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines