| … | |
… | |
| 592 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
592 | SET_FLAG (otmp, FLAG_OBJ_ORIGINAL); |
| 593 | } |
593 | } |
| 594 | } |
594 | } |
| 595 | } |
595 | } |
| 596 | |
596 | |
| 597 | free_object (op); |
597 | op->destroy (0); |
| 598 | link_multipart_objects (m); |
598 | link_multipart_objects (m); |
| 599 | } |
599 | } |
| 600 | |
600 | |
| 601 | /* This saves all the objects on the map in a non destructive fashion. |
601 | /* This saves all the objects on the map in a non destructive fashion. |
| 602 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
602 | * Modified by MSW 2001-07-01 to do in a single pass - reduces code, |
| … | |
… | |
| 1308 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
1308 | if (op->head == NULL && (QUERY_FLAG (op, FLAG_UNIQUE) || unique)) |
| 1309 | { |
1309 | { |
| 1310 | clean_object (op); |
1310 | clean_object (op); |
| 1311 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
1311 | if (QUERY_FLAG (op, FLAG_IS_LINKED)) |
| 1312 | remove_button_link (op); |
1312 | remove_button_link (op); |
| 1313 | remove_ob (op); |
1313 | op->remove (); |
| 1314 | free_object (op); |
1314 | op->destroy (0); |
| 1315 | } |
1315 | } |
| 1316 | } |
1316 | } |
| 1317 | } |
1317 | } |
| 1318 | } |
1318 | } |
| 1319 | |
1319 | |
| … | |
… | |
| 1517 | { |
1517 | { |
| 1518 | next = tmp->below; |
1518 | next = tmp->below; |
| 1519 | clean_object (tmp); |
1519 | clean_object (tmp); |
| 1520 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
1520 | if (QUERY_FLAG (tmp, FLAG_IS_LINKED)) |
| 1521 | remove_button_link (tmp); |
1521 | remove_button_link (tmp); |
| 1522 | remove_ob (tmp); |
1522 | tmp->remove (); |
| 1523 | free_object (tmp); |
1523 | tmp->destroy (0); |
| 1524 | } |
1524 | } |
| 1525 | } |
1525 | } |
| 1526 | |
1526 | |
| 1527 | /* |
1527 | /* |
| 1528 | * Remove and free all objects in the given map. |
1528 | * Remove and free all objects in the given map. |
| … | |
… | |
| 1553 | /* If the map isn't in memory, free_object will remove and |
1553 | /* If the map isn't in memory, free_object will remove and |
| 1554 | * free objects in op's inventory. So let it do the job. |
1554 | * free objects in op's inventory. So let it do the job. |
| 1555 | */ |
1555 | */ |
| 1556 | if (m->in_memory == MAP_IN_MEMORY) |
1556 | if (m->in_memory == MAP_IN_MEMORY) |
| 1557 | clean_object (op); |
1557 | clean_object (op); |
| 1558 | remove_ob (op); |
1558 | op->remove (); |
| 1559 | free_object (op); |
1559 | op->destroy (0); |
| 1560 | } |
1560 | } |
| 1561 | } |
1561 | } |
| 1562 | } |
1562 | } |
| 1563 | |
1563 | |
| 1564 | /* |
1564 | /* |
