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.42 by root, Wed Sep 27 00:36:09 2006 UTC vs.
Revision 1.43 by root, Sun Oct 15 02:16:35 2006 UTC

… …
327 327
328#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2))) 328#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
329 329
330typedef struct oblnk 330typedef struct oblnk
331{ /* Used to link together several objects */ 331{ /* Used to link together several objects */
332 object *ob; 332 object_ptr ob;
333 struct oblnk *next; 333 struct oblnk *next;
334 tag_t id;
335} objectlink; 334} objectlink;
336 335
337typedef struct oblinkpt 336typedef struct oblinkpt
338{ /* Used to link together several object links */ 337{ /* Used to link together several object links */
339 struct oblnk *link; 338 struct oblnk *link;

Diff Legend

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