| version 1.125 | | version 1.126 |
|---|
| | |
| /* | | /* |
| * static char *rcsid_object_c = | | * static char *rcsid_object_c = |
| * "$Id: object.c,v 1.125 2006/05/30 07:16:23 mwedel Exp $"; | | * "$Id: object.c,v 1.126 2006/06/01 20:55:54 akirschbaum Exp $"; |
| */ | | */ |
| | | |
| /* | | /* |
| | |
| SET_FLAG(ob2, FLAG_BEEN_APPLIED); | | SET_FLAG(ob2, FLAG_BEEN_APPLIED); |
| | | |
| | | |
| /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something | | |
| * being locked in inventory should prevent merging. | | |
| * 0x4 in flags3 is CLIENT_SENT | | |
| */ | | |
| if ((ob1->arch != ob2->arch) || | | if ((ob1->arch != ob2->arch) || |
| (ob1->flags[0] != ob2->flags[0]) || | | (ob1->flags[0] != ob2->flags[0]) || |
| (ob1->flags[1] != ob2->flags[1]) || | | (ob1->flags[1] != ob2->flags[1]) || |
| ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~ 0x400000)) || | | (ob1->flags[2] != ob2->flags[2]) || |
| ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || | | ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) || /* ignore CLIENT_SENT */ |
| (ob1->name != ob2->name) || | | (ob1->name != ob2->name) || |
| (ob1->title != ob2->title) || | | (ob1->title != ob2->title) || |
| (ob1->msg != ob2->msg) || | | (ob1->msg != ob2->msg) || |