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.143 by root, Thu Aug 16 06:36:56 2007 UTC vs.
Revision 1.145 by root, Sat Aug 25 22:19:26 2007 UTC

383 383
384 // temporary: wether the object can be saved in a map file 384 // temporary: wether the object can be saved in a map file
385 // contr => is a player 385 // contr => is a player
386 // head => only save head of a multitile object 386 // head => only save head of a multitile object
387 // owner => can not reference owner yet 387 // owner => can not reference owner yet
388 MTH bool can_map_save () const { return !contr && !head && !owner && !flag [FLAG_NO_MAP_SAVE]; } 388 MTH bool can_map_save () const { return !head && (!owner || owner->contr) && !contr && !flag [FLAG_NO_MAP_SAVE]; }
389 389
390 /* This return true if object has still randomitems which 390 /* This return true if object has still randomitems which
391 * could be expanded. 391 * could be expanded.
392 */ 392 */
393 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 393 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
494 } 494 }
495 495
496 MTH struct region *region () const; 496 MTH struct region *region () const;
497 497
498 void statusmsg (const char *msg, int color = NDI_BLACK); 498 void statusmsg (const char *msg, int color = NDI_BLACK);
499 void errormsg (const char *msg, int color = NDI_RED); 499 void failmsg (const char *msg, int color = NDI_RED);
500 500
501protected: 501protected:
502 void link (); 502 void link ();
503 void unlink (); 503 void unlink ();
504 504

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines