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.208 by root, Sat Oct 3 18:46:26 2009 UTC vs.
Revision 1.209 by sf-marcmagus, Sun Oct 11 01:35:52 2009 UTC

521 /* This return true if object has still randomitems which 521 /* This return true if object has still randomitems which
522 * could be expanded. 522 * could be expanded.
523 */ 523 */
524 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; } 524 MTH bool has_random_items () const { return randomitems && !flag [FLAG_IS_A_TEMPLATE]; }
525 525
526 MTH bool has_dialogue () const { return *&msg == '@'; } 526 static bool msg_has_dialogue (const char *msg) { return *msg == '@'; }
527
528 MTH bool has_dialogue () const { return msg_has_dialogue (&msg); }
527 529
528 // returns the outermost owner, never returns 0 530 // returns the outermost owner, never returns 0
529 MTH object *outer_owner () 531 MTH object *outer_owner ()
530 { 532 {
531 object *op; 533 object *op;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines