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.93 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.95 by root, Mon Feb 5 01:24:45 2007 UTC

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 object *insert (object *item); // insert into inventory 252 MTH object *insert (object *item); // insert into inventory
253 void remove_slow (); 253 void do_remove ();
254 MTH void remove () 254 MTH void remove ()
255 { 255 {
256 if (!flag [FLAG_REMOVED]) 256 if (!flag [FLAG_REMOVED])
257 remove_slow (); 257 do_remove ();
258 } 258 }
259 259
260 static bool can_merge_slow (object *op1, object *op2); 260 static bool can_merge_slow (object *op1, object *op2);
261 261
262 // this is often used in time-critical code, so optimise 262 // this is often used in time-critical code, so optimise
454{ 454{
455 archetype (); 455 archetype ();
456 ~archetype (); 456 ~archetype ();
457 void gather_callbacks (AV *&callbacks, event_type event) const; 457 void gather_callbacks (AV *&callbacks, event_type event) const;
458 458
459 static archetype *find (const char *arch); 459 static archetype *find (const char *name);
460 460
461 void hash_add (); // add to hashtable 461 void hash_add (); // add to hashtable
462 void hash_del (); // remove from hashtable 462 void hash_del (); // remove from hashtable
463 463
464 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */ 464 shstr ACC (RW, name); /* More definite name, like "generate_kobold" */

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines