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.49 by root, Tue Dec 12 21:39:56 2006 UTC

… …
78#define WILL_APPLY_DOOR 0x08 78#define WILL_APPLY_DOOR 0x08
79#define WILL_APPLY_FOOD 0x10 79#define WILL_APPLY_FOOD 0x10
80 80
81/* However, if you're keeping a pointer of some sort, you probably 81/* However, if you're keeping a pointer of some sort, you probably
82 * don't just want it copied, so you'll need to add to common/object.C, 82 * don't just want it copied, so you'll need to add to common/object.C,
83 * e.g. copy_object. 83 * e.g. ->copy_to ()
84 */ 84 */
85 85
86typedef refptr<object> object_ptr; 86typedef refptr<object> object_ptr;
87typedef refptr<archetype> arch_ptr; 87typedef refptr<archetype> arch_ptr;
88 88
89// these are not being copied 89// these are not being copied
90ACC_CLASS (object) 90ACC_CLASS (object)
91struct object_keep : refcounted 91struct object_keep : refcounted
92{ 92{
93 /* These variables are not changed by ->copy_to */
94
93 tag_t ACC (RW, count); /* Generation count for this object */ 95 tag_t ACC (RW, count); /* Generation count for this object */
94 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 96 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
95 97
96 /* These variables are not changed by copy_object() */
97 player *ACC (RW, contr); /* Pointer to the player which control this object */ 98 player *ACC (RW, contr); /* Pointer to the player which control this object */
98 object *ACC (RW, next); /* Pointer to the next object in the free/used list */ 99 object *ACC (RW, next); /* Pointer to the next object in the free/used list */
99 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ 100 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
100 object *ACC (RW, active_next);/* Next & previous object in the 'active' */ 101 object *ACC (RW, active_next);/* Next & previous object in the 'active' */
101 object *ACC (RW, active_prev);/* List. This is used in process_events */ 102 object *ACC (RW, active_prev);/* List. This is used in process_events */
102 /* so that the entire object list does not */ 103 /* so that the entire object list does not */
103 /* need to be gone through. */ 104 /* need to be gone through. */
104 object *ACC (RW, below); /* Pointer to the object stacked below this one */ 105 object *ACC (RW, below); /* Pointer to the object stacked below this one */
105 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 106 object *ACC (RW, above); /* Pointer to the object stacked above this one */
106 /* Note: stacked in the *same* environment */ 107 /* Note: stacked in the *same* environment */
107 object *inv; /* Pointer to the first object in the inventory */ 108 object *inv; /* Pointer to the first object in the inventory */
108 object *ACC (RW, container); /* Current container being used. I think this 109 object *ACC (RW, container); /* Current container being used. I think this
109 * is only used by the player right now. 110 * is only used by the player right now.
110 */ 111 */
111 object *ACC (RW, env); /* Pointer to the object which is the environment. 112 object *ACC (RW, env); /* Pointer to the object which is the environment.
112 * This is typically the container that the object is in. 113 * This is typically the container that the object is in.
113 */ 114 */
114 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 115 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
115 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 116 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
116 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */ 117 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
117}; 118};
118 119
119// these are being copied 120// these are being copied
120struct object_copy : attachable<object> 121struct object_copy : attachable<object>
… …
242 static vector active; // active objects, not yet used 243 static vector active; // active objects, not yet used
243 static vector objects; // not used yet, use first->next->... 244 static vector objects; // not used yet, use first->next->...
244 static object *first; // will be replaced by "objects" 245 static object *first; // will be replaced by "objects"
245 246
246 static object *create (); 247 static object *create ();
248 void copy_to (object *dst);
247 void destroy (bool destroy_inventory = false); 249 void destroy (bool destroy_inventory = false);
248 void remove (); 250 void remove ();
249 object *insert (object *item); // insert into inventory 251 object *insert (object *item); // insert into inventory
250 252
251 static void free_mortals (); 253 static void free_mortals ();
252 static bool can_merge (object *op1, object *op2); 254 static bool can_merge (object *op1, object *op2);
253 255
254 void clear (); 256 void clear ();
255 void clone (object *destination);
256 257
257 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); } 258 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
258 259
259 void instantiate () 260 void instantiate ()
260 { 261 {
… …
314 object (); 315 object ();
315 ~object (); 316 ~object ();
316}; 317};
317 318
318// compatibility functions/macros 319// compatibility functions/macros
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
… …
373 365
374 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 366 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
375 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 367 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
376 struct archetype *ACC (RW, head); /* The main part of a linked object */ 368 struct archetype *ACC (RW, head); /* The main part of a linked object */
377 struct archetype *ACC (RW, more); /* Next part of a linked object */ 369 struct archetype *ACC (RW, more); /* Next part of a linked object */
378 object ACC (RO, clone); /* An object from which to do copy_object() */ 370 object ACC (RO, clone); /* An object from which to do ->copy_to () */
379 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 371 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
380 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is 372 sint8 ACC (RW, tail_x), ACC (RW, tail_y); /* Where the lower right most portion of the object is
381 * in comparison to the head. 373 * in comparison to the head.
382 */ 374 */
383}; 375};

Diff Legend

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