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

Comparing deliantra/server/common/object.C (file contents):
Revision 1.125 by root, Sat Jan 27 23:59:29 2007 UTC vs.
Revision 1.127 by elmex, Mon Jan 29 21:04:32 2007 UTC

819 819
820 if (flag [FLAG_IS_LINKED]) 820 if (flag [FLAG_IS_LINKED])
821 remove_button_link (this); 821 remove_button_link (this);
822 822
823 if (flag [FLAG_FRIENDLY]) 823 if (flag [FLAG_FRIENDLY])
824 {
824 remove_friendly_object (this); 825 remove_friendly_object (this);
826
827 if (type == GOLEM
828 && owner
829 && owner->type == PLAYER
830 && owner->contr->ranges[range_golem] == this)
831 owner->contr->ranges[range_golem] = 0;
832 }
825 833
826 if (!flag [FLAG_REMOVED]) 834 if (!flag [FLAG_REMOVED])
827 remove (); 835 remove ();
828 836
829 destroy_inv (true); 837 destroy_inv (true);
2570{ 2578{
2571 char flagdesc[512]; 2579 char flagdesc[512];
2572 char info2[256 * 4]; 2580 char info2[256 * 4];
2573 char *p = info; 2581 char *p = info;
2574 2582
2575 p += snprintf (p, 512, "{cnt:%d,uuid:<1,%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}", 2583 p += snprintf (p, 512, "{cnt:%d,uuid:<1.%" PRIx64 ">,name:\"%s\"%s%s,flags:[%s],type:%d}",
2576 count, uuid.seq, 2584 count, uuid.seq,
2577 &name, 2585 &name,
2578 title ? "\",title:\"" : "", 2586 title ? "\",title:\"" : "",
2579 title ? (const char *)title : "", 2587 title ? (const char *)title : "",
2580 flag_desc (flagdesc, 512), type); 2588 flag_desc (flagdesc, 512), type);

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines