… | |
… | |
1587 | } |
1587 | } |
1588 | else |
1588 | else |
1589 | { |
1589 | { |
1590 | decrease (nr); |
1590 | decrease (nr); |
1591 | |
1591 | |
1592 | object *op = object_create_clone (this); |
1592 | object *op = deep_clone (); |
1593 | op->nrof = nr; |
1593 | op->nrof = nr; |
1594 | return op; |
1594 | return op; |
1595 | } |
1595 | } |
1596 | } |
1596 | } |
1597 | |
1597 | |
… | |
… | |
2312 | |
2312 | |
2313 | /* |
2313 | /* |
2314 | * create clone from object to another |
2314 | * create clone from object to another |
2315 | */ |
2315 | */ |
2316 | object * |
2316 | object * |
2317 | object_create_clone (object *asrc) |
2317 | object::deep_clone () |
2318 | { |
2318 | { |
|
|
2319 | assert (("deep_clone called on non-head object", is_head ())); |
|
|
2320 | |
2319 | object *dst = 0; |
2321 | object *dst = clone (); |
2320 | |
2322 | |
2321 | if (!asrc) |
|
|
2322 | return 0; |
|
|
2323 | |
|
|
2324 | object *src = asrc->head_ (); |
|
|
2325 | |
|
|
2326 | object *prev = 0; |
2323 | object *prev = dst; |
2327 | for (object *part = src; part; part = part->more) |
2324 | for (object *part = this->more; part; part = part->more) |
2328 | { |
2325 | { |
2329 | object *tmp = part->clone (); |
2326 | object *tmp = part->clone (); |
2330 | |
|
|
2331 | tmp->x -= src->x; |
|
|
2332 | tmp->y -= src->y; |
|
|
2333 | |
|
|
2334 | if (!part->head) |
|
|
2335 | { |
|
|
2336 | dst = tmp; |
|
|
2337 | tmp->head = 0; |
|
|
2338 | } |
|
|
2339 | else |
|
|
2340 | tmp->head = dst; |
2327 | tmp->head = dst; |
2341 | |
|
|
2342 | tmp->more = 0; |
|
|
2343 | |
|
|
2344 | if (prev) |
|
|
2345 | prev->more = tmp; |
2328 | prev->more = tmp; |
2346 | |
|
|
2347 | prev = tmp; |
2329 | prev = tmp; |
2348 | } |
2330 | } |
2349 | |
2331 | |
2350 | for (object *item = src->inv; item; item = item->below) |
2332 | for (object *item = inv; item; item = item->below) |
2351 | insert_ob_in_ob (object_create_clone (item), dst); |
2333 | insert_ob_in_ob (item->deep_clone (), dst); |
2352 | |
2334 | |
2353 | return dst; |
2335 | return dst; |
2354 | } |
2336 | } |
2355 | |
2337 | |
2356 | /* This returns the first object in who's inventory that |
2338 | /* This returns the first object in who's inventory that |