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.88 by root, Thu Jan 18 16:19:34 2007 UTC

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