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.38 by root, Thu Sep 14 21:16:12 2006 UTC vs.
Revision 1.44 by root, Fri Nov 17 19:40:54 2006 UTC

… …
80/* However, if you're keeping a pointer of some sort, you probably 80/* However, if you're keeping a pointer of some sort, you probably
81 * don't just want it copied, so you'll need to add to common/object.C, 81 * don't just want it copied, so you'll need to add to common/object.C,
82 * e.g. copy_object. 82 * e.g. copy_object.
83 */ 83 */
84 84
85typedef refptr<object> object_ptr;
86typedef refptr<archetype> arch_ptr;
87
85// these are not being copied 88// these are not being copied
86ACC_CLASS (object) 89ACC_CLASS (object)
87struct object_keep : refcounted 90struct object_keep : refcounted
88{ 91{
89 tag_t ACC (RW, count); /* Generation count for this object */ 92 tag_t ACC (RW, count); /* Generation count for this object */
90 UUID uuid; // Unique Identifier, survives saves etc. 93 UUID uuid; // Unique Identifier, survives saves etc.
91 94
92 /* These variables are not changed by copy_object() */ 95 /* These variables are not changed by copy_object() */
93 struct pl *ACC (RW, contr); /* Pointer to the player which control this object */ 96 player *ACC (RW, contr); /* Pointer to the player which control this object */
94 struct object *ACC (RW, next); /* Pointer to the next object in the free/used list */ 97 object *ACC (RW, next); /* Pointer to the next object in the free/used list */
95 struct object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */ 98 object *ACC (RW, prev); /* Pointer to the previous object in the free/used list */
96 struct object *ACC (RW, active_next); /* Next & previous object in the 'active' */ 99 object *ACC (RW, active_next); /* Next & previous object in the 'active' */
97 struct object *ACC (RW, active_prev); /* List. This is used in process_events */ 100 object *ACC (RW, active_prev); /* List. This is used in process_events */
98 /* so that the entire object list does not */ 101 /* so that the entire object list does not */
99 /* need to be gone through. */ 102 /* need to be gone through. */
100 struct object *ACC (RW, below); /* Pointer to the object stacked below this one */ 103 object *ACC (RW, below); /* Pointer to the object stacked below this one */
101 struct object *ACC (RW, above); /* Pointer to the object stacked above this one */ 104 object *ACC (RW, above); /* Pointer to the object stacked above this one */
102 /* Note: stacked in the *same* environment */ 105 /* Note: stacked in the *same* environment */
103 struct object *inv; /* Pointer to the first object in the inventory */ 106 object *inv; /* Pointer to the first object in the inventory */
104 struct object *ACC (RW, container); /* Current container being used. I think this 107 object *ACC (RW, container); /* Current container being used. I think this
105 * is only used by the player right now. 108 * is only used by the player right now.
106 */ 109 */
107 struct object *ACC (RW, env); /* Pointer to the object which is the environment. 110 object *ACC (RW, env); /* Pointer to the object which is the environment.
108 * This is typically the container that the object is in. 111 * This is typically the container that the object is in.
109 */ 112 */
110 struct object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 113 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
111 struct object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 114 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
112 struct mapstruct *ACC (RW, map); /* Pointer to the map in which this object is present */ 115 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
113}; 116};
114 117
115// these are being copied 118// these are being copied
116struct object_copy : attachable<object> 119struct object_copy : attachable<object>
117{ 120{
… …
125 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */ 128 shstr ACC (RW, msg); /* If this is a book/sign/magic mouth/etc */
126 shstr ACC (RW, lore); /* Obscure information about this object, */ 129 shstr ACC (RW, lore); /* Obscure information about this object, */
127 /* To get put into books and the like. */ 130 /* To get put into books and the like. */
128 shstr ACC (RW, materialname); /* specific material name */ 131 shstr ACC (RW, materialname); /* specific material name */
129 shstr ACC (RW, custom_name); /* Custom name assigned by player */ 132 shstr ACC (RW, custom_name); /* Custom name assigned by player */
130 refptr<object> ACC (RW, owner); /* Pointer to the object which controls this one */ 133 object_ptr ACC (RW, owner); /* Pointer to the object which controls this one */
131 refptr<object> ACC (RW, enemy); /* Monster/player to follow even if not closest */ 134 object_ptr ACC (RW, enemy); /* Monster/player to follow even if not closest */
132 refptr<object> ACC (RW, attacked_by); /* This object start to attack us! only player & monster */ 135 object_ptr ACC (RW, attacked_by); /* This object start to attack us! only player & monster */
133 refptr<object> ACC (RW, chosen_skill); /* the skill chosen to use */ 136 object_ptr ACC (RW, chosen_skill); /* the skill chosen to use */
134 refptr<object> ACC (RW, spellitem); /* Spell ability monster is choosing to use */ 137 object_ptr ACC (RW, spellitem); /* Spell ability monster is choosing to use */
135 refptr<object> ACC (RW, spell); /* Spell that was being cast */ 138 object_ptr ACC (RW, spell); /* Spell that was being cast */
136 refptr<object> ACC (RW, current_weapon); /* Pointer to the weapon currently used */ 139 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
137}; 140};
138 141
139// these are being copied and also cleared 142// these are being copied and also cleared
140struct object_pod 143struct object_pod
141{ 144{
… …
206 sint8 ACC (RW, range); /* Range of the spell */ 209 sint8 ACC (RW, range); /* Range of the spell */
207 uint8 ACC (RW, range_modifier); /* How going up in level effects range */ 210 uint8 ACC (RW, range_modifier); /* How going up in level effects range */
208 char *ACC (RW, spellarg); 211 char *ACC (RW, spellarg);
209 212
210 /* Following are values used by any object */ 213 /* Following are values used by any object */
211 struct treasureliststruct *ACC (RW, randomitems); /* Items to be generated */ 214 treasurelist *ACC (RW, randomitems); /* Items to be generated */
212 struct archetype *ACC (RW, arch); /* Pointer to archetype */ 215 arch_ptr ACC (RW, arch); /* Pointer to archetype */
213 struct archetype *ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */ 216 arch_ptr ACC (RW, other_arch); /* Pointer used for various things - mostly used for what */
214 key_value *key_values; /* Fields not explictly known by the loader. */ 217 key_value *key_values; /* Fields not explictly known by the loader. */
215 /* this objects turns into or what this object creates */ 218 /* this objects turns into or what this object creates */
216 uint32 flags[4]; /* various flags */ 219 uint32 flags[4]; /* various flags */
217 uint16 ACC (RW, animation_id); /* An index into the animation array */ 220 uint16 ACC (RW, animation_id); /* An index into the animation array */
218 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */ 221 uint8 ACC (RW, anim_speed); /* ticks between animation-frames */
… …
238 static vector active; // active objects, not yet used 241 static vector active; // active objects, not yet used
239 static vector objects; // not used yet, use first->next->... 242 static vector objects; // not used yet, use first->next->...
240 static object *first; // will be replaced by "objects" 243 static object *first; // will be replaced by "objects"
241 244
242 static object *create (); 245 static object *create ();
243 void free (bool free_inventory = false); 246 void destroy (bool destroy_inventory = false);
244 247
245 static void free_mortals (); 248 static void free_mortals ();
246 static bool can_merge (object *op1, object *op2); 249 static bool can_merge (object *op1, object *op2);
247 250
248 void clear (); 251 void clear ();
249 void clone (object *destination); 252 void clone (object *destination);
253
254 bool destroyed () { return QUERY_FLAG (this, FLAG_FREED); }
250 255
251 void instantiate () 256 void instantiate ()
252 { 257 {
253 if (!uuid.seq) // HACK 258 if (!uuid.seq) // HACK
254 uuid = gen_uuid (); 259 uuid = gen_uuid ();
… …
306 object (); 311 object ();
307 ~object (); 312 ~object ();
308}; 313};
309 314
310#define get_object() object::create () 315#define get_object() object::create ()
311#define free_object(op) (op)->free (0) 316#define free_object(op) (op)->destroy (0)
312#define free_object2(op, free_inv) (op)->free (free_inv) 317#define free_object2(op, free_inv) (op)->destroy (free_inv)
313#define clear_owner(op) (op)->owner = 0 318#define clear_owner(op) (op)->owner = 0
314#define copy_owner(op,other) (op)->owner = (other)->owner 319#define copy_owner(op,other) (op)->owner = (other)->owner
315#define get_owner(op) (op)->owner 320#define get_owner(op) (op)->owner
316#define clear_object(op) (op)->clear () 321#define clear_object(op) (op)->clear ()
317 322
… …
323 328
324#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2))) 329#define CAN_MERGE(op1,op2) ((op1)->value == (op2)->value && (op1)->name == (op2)->name && object::can_merge ((op1), (op2)))
325 330
326typedef struct oblnk 331typedef struct oblnk
327{ /* Used to link together several objects */ 332{ /* Used to link together several objects */
328 object *ob; 333 object_ptr ob;
329 struct oblnk *next; 334 struct oblnk *next;
330 tag_t id;
331} objectlink; 335} objectlink;
332 336
333typedef struct oblinkpt 337typedef struct oblinkpt
334{ /* Used to link together several object links */ 338{ /* Used to link together several object links */
335 struct oblnk *link; 339 struct oblnk *link;
… …
344 * be much left in the archetype - all it really is is a holder for the 348 * be much left in the archetype - all it really is is a holder for the
345 * object and pointers. This structure should get removed, and just replaced 349 * object and pointers. This structure should get removed, and just replaced
346 * by the object structure 350 * by the object structure
347 */ 351 */
348 352
349ACC_CLASS(archetype) 353ACC_CLASS (archetype)
350struct archetype : zero_initialised 354struct archetype : zero_initialised, refcounted
351{ 355{
352 archetype (); 356 archetype ();
353 ~archetype (); 357 ~archetype ();
354 358
355 static archetype *find (const char *arch); 359 static archetype *find (const char *arch);
360
361 void hash_add (); // add to hastable
362 void hash_del (); // remove from hashtable
356 363
357 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 364 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */
358 struct archetype *ACC (RW, next); /* Next archetype in a linked list */ 365 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
359 struct archetype *ACC (RW, head); /* The main part of a linked object */ 366 struct archetype *ACC (RW, head); /* The main part of a linked object */
360 struct archetype *ACC (RW, more); /* Next part of a linked object */ 367 struct archetype *ACC (RW, more); /* Next part of a linked object */
… …
422#define ARCH_DETECT_MAGIC "detect_magic" 429#define ARCH_DETECT_MAGIC "detect_magic"
423#define ARCH_DEPLETION "depletion" 430#define ARCH_DEPLETION "depletion"
424#define ARCH_SYMPTOM "symptom" 431#define ARCH_SYMPTOM "symptom"
425 432
426#endif 433#endif
434

Diff Legend

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