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.100 by root, Fri Feb 16 19:43:41 2007 UTC vs.
Revision 1.103 by root, Sun Mar 11 02:12:44 2007 UTC

121 object_ptr ACC (RW, spell); /* Spell that was being cast */ 121 object_ptr ACC (RW, spell); /* Spell that was being cast */
122 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ 122 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
123 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 123 arch_ptr ACC (RW, arch); /* Pointer to archetype */
124 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 124 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
125 125
126 facetile *ACC (RW, face); /* Face with colors */ 126 int ACC (RW, face); /* Face with colors */
127 float ACC (RW, speed); /* The overall speed of this object */ 127 float ACC (RW, speed); /* The overall speed of this object */
128 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 128 float ACC (RW, speed_left); /* How much speed is left to spend this round */
129 uint32 ACC (RW, nrof); /* How many of the objects */ 129 uint32 ACC (RW, nrof); /* How many of the objects */
130 130
131 /* This next big block are basically used for monsters and equipment */ 131 /* This next big block are basically used for monsters and equipment */
240 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */ 240 object *ACC (RW, more); /* Pointer to the rest of a large body of objects */
241 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different 241 object *head; /* Points to the main object of a large body */ // NO ACC, perl semantics are different
242 client_container *seen_by; // seen by which player/container currently? 242 client_container *seen_by; // seen by which player/container currently?
243 243
244 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all 244 bool parse_kv (object_thawer &f); // parse kv pairs, (ab-)used by archetypes, which should not exist at all
245 static object *read (object_thawer &f); 245 static object *read (object_thawer &f, maptile *map = 0); // map argument due to toal design bogosity, must go.
246 bool write (object_freezer &f); 246 bool write (object_freezer &f);
247 247
248 MTH static object *create (); 248 MTH static object *create ();
249 MTH void copy_to (object *dst); 249 MTH void copy_to (object *dst);
250 MTH object *clone (); // create + copy_to 250 MTH object *clone (); // create + copy_to
445 445
446extern objectvec objects; 446extern objectvec objects;
447extern activevec actives; 447extern activevec actives;
448 448
449#define for_all_objects(var) \ 449#define for_all_objects(var) \
450 for (int _i = 0; _i < objects.size (); ++_i) \ 450 for (unsigned _i = 0; _i < objects.size (); ++_i) \
451 declvar (object *, var, objects [_i]) 451 declvar (object *, var, objects [_i])
452 452
453#define for_all_actives(var) \ 453#define for_all_actives(var) \
454 for (int _i = 0; _i < actives.size (); ++_i) \ 454 for (unsigned _i = 0; _i < actives.size (); ++_i) \
455 declvar (object *, var, actives [_i]) 455 declvar (object *, var, actives [_i])
456 456
457typedef struct oblnk 457typedef struct oblnk
458{ /* Used to link together several objects */ 458{ /* Used to link together several objects */
459 object_ptr ob; 459 object_ptr ob;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines