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.41 by root, Sun Jan 7 23:10:42 2007 UTC vs.
Revision 1.42 by root, Mon Jan 8 01:19:02 2007 UTC

815 CLEAR_FLAG (op, FLAG_WIZCAST); 815 CLEAR_FLAG (op, FLAG_WIZCAST);
816 } 816 }
817 break; 817 break;
818 818
819 case KW_friendly: 819 case KW_friendly:
820 GET_FLAG (op, FLAG_FRIENDLY); 820 if (thawer.get_sint32 ())
821 //TODO: move to check_object or so 821 if (op->type != PLAYER)
822 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
823 add_friendly_object (op); 822 add_friendly_object (op);
823
824 break; 824 break;
825 825
826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 826 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 827 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 828 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines