ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/object.C
(Generate patch)

Comparing deliantra/server/common/object.C (file contents):
Revision 1.60 by pippijn, Mon Dec 11 21:06:58 2006 UTC vs.
Revision 1.72 by elmex, Tue Dec 19 15:30:01 2006 UTC

… …
29#include <sys/types.h> 29#include <sys/types.h>
30#include <sys/uio.h> 30#include <sys/uio.h>
31#include <object.h> 31#include <object.h>
32#include <funcpoint.h> 32#include <funcpoint.h>
33#include <loader.h> 33#include <loader.h>
34
35#include <bitset>
34 36
35int nrofallocobjects = 0; 37int nrofallocobjects = 0;
36static UUID uuid; 38static UUID uuid;
37const uint64 UUID_SKIP = 1<<19; 39const uint64 UUID_SKIP = 1<<19;
38 40
… …
104 _exit (1); 106 _exit (1);
105 } 107 }
106 108
107 uuid.seq = uid; 109 uuid.seq = uid;
108 write_uuid (); 110 write_uuid ();
109 LOG (llevDebug, "read UID: %" I64_PFd "\n", uid); 111 LOG (llevDebug, "read UID: %" PRId64 "\n", uid);
110 fclose (fp); 112 fclose (fp);
111} 113}
112 114
113UUID 115UUID
114gen_uuid () 116gen_uuid ()
… …
183 * 185 *
184 * Note that this function appears a lot longer than the macro it 186 * Note that this function appears a lot longer than the macro it
185 * replaces - this is mostly for clarity - a decent compiler should hopefully 187 * replaces - this is mostly for clarity - a decent compiler should hopefully
186 * reduce this to the same efficiency. 188 * reduce this to the same efficiency.
187 * 189 *
188 * Check nrof variable *before* calling CAN_MERGE() 190 * Check nrof variable *before* calling can_merge()
189 * 191 *
190 * Improvements made with merge: Better checking on potion, and also 192 * Improvements made with merge: Better checking on potion, and also
191 * check weight 193 * check weight
192 */ 194 */
193 195
194bool object::can_merge (object *ob1, object *ob2) 196bool object::can_merge_slow (object *ob1, object *ob2)
195{ 197{
196 /* A couple quicksanity checks */ 198 /* A couple quicksanity checks */
197 if ((ob1 == ob2) || (ob1->type != ob2->type)) 199 if (ob1 == ob2
200 || ob1->type != ob2->type
201 || ob1->speed != ob2->speed
202 || ob1->value != ob2->value
203 || ob1->name != ob2->name)
198 return 0; 204 return 0;
199 205
200 if (ob1->speed != ob2->speed) 206 //TODO: this ain't working well, use nicer and correct overflow check
201 return 0;
202
203 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that 207 /* Do not merge objects if nrof would overflow. We use 1UL<<31 since that
204 * value could not be stored in a sint32 (which unfortunately sometimes is 208 * value could not be stored in a sint32 (which unfortunately sometimes is
205 * used to store nrof). 209 * used to store nrof).
206 */ 210 */
207 if (ob1->nrof + ob2->nrof >= 1UL << 31) 211 if (ob1->nrof + ob2->nrof >= 1UL << 31)
… …
217 SET_FLAG (ob1, FLAG_BEEN_APPLIED); 221 SET_FLAG (ob1, FLAG_BEEN_APPLIED);
218 222
219 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED)) 223 if (QUERY_FLAG (ob2, FLAG_IDENTIFIED))
220 SET_FLAG (ob2, FLAG_BEEN_APPLIED); 224 SET_FLAG (ob2, FLAG_BEEN_APPLIED);
221 225
222 226 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 || ob1->arch != ob2->arch
224 * being locked in inventory should prevent merging.
225 * 0x4 in flags3 is CLIENT_SENT
226 */
227 if ((ob1->arch != ob2->arch) ||
228 (ob1->flags[0] != ob2->flags[0]) ||
229 (ob1->flags[1] != ob2->flags[1]) ||
230 ((ob1->flags[2] & ~0x400000) != (ob2->flags[2] & ~0x400000)) ||
231 ((ob1->flags[3] & ~0x4) != (ob2->flags[3] & ~0x4)) ||
232 (ob1->name != ob2->name) || 228 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 229 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 230 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 231 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 232 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 233 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 234 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 235 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 236 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 237 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 238 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 239 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 240 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 241 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 242 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 243 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 244 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 245 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 246 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 247 || ob1->move_on != ob2->move_on
252 (ob1->move_off != ob2->move_off) || (ob1->move_slow != ob2->move_slow) || (ob1->move_slow_penalty != ob2->move_slow_penalty)) 248 || ob1->move_off != ob2->move_off
249 || ob1->move_slow != ob2->move_slow
250 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 251 return 0;
254 252
255 /* This is really a spellbook check - really, we should 253 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 254 * check all objects in the inventory.
257 */ 255 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 258 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 259 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 260 return 0;
263 261
264 /* Now check to see if the two inventory objects could merge */ 262 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 263 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 264 return 0;
267 265
268 /* inventory ok - still need to check rest of this object to see 266 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 267 * if it is valid.
270 */ 268 */
… …
526 524
527 if (settings.casting_time) 525 if (settings.casting_time)
528 casting_time = -1; 526 casting_time = -1;
529} 527}
530 528
531void object::clone (object *destination)
532{
533 *(object_copy *)destination = *this;
534 *(object_pod *)destination = *this;
535
536 if (self || cb)
537 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (destination));
538}
539
540/* 529/*
541 * copy object first frees everything allocated by the second object, 530 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 531 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 532 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 533 * data that is malloc'd needs to be re-malloc/copied. Otherwise,
545 * if the first object is freed, the pointers in the new object 534 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 535 * will point at garbage.
547 */ 536 */
548void 537void
549copy_object (object *op2, object *op) 538object::copy_to (object *dst)
550{ 539{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 540 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 541 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 542
554 op2->clone (op); 543 *(object_copy *)dst = *this;
544 *(object_pod *)dst = *this;
545
546 if (self || cb)
547 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 548
556 if (is_freed) 549 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 550 SET_FLAG (dst, FLAG_FREED);
558 551
559 if (is_removed) 552 if (is_removed)
560 SET_FLAG (op, FLAG_REMOVED); 553 SET_FLAG (dst, FLAG_REMOVED);
561 554
562 if (op2->speed < 0) 555 if (speed < 0)
563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 556 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
564 557
565 /* Copy over key_values, if any. */ 558 /* Copy over key_values, if any. */
566 if (op2->key_values) 559 if (key_values)
567 { 560 {
568 key_value *tail = 0; 561 key_value *tail = 0;
569 key_value *i; 562 key_value *i;
570 563
571 op->key_values = 0; 564 dst->key_values = 0;
572 565
573 for (i = op2->key_values; i; i = i->next) 566 for (i = key_values; i; i = i->next)
574 { 567 {
575 key_value *new_link = new key_value; 568 key_value *new_link = new key_value;
576 569
577 new_link->next = 0; 570 new_link->next = 0;
578 new_link->key = i->key; 571 new_link->key = i->key;
579 new_link->value = i->value; 572 new_link->value = i->value;
580 573
581 /* Try and be clever here, too. */ 574 /* Try and be clever here, too. */
582 if (!op->key_values) 575 if (!dst->key_values)
583 { 576 {
584 op->key_values = new_link; 577 dst->key_values = new_link;
585 tail = new_link; 578 tail = new_link;
586 } 579 }
587 else 580 else
588 { 581 {
589 tail->next = new_link; 582 tail->next = new_link;
590 tail = new_link; 583 tail = new_link;
591 } 584 }
592 } 585 }
593 } 586 }
594 587
595 update_ob_speed (op); 588 update_ob_speed (dst);
589}
590
591object *
592object::clone ()
593{
594 object *neu = create ();
595 copy_to (neu);
596 return neu;
596} 597}
597 598
598/* 599/*
599 * If an object with the IS_TURNABLE() flag needs to be turned due 600 * If an object with the IS_TURNABLE() flag needs to be turned due
600 * to the closest player being on the other side, this function can 601 * to the closest player being on the other side, this function can
… …
909 910
910 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 911 if (QUERY_FLAG (this, FLAG_FRIENDLY))
911 remove_friendly_object (this); 912 remove_friendly_object (this);
912 913
913 if (!QUERY_FLAG (this, FLAG_REMOVED)) 914 if (!QUERY_FLAG (this, FLAG_REMOVED))
914 remove_ob (this); 915 remove ();
915 916
916 SET_FLAG (this, FLAG_FREED); 917 SET_FLAG (this, FLAG_FREED);
917 918
918 if (more) 919 if (more)
919 { 920 {
… …
944 945
945 while (op) 946 while (op)
946 { 947 {
947 object *tmp = op->below; 948 object *tmp = op->below;
948 949
949 remove_ob (op); 950 op->remove ();
950 951
951 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 952 if (QUERY_FLAG (op, FLAG_STARTEQUIP)
952 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE)) 953 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
953 free_object (op); 954 op->destroy ();
954 else 955 else
955 { 956 {
956 op->x = x; 957 op->x = x;
957 op->y = y; 958 op->y = y;
958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 959 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1015 op->carrying -= weight; 1016 op->carrying -= weight;
1016 op = op->env; 1017 op = op->env;
1017 } 1018 }
1018} 1019}
1019 1020
1020/* remove_ob(op): 1021/* op->remove ():
1021 * This function removes the object op from the linked list of objects 1022 * This function removes the object op from the linked list of objects
1022 * which it is currently tied to. When this function is done, the 1023 * which it is currently tied to. When this function is done, the
1023 * object will have no environment. If the object previously had an 1024 * object will have no environment. If the object previously had an
1024 * environment, the x and y coordinates will be updated to 1025 * environment, the x and y coordinates will be updated to
1025 * the previous environment. 1026 * the previous environment.
… …
1135 { 1136 {
1136 CLEAR_FLAG (this, FLAG_APPLIED); 1137 CLEAR_FLAG (this, FLAG_APPLIED);
1137 tmp->container = 0; 1138 tmp->container = 0;
1138 } 1139 }
1139 1140
1140 tmp->contr->socket.update_look = 1; 1141 tmp->contr->socket->floorbox_update ();
1141 } 1142 }
1142 1143
1143 /* See if player moving off should effect something */ 1144 /* See if player moving off should effect something */
1144 if (check_walk_off 1145 if (check_walk_off
1145 && ((move_type & tmp->move_off) 1146 && ((move_type & tmp->move_off)
… …
1197 1198
1198 for (; top != NULL; top = top->below) 1199 for (; top != NULL; top = top->below)
1199 { 1200 {
1200 if (top == op) 1201 if (top == op)
1201 continue; 1202 continue;
1202 if (CAN_MERGE (op, top)) 1203
1204 if (object::can_merge (op, top))
1203 { 1205 {
1204 top->nrof += op->nrof; 1206 top->nrof += op->nrof;
1205 1207
1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1208/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1207 op->weight = 0; /* Don't want any adjustements now */ 1209 op->weight = 0; /* Don't want any adjustements now */
1208 remove_ob (op); 1210 op->destroy ();
1209 free_object (op);
1210 return top; 1211 return top;
1211 } 1212 }
1212 } 1213 }
1213 1214
1214 return 0; 1215 return 0;
… …
1341 1342
1342 /* this has to be done after we translate the coordinates. 1343 /* this has to be done after we translate the coordinates.
1343 */ 1344 */
1344 if (op->nrof && !(flag & INS_NO_MERGE)) 1345 if (op->nrof && !(flag & INS_NO_MERGE))
1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1346 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1346 if (CAN_MERGE (op, tmp)) 1347 if (object::can_merge (op, tmp))
1347 { 1348 {
1348 op->nrof += tmp->nrof; 1349 op->nrof += tmp->nrof;
1349 remove_ob (tmp); 1350 tmp->destroy ();
1350 free_object (tmp);
1351 } 1351 }
1352 1352
1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1354 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1354 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1355 1355
… …
1483 * it, so save a few ticks and start from there. 1483 * it, so save a few ticks and start from there.
1484 */ 1484 */
1485 if (!(flag & INS_MAP_LOAD)) 1485 if (!(flag & INS_MAP_LOAD))
1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1487 if (tmp->type == PLAYER) 1487 if (tmp->type == PLAYER)
1488 tmp->contr->socket.update_look = 1; 1488 tmp->contr->socket->floorbox_update ();
1489 1489
1490 /* If this object glows, it may affect lighting conditions that are 1490 /* If this object glows, it may affect lighting conditions that are
1491 * visible to others on this map. But update_all_los is really 1491 * visible to others on this map. But update_all_los is really
1492 * an inefficient way to do this, as it means los for all players 1492 * an inefficient way to do this, as it means los for all players
1493 * on the map will get recalculated. The players could very well 1493 * on the map will get recalculated. The players could very well
… …
1501 1501
1502 /* updates flags (blocked, alive, no magic, etc) for this map space */ 1502 /* updates flags (blocked, alive, no magic, etc) for this map space */
1503 update_object (op, UP_OBJ_INSERT); 1503 update_object (op, UP_OBJ_INSERT);
1504 1504
1505 /* Don't know if moving this to the end will break anything. However, 1505 /* Don't know if moving this to the end will break anything. However,
1506 * we want to have update_look set above before calling this. 1506 * we want to have floorbox_update called before calling this.
1507 * 1507 *
1508 * check_move_on() must be after this because code called from 1508 * check_move_on() must be after this because code called from
1509 * check_move_on() depends on correct map flags (so functions like 1509 * check_move_on() depends on correct map flags (so functions like
1510 * blocked() and wall() work properly), and these flags are updated by 1510 * blocked() and wall() work properly), and these flags are updated by
1511 * update_object(). 1511 * update_object().
… …
1541 tmp1; 1541 tmp1;
1542 1542
1543 /* first search for itself and remove any old instances */ 1543 /* first search for itself and remove any old instances */
1544 1544
1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1546 {
1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */ 1546 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548 { 1547 tmp->destroy ();
1549 remove_ob (tmp);
1550 free_object (tmp);
1551 }
1552 }
1553 1548
1554 tmp1 = arch_to_object (archetype::find (arch_string)); 1549 tmp1 = arch_to_object (archetype::find (arch_string));
1555 1550
1556 tmp1->x = op->x; 1551 tmp1->x = op->x;
1557 tmp1->y = op->y; 1552 tmp1->y = op->y;
… …
1567 */ 1562 */
1568 1563
1569object * 1564object *
1570get_split_ob (object *orig_ob, uint32 nr) 1565get_split_ob (object *orig_ob, uint32 nr)
1571{ 1566{
1572 object * 1567 object *newob;
1573 newob;
1574 int
1575 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1568 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1576 1569
1577 if (orig_ob->nrof < nr) 1570 if (orig_ob->nrof < nr)
1578 { 1571 {
1579 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1572 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1580 return NULL; 1573 return NULL;
1581 } 1574 }
1582 1575
1583 newob = object_create_clone (orig_ob); 1576 newob = object_create_clone (orig_ob);
1584 1577
1585 if ((orig_ob->nrof -= nr) < 1) 1578 if ((orig_ob->nrof -= nr) < 1)
1586 { 1579 orig_ob->destroy (1);
1587 if (!is_removed)
1588 remove_ob (orig_ob);
1589 free_object2 (orig_ob, 1);
1590 }
1591 else if (!is_removed) 1580 else if (!is_removed)
1592 { 1581 {
1593 if (orig_ob->env != NULL) 1582 if (orig_ob->env != NULL)
1594 sub_weight (orig_ob->env, orig_ob->weight * nr); 1583 sub_weight (orig_ob->env, orig_ob->weight * nr);
1595 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1584 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1659 esrv_send_item (tmp, op); 1648 esrv_send_item (tmp, op);
1660 } 1649 }
1661 } 1650 }
1662 else 1651 else
1663 { 1652 {
1664 remove_ob (op); 1653 op->remove ();
1665 op->nrof = 0; 1654 op->nrof = 0;
1666 if (tmp) 1655 if (tmp)
1667 { 1656 {
1668 esrv_del_item (tmp->contr, op->count); 1657 esrv_del_item (tmp->contr, op->count);
1669 } 1658 }
… …
1675 1664
1676 if (i < op->nrof) 1665 if (i < op->nrof)
1677 op->nrof -= i; 1666 op->nrof -= i;
1678 else 1667 else
1679 { 1668 {
1680 remove_ob (op); 1669 op->remove ();
1681 op->nrof = 0; 1670 op->nrof = 0;
1682 } 1671 }
1683 1672
1684 /* Since we just removed op, op->above is null */ 1673 /* Since we just removed op, op->above is null */
1685 for (tmp = above; tmp != NULL; tmp = tmp->above) 1674 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1694 1683
1695 if (op->nrof) 1684 if (op->nrof)
1696 return op; 1685 return op;
1697 else 1686 else
1698 { 1687 {
1699 free_object (op); 1688 op->destroy ();
1700 return NULL; 1689 return NULL;
1701 } 1690 }
1702} 1691}
1703 1692
1704/* 1693/*
… …
1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1754 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1766 CLEAR_FLAG (op, FLAG_REMOVED); 1755 CLEAR_FLAG (op, FLAG_REMOVED);
1767 if (op->nrof) 1756 if (op->nrof)
1768 { 1757 {
1769 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1758 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1770 if (CAN_MERGE (tmp, op)) 1759 if (object::can_merge (tmp, op))
1771 { 1760 {
1772 /* return the original object and remove inserted object 1761 /* return the original object and remove inserted object
1773 (client needs the original object) */ 1762 (client needs the original object) */
1774 tmp->nrof += op->nrof; 1763 tmp->nrof += op->nrof;
1775 /* Weight handling gets pretty funky. Since we are adding to 1764 /* Weight handling gets pretty funky. Since we are adding to
… …
2524 * create clone from object to another 2513 * create clone from object to another
2525 */ 2514 */
2526object * 2515object *
2527object_create_clone (object *asrc) 2516object_create_clone (object *asrc)
2528{ 2517{
2529 object *
2530 dst = NULL, *tmp, *src, *part, *prev, *item; 2518 object *dst = 0, *tmp, *src, *part, *prev, *item;
2531 2519
2532 if (!asrc) 2520 if (!asrc)
2533 return NULL; 2521 return 0;
2522
2534 src = asrc; 2523 src = asrc;
2535 if (src->head) 2524 if (src->head)
2536 src = src->head; 2525 src = src->head;
2537 2526
2538 prev = NULL; 2527 prev = 0;
2539 for (part = src; part; part = part->more) 2528 for (part = src; part; part = part->more)
2540 { 2529 {
2541 tmp = get_object (); 2530 tmp = part->clone ();
2542 copy_object (part, tmp);
2543 tmp->x -= src->x; 2531 tmp->x -= src->x;
2544 tmp->y -= src->y; 2532 tmp->y -= src->y;
2533
2545 if (!part->head) 2534 if (!part->head)
2546 { 2535 {
2547 dst = tmp; 2536 dst = tmp;
2548 tmp->head = NULL; 2537 tmp->head = 0;
2549 } 2538 }
2550 else 2539 else
2551 { 2540 {
2552 tmp->head = dst; 2541 tmp->head = dst;
2553 } 2542 }
2543
2554 tmp->more = NULL; 2544 tmp->more = 0;
2545
2555 if (prev) 2546 if (prev)
2556 prev->more = tmp; 2547 prev->more = tmp;
2548
2557 prev = tmp; 2549 prev = tmp;
2558 } 2550 }
2559 2551
2560 for (item = src->inv; item; item = item->below) 2552 for (item = src->inv; item; item = item->below)
2561 insert_ob_in_ob (object_create_clone (item), dst); 2553 insert_ob_in_ob (object_create_clone (item), dst);
… …
2587 } 2579 }
2588 2580
2589 fprintf (tempfile, obstr); 2581 fprintf (tempfile, obstr);
2590 fclose (tempfile); 2582 fclose (tempfile);
2591 2583
2592 op = get_object (); 2584 op = object::create ();
2593 2585
2594 object_thawer thawer (filename); 2586 object_thawer thawer (filename);
2595 2587
2596 if (thawer) 2588 if (thawer)
2597 load_object (thawer, op, 0); 2589 load_object (thawer, op, 0);

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines