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.89 by root, Fri Jan 19 17:50:11 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
310 310
311 // temporary: wether the object can be saved in a map file 311 // temporary: wether the object can be saved in a map file
312 // contr => is a player 312 // contr => is a player
313 // head => only save head of a multitile object 313 // head => only save head of a multitile object
314 // owner => can not reference owner yet 314 // owner => can not reference owner yet
315 MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_SAVE]; } 315 MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; }
316 316
317 /* This return true if object has still randomitems which 317 /* This return true if object has still randomitems which
318 * could be expanded. 318 * could be expanded.
319 */ 319 */
320 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 320 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
398 */ 398 */
399 MTH bool client_visible () const 399 MTH bool client_visible () const
400 { 400 {
401 return !invisible && type != PLAYER; 401 return !invisible && type != PLAYER;
402 } 402 }
403
404 MTH struct region *region () const;
403 405
404protected: 406protected:
405 friend struct archetype; 407 friend struct archetype;
406 408
407 void link (); 409 void link ();
452{ 454{
453 archetype (); 455 archetype ();
454 ~archetype (); 456 ~archetype ();
455 void gather_callbacks (AV *&callbacks, event_type event) const; 457 void gather_callbacks (AV *&callbacks, event_type event) const;
456 458
457 static archetype *find (const char *arch); 459 static archetype *find (const char *name);
458 460
459 void hash_add (); // add to hashtable 461 void hash_add (); // add to hashtable
460 void hash_del (); // remove from hashtable 462 void hash_del (); // remove from hashtable
461 463
462 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