ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.84 by root, Tue May 22 10:49:58 2007 UTC vs.
Revision 1.85 by root, Sat May 26 15:44:02 2007 UTC

517 517
518next: ; 518next: ;
519 } 519 }
520} 520}
521 521
522#define GET_FLAG(op,flag) \ 522#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
523 if (f.get_sint32 ()) \
524 SET_FLAG (op, flag); \
525 else \
526 CLEAR_FLAG (op, flag) \
527 523
528bool 524bool
529object::parse_kv (object_thawer &f) 525object::parse_kv (object_thawer &f)
530{ 526{
531 object *op_inv = inv; 527 object *op_inv = inv;
777 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 773 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
778 774
779 break; 775 break;
780 776
781 case KW_friendly: 777 case KW_friendly:
782 if (f.get_sint32 ()) 778 if (f.get_bool ())
783 if (type != PLAYER) 779 if (type != PLAYER)
784 add_friendly_object (this); 780 add_friendly_object (this);
785 781
786 break; 782 break;
787 783

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines