… | |
… | |
351 | /* inventory ok - still need to check rest of this object to see |
351 | /* inventory ok - still need to check rest of this object to see |
352 | * if it is valid. |
352 | * if it is valid. |
353 | */ |
353 | */ |
354 | } |
354 | } |
355 | |
355 | |
356 | /* Don't merge objects that are applied. With the new 'body' code, |
356 | /* Don't merge objects that are applied. With the new 'body' code, |
357 | * it is possible for most any character to have more than one of |
357 | * it is possible for most any character to have more than one of |
358 | * some items equipped, and we don't want those to merge. |
358 | * some items equipped, and we don't want those to merge. |
359 | */ |
359 | */ |
360 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
360 | if (ob1->flag [FLAG_APPLIED] || ob2->flag [FLAG_APPLIED]) |
361 | return 0; |
361 | return 0; |
362 | |
362 | |
363 | /* Note sure why the following is the case - either the object has to |
363 | /* Not sure why the following is the case - either the object has to |
364 | * be animated or have a very low speed. Is this an attempted monster |
364 | * be animated or have a very low speed. Is this an attempted monster |
365 | * check? |
365 | * check? |
366 | */ |
366 | */ |
367 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
367 | if (!ob1->flag [FLAG_ANIMATE] && ob1->has_active_speed ()) |
368 | return 0; |
368 | return 0; |
369 | |
369 | |