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.130 by root, Mon Jun 4 13:04:00 2007 UTC vs.
Revision 1.134 by root, Sun Jun 24 00:33:54 2007 UTC

… …
246 // These variables are not changed by ->copy_to 246 // These variables are not changed by ->copy_to
247 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ 247 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */
248 248
249 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 249 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
250 int ACC (RO, count); 250 int ACC (RO, count);
251 int ACC (RO, index); // index into objects 251 object_vector_index ACC (RO, index); // index into objects
252 int ACC (RO, active); // index into actives 252 object_vector_index ACC (RO, active); // index into actives
253 253
254 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */ 254 player_ptr ACC (RW, contr); /* Pointer to the player which control this object */
255 255
256 object *ACC (RW, below); /* Pointer to the object stacked below this one */ 256 object *ACC (RW, below); /* Pointer to the object stacked below this one */
257 object *ACC (RW, above); /* Pointer to the object stacked above this one */ 257 object *ACC (RW, above); /* Pointer to the object stacked above this one */
… …
553 static archetype *find (const char *name); 553 static archetype *find (const char *name);
554 554
555 void link (); 555 void link ();
556 void unlink (); 556 void unlink ();
557 557
558 int ACC (RW, archid); // index in archvector 558 object_vector_index ACC (RW, archid); // index in archvector
559 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */ 559 shstr ACC (RW, archname); /* More definite name, like "generate_kobold" */
560 bool ACC (RW, stub); // if true, this is an invalid archetype 560 bool ACC (RW, stub); // if true, this is an invalid archetype
561 struct archetype *ACC (RW, next); /* Next archetype in a linked list */
562 struct archetype *ACC (RW, head); /* The main part of a linked object */
563 struct archetype *ACC (RW, more); /* Next part of a linked object */
564 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */ 561 uint32 ACC (RW, editable); /* editable flags (mainly for editor) */
565 562
566 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */ 563 sint8 ACC (RW, min_x), ACC (RW, min_y); /* extents, compared to the head (min_x, min_y should be zero, but aren't...) */
567 sint8 ACC (RW, max_x), ACC (RW, max_y); 564 sint8 ACC (RW, max_x), ACC (RW, max_y);
568}; 565};
566
567inline void
568object_freezer::put (keyword k, archetype *v)
569{
570 put (k, v ? &v->archname : (const char *)0);
571}
569 572
570typedef object_vector<object, &object::index > objectvec; 573typedef object_vector<object, &object::index > objectvec;
571typedef object_vector<object, &object::active> activevec; 574typedef object_vector<object, &object::active> activevec;
572typedef object_vector<archetype, &archetype::archid> archvec; 575typedef object_vector<archetype, &archetype::archid> archvec;
573 576
… …
627#define INS_NO_WALK_ON 0x0004 630#define INS_NO_WALK_ON 0x0004
628#define INS_ON_TOP 0x0008 631#define INS_ON_TOP 0x0008
629#define INS_BELOW_ORIGINATOR 0x0010 632#define INS_BELOW_ORIGINATOR 0x0010
630#define INS_MAP_LOAD 0x0020 633#define INS_MAP_LOAD 0x0020
631 634
632#define ARCH_SINGULARITY "singularity"
633#define ARCH_DETECT_MAGIC "detect_magic"
634#define ARCH_DEPLETION "depletion" 635#define ARCH_DEPLETION "depletion"
635#define ARCH_SYMPTOM "symptom"
636 636
637#endif 637#endif
638 638

Diff Legend

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