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.179 by root, Mon Jul 14 23:57:46 2008 UTC vs.
Revision 1.183 by root, Mon Sep 29 06:32:08 2008 UTC

… …
175 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 175 arch_ptr ACC (RW, arch); /* Pointer to archetype */
176 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 176 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
177 177
178 float ACC (RW, speed); /* The overall speed of this object */ 178 float ACC (RW, speed); /* The overall speed of this object */
179 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 179 float ACC (RW, speed_left); /* How much speed is left to spend this round */
180 uint32 ACC (RW, nrof); /* How many of the objects */ 180 sint32 ACC (RW, nrof); /* How many of the objects */
181 181
182 /* This next big block is basically used for monsters and equipment */ 182 /* This next big block is basically used for monsters and equipment */
183 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */ 183 uint16 ACC (RW, client_type); /* Public type information. see doc/Developers/objects */
184 184
185 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */ 185 sint16 ACC (RW, resist[NROFATTACKS]); /* Resistance adjustments for attacks */
… …
270}; 270};
271 271
272struct object : zero_initialised, object_copy 272struct object : zero_initialised, object_copy
273{ 273{
274 // These variables are not changed by ->copy_to 274 // These variables are not changed by ->copy_to
275 maptile_ptr ACC (RW, map); /* Pointer to the map in which this object is present */ 275 maptile *ACC (RW, map); /* Pointer to the map in which this object is present */
276 276
277 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc. 277 UUID ACC (RW, uuid); // Unique Identifier, survives saves etc.
278 int ACC (RO, count); 278 int ACC (RO, count);
279 object_vector_index ACC (RO, index); // index into objects 279 object_vector_index ACC (RO, index); // index into objects
280 object_vector_index ACC (RO, active); // index into actives 280 object_vector_index ACC (RO, active); // index into actives
… …
441 * 1000 441 * 1000
442 * (type == CONTAINER ? 1000 : 1) 442 * (type == CONTAINER ? 1000 : 1)
443 / dominant_material ()->density; 443 / dominant_material ()->density;
444 } 444 }
445 445
446 MTH bool is_wiz () const { return flag [FLAG_WIZ]; }
446 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; } 447 MTH bool is_weapon () const { return type == ARROW || type == BOW || type == WEAPON; }
447 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET 448 MTH bool is_armor () const { return type == ARMOUR || type == SHIELD || type == HELMET
448 || type == CLOAK || type == BOOTS || type == GLOVES 449 || type == CLOAK || type == BOOTS || type == GLOVES
449 || type == BRACERS || type == GIRDLE; } 450 || type == BRACERS || type == GIRDLE; }
450 MTH bool is_alive () const { return (type == PLAYER 451 MTH bool is_alive () const { return (type == PLAYER
… …
472 MTH bool has_dialogue () const { return *&msg == '@'; } 473 MTH bool has_dialogue () const { return *&msg == '@'; }
473 474
474 // returns the outermost owner, never returns 0 475 // returns the outermost owner, never returns 0
475 MTH object *outer_owner () 476 MTH object *outer_owner ()
476 { 477 {
478 object *op;
479
477 for (object *op = this; ; op = op->owner) 480 for (op = this; op->owner; op = op->owner)
478 if (!op->owner) 481 ;
482
479 return op; 483 return op;
480 } 484 }
481 485
482 // returns the outermost environment, never returns 0 486 // returns the outermost environment, never returns 0
483 MTH object *outer_env () 487 MTH object *outer_env ()
484 { 488 {
489 object *op;
490
485 for (object *op = this; ; op = op->env) 491 for (op = this; op->env; op = op->env)
486 if (!op->env) 492 ;
493
487 return op; 494 return op;
488 } 495 }
489 496
490 // returns the player that has this object in his inventory, or 0 497 // returns the player that has this object in his inventory, or 0
491 // we assume the player is always the outer env 498 // we assume the player is always the outer env
492 MTH object *in_player () 499 MTH object *in_player ()

Diff Legend

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