| … | |
… | |
| 254 | /* This is really a spellbook check - really, we should |
254 | /* This is really a spellbook check - really, we should |
| 255 | * check all objects in the inventory. |
255 | * check all objects in the inventory. |
| 256 | */ |
256 | */ |
| 257 | if (ob1->inv || ob2->inv) |
257 | if (ob1->inv || ob2->inv) |
| 258 | { |
258 | { |
| 259 | /* if one object has inventory but the other doesn't, not equiv */ |
259 | if (!(ob1->inv && ob2->inv)) |
| 260 | if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) |
260 | return 0; /* inventories differ in length */ |
| 261 | return 0; |
|
|
| 262 | |
261 | |
| 263 | /* Now check to see if the two inventory objects could merge */ |
262 | if (ob1->inv->below || ob2->inv->below) |
|
|
263 | return 0; /* more than one object in inv */ |
|
|
264 | |
| 264 | if (!object::can_merge (ob1->inv, ob2->inv)) |
265 | if (!object::can_merge (ob1->inv, ob2->inv)) |
| 265 | return 0; |
266 | return 0; /* inventory objexts differ */ |
| 266 | |
267 | |
| 267 | /* inventory ok - still need to check rest of this object to see |
268 | /* inventory ok - still need to check rest of this object to see |
| 268 | * if it is valid. |
269 | * if it is valid. |
| 269 | */ |
270 | */ |
| 270 | } |
271 | } |
