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.87 by root, Sun Jan 14 22:06:05 2007 UTC vs.
Revision 1.89 by root, Fri Jan 19 17:50:11 2007 UTC

120 object_ptr ACC (RW, spell); /* Spell that was being cast */ 120 object_ptr ACC (RW, spell); /* Spell that was being cast */
121 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */ 121 object_ptr ACC (RW, current_weapon); /* Pointer to the weapon currently used */
122 arch_ptr ACC (RW, arch); /* Pointer to archetype */ 122 arch_ptr ACC (RW, arch); /* Pointer to archetype */
123 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */ 123 arch_ptr ACC (RW, other_arch);/* Pointer used for various things - mostly used for what */
124 124
125 New_Face *ACC (RW, face); /* Face with colors */ 125 facetile *ACC (RW, face); /* Face with colors */
126 float ACC (RW, speed); /* The overall speed of this object */ 126 float ACC (RW, speed); /* The overall speed of this object */
127 float ACC (RW, speed_left); /* How much speed is left to spend this round */ 127 float ACC (RW, speed_left); /* How much speed is left to spend this round */
128 uint32 ACC (RW, nrof); /* How many of the objects */ 128 uint32 ACC (RW, nrof); /* How many of the objects */
129 129
130 /* This next big block are basically used for monsters and equipment */ 130 /* This next big block are basically used for monsters and equipment */
247 void gather_callbacks (AV *&callbacks, event_type event) const; 247 void gather_callbacks (AV *&callbacks, event_type event) const;
248 MTH void destroy (bool destroy_inventory = false); 248 MTH void destroy (bool destroy_inventory = false);
249 249
250 // recursively destroy all objects in inventory, optionally dropping them to the ground instead 250 // recursively destroy all objects in inventory, optionally dropping them to the ground instead
251 MTH void destroy_inv (bool drop_to_ground = false); 251 MTH void destroy_inv (bool drop_to_ground = false);
252 MTH void remove ();
253 MTH object *insert (object *item); // insert into inventory 252 MTH object *insert (object *item); // insert into inventory
253 void remove_slow ();
254 MTH void remove ()
255 {
256 if (!flag [FLAG_REMOVED])
257 remove_slow ();
258 }
254 259
255 static bool can_merge_slow (object *op1, object *op2); 260 static bool can_merge_slow (object *op1, object *op2);
256 261
257 // this is often used in time-critical code, so optimise 262 // this is often used in time-critical code, so optimise
258 MTH static bool can_merge (object *op1, object *op2) 263 MTH static bool can_merge (object *op1, object *op2)

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines