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.59 by root, Wed Dec 6 13:59:00 2006 UTC vs.
Revision 1.68 by root, Mon Dec 18 02:35:00 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: %lld\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)
… …
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
223 /* the 0x400000 on flags2 is FLAG_INV_LOCK. I don't think something 227 if ((ob1->flags ^ ob2->flags).reset (FLAG_INV_LOCKED).reset (FLAG_CLIENT_SENT).any ()
224 * being locked in inventory should prevent merging. 228 || ob1->arch != ob2->arch
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) || 229 || ob1->name != ob2->name
233 (ob1->title != ob2->title) || 230 || ob1->title != ob2->title
234 (ob1->msg != ob2->msg) || 231 || ob1->msg != ob2->msg
235 (ob1->weight != ob2->weight) || 232 || ob1->weight != ob2->weight
236 (memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist)) != 0) || 233 || memcmp (&ob1->resist, &ob2->resist, sizeof (ob1->resist))
237 (memcmp (&ob1->stats, &ob2->stats, sizeof (ob1->stats)) != 0) || 234 || memcmp (&ob1->stats , &ob2->stats , sizeof (ob1->stats) )
238 (ob1->attacktype != ob2->attacktype) || 235 || ob1->attacktype != ob2->attacktype
239 (ob1->magic != ob2->magic) || 236 || ob1->magic != ob2->magic
240 (ob1->slaying != ob2->slaying) || 237 || ob1->slaying != ob2->slaying
241 (ob1->skill != ob2->skill) || 238 || ob1->skill != ob2->skill
242 (ob1->value != ob2->value) || 239 || ob1->value != ob2->value
243 (ob1->animation_id != ob2->animation_id) || 240 || ob1->animation_id != ob2->animation_id
244 (ob1->client_type != ob2->client_type) || 241 || ob1->client_type != ob2->client_type
245 (ob1->materialname != ob2->materialname) || 242 || ob1->materialname != ob2->materialname
246 (ob1->lore != ob2->lore) || 243 || ob1->lore != ob2->lore
247 (ob1->subtype != ob2->subtype) || 244 || ob1->subtype != ob2->subtype
248 (ob1->move_type != ob2->move_type) || 245 || ob1->move_type != ob2->move_type
249 (ob1->move_block != ob2->move_block) || 246 || ob1->move_block != ob2->move_block
250 (ob1->move_allow != ob2->move_allow) || 247 || ob1->move_allow != ob2->move_allow
251 (ob1->move_on != ob2->move_on) || 248 || 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)) 249 || ob1->move_off != ob2->move_off
250 || ob1->move_slow != ob2->move_slow
251 || ob1->move_slow_penalty != ob2->move_slow_penalty)
253 return 0; 252 return 0;
254 253
255 /* This is really a spellbook check - really, we should 254 /* This is really a spellbook check - really, we should
256 * check all objects in the inventory. 255 * check all objects in the inventory.
257 */ 256 */
… …
260 /* if one object has inventory but the other doesn't, not equiv */ 259 /* if one object has inventory but the other doesn't, not equiv */
261 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv)) 260 if ((ob1->inv && !ob2->inv) || (ob2->inv && !ob1->inv))
262 return 0; 261 return 0;
263 262
264 /* Now check to see if the two inventory objects could merge */ 263 /* Now check to see if the two inventory objects could merge */
265 if (!CAN_MERGE (ob1->inv, ob2->inv)) 264 if (!object::can_merge (ob1->inv, ob2->inv))
266 return 0; 265 return 0;
267 266
268 /* inventory ok - still need to check rest of this object to see 267 /* inventory ok - still need to check rest of this object to see
269 * if it is valid. 268 * if it is valid.
270 */ 269 */
… …
526 525
527 if (settings.casting_time) 526 if (settings.casting_time)
528 casting_time = -1; 527 casting_time = -1;
529} 528}
530 529
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/* 530/*
541 * copy object first frees everything allocated by the second object, 531 * copy_to first frees everything allocated by the dst object,
542 * and then copies the contends of the first object into the second 532 * and then copies the contents of itself into the second
543 * object, allocating what needs to be allocated. Basically, any 533 * object, allocating what needs to be allocated. Basically, any
544 * data that is malloc'd needs to be re-malloc/copied. Otherwise, 534 * 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 535 * if the first object is freed, the pointers in the new object
546 * will point at garbage. 536 * will point at garbage.
547 */ 537 */
548void 538void
549copy_object (object *op2, object *op) 539object::copy_to (object *dst)
550{ 540{
551 bool is_freed = QUERY_FLAG (op, FLAG_FREED); 541 bool is_freed = QUERY_FLAG (dst, FLAG_FREED);
552 bool is_removed = QUERY_FLAG (op, FLAG_REMOVED); 542 bool is_removed = QUERY_FLAG (dst, FLAG_REMOVED);
553 543
554 op2->clone (op); 544 *(object_copy *)dst = *this;
545 *(object_pod *)dst = *this;
546
547 if (self || cb)
548 INVOKE_OBJECT (CLONE, this, ARG_OBJECT (dst));
555 549
556 if (is_freed) 550 if (is_freed)
557 SET_FLAG (op, FLAG_FREED); 551 SET_FLAG (dst, FLAG_FREED);
558 552
559 if (is_removed) 553 if (is_removed)
560 SET_FLAG (op, FLAG_REMOVED); 554 SET_FLAG (dst, FLAG_REMOVED);
561 555
562 if (op2->speed < 0) 556 if (speed < 0)
563 op->speed_left = op2->speed_left - RANDOM () % 200 / 100.0; 557 dst->speed_left = speed_left - RANDOM () % 200 / 100.0;
564 558
565 /* Copy over key_values, if any. */ 559 /* Copy over key_values, if any. */
566 if (op2->key_values) 560 if (key_values)
567 { 561 {
568 key_value *tail = 0; 562 key_value *tail = 0;
569 key_value *i; 563 key_value *i;
570 564
571 op->key_values = 0; 565 dst->key_values = 0;
572 566
573 for (i = op2->key_values; i; i = i->next) 567 for (i = key_values; i; i = i->next)
574 { 568 {
575 key_value *new_link = new key_value; 569 key_value *new_link = new key_value;
576 570
577 new_link->next = 0; 571 new_link->next = 0;
578 new_link->key = i->key; 572 new_link->key = i->key;
579 new_link->value = i->value; 573 new_link->value = i->value;
580 574
581 /* Try and be clever here, too. */ 575 /* Try and be clever here, too. */
582 if (!op->key_values) 576 if (!dst->key_values)
583 { 577 {
584 op->key_values = new_link; 578 dst->key_values = new_link;
585 tail = new_link; 579 tail = new_link;
586 } 580 }
587 else 581 else
588 { 582 {
589 tail->next = new_link; 583 tail->next = new_link;
590 tail = new_link; 584 tail = new_link;
591 } 585 }
592 } 586 }
593 } 587 }
594 588
595 update_ob_speed (op); 589 update_ob_speed (dst);
590}
591
592object *
593object::clone ()
594{
595 object *neu = create ();
596 copy_to (neu);
597 return neu;
596} 598}
597 599
598/* 600/*
599 * If an object with the IS_TURNABLE() flag needs to be turned due 601 * 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 602 * to the closest player being on the other side, this function can
… …
909 911
910 if (QUERY_FLAG (this, FLAG_FRIENDLY)) 912 if (QUERY_FLAG (this, FLAG_FRIENDLY))
911 remove_friendly_object (this); 913 remove_friendly_object (this);
912 914
913 if (!QUERY_FLAG (this, FLAG_REMOVED)) 915 if (!QUERY_FLAG (this, FLAG_REMOVED))
914 remove_ob (this); 916 remove ();
915 917
916 SET_FLAG (this, FLAG_FREED); 918 SET_FLAG (this, FLAG_FREED);
917 919
918 if (more) 920 if (more)
919 { 921 {
… …
944 946
945 while (op) 947 while (op)
946 { 948 {
947 object *tmp = op->below; 949 object *tmp = op->below;
948 950
949 remove_ob (op); 951 op->remove ();
950 952
951 if (QUERY_FLAG (op, FLAG_STARTEQUIP) 953 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)) 954 || QUERY_FLAG (op, FLAG_NO_DROP) || op->type == RUNE || op->type == TRAP || QUERY_FLAG (op, FLAG_IS_A_TEMPLATE))
953 free_object (op); 955 op->destroy ();
954 else 956 else
955 { 957 {
956 op->x = x; 958 op->x = x;
957 op->y = y; 959 op->y = y;
958 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */ 960 insert_ob_in_map (op, map, 0, 0); /* Insert in same map as the envir */
… …
1015 op->carrying -= weight; 1017 op->carrying -= weight;
1016 op = op->env; 1018 op = op->env;
1017 } 1019 }
1018} 1020}
1019 1021
1020/* remove_ob(op): 1022/* op->remove ():
1021 * This function removes the object op from the linked list of objects 1023 * 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 1024 * which it is currently tied to. When this function is done, the
1023 * object will have no environment. If the object previously had an 1025 * object will have no environment. If the object previously had an
1024 * environment, the x and y coordinates will be updated to 1026 * environment, the x and y coordinates will be updated to
1025 * the previous environment. 1027 * the previous environment.
… …
1135 { 1137 {
1136 CLEAR_FLAG (this, FLAG_APPLIED); 1138 CLEAR_FLAG (this, FLAG_APPLIED);
1137 tmp->container = 0; 1139 tmp->container = 0;
1138 } 1140 }
1139 1141
1140 tmp->contr->socket.update_look = 1; 1142 tmp->contr->socket->update_look = 1;
1141 } 1143 }
1142 1144
1143 /* See if player moving off should effect something */ 1145 /* See if player moving off should effect something */
1144 if (check_walk_off 1146 if (check_walk_off
1145 && ((move_type & tmp->move_off) 1147 && ((move_type & tmp->move_off)
… …
1197 1199
1198 for (; top != NULL; top = top->below) 1200 for (; top != NULL; top = top->below)
1199 { 1201 {
1200 if (top == op) 1202 if (top == op)
1201 continue; 1203 continue;
1202 if (CAN_MERGE (op, top)) 1204
1205 if (object::can_merge (op, top))
1203 { 1206 {
1204 top->nrof += op->nrof; 1207 top->nrof += op->nrof;
1205 1208
1206/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/ 1209/* CLEAR_FLAG(top,FLAG_STARTEQUIP);*/
1207 op->weight = 0; /* Don't want any adjustements now */ 1210 op->weight = 0; /* Don't want any adjustements now */
1208 remove_ob (op); 1211 op->destroy ();
1209 free_object (op);
1210 return top; 1212 return top;
1211 } 1213 }
1212 } 1214 }
1213 1215
1214 return 0; 1216 return 0;
… …
1341 1343
1342 /* this has to be done after we translate the coordinates. 1344 /* this has to be done after we translate the coordinates.
1343 */ 1345 */
1344 if (op->nrof && !(flag & INS_NO_MERGE)) 1346 if (op->nrof && !(flag & INS_NO_MERGE))
1345 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above) 1347 for (tmp = GET_MAP_OB (op->map, x, y); tmp != NULL; tmp = tmp->above)
1346 if (CAN_MERGE (op, tmp)) 1348 if (object::can_merge (op, tmp))
1347 { 1349 {
1348 op->nrof += tmp->nrof; 1350 op->nrof += tmp->nrof;
1349 remove_ob (tmp); 1351 tmp->destroy ();
1350 free_object (tmp);
1351 } 1352 }
1352 1353
1353 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */ 1354 CLEAR_FLAG (op, FLAG_APPLIED); /* hack for fixing F_APPLIED in items of dead people */
1354 CLEAR_FLAG (op, FLAG_INV_LOCKED); 1355 CLEAR_FLAG (op, FLAG_INV_LOCKED);
1355 1356
… …
1483 * it, so save a few ticks and start from there. 1484 * it, so save a few ticks and start from there.
1484 */ 1485 */
1485 if (!(flag & INS_MAP_LOAD)) 1486 if (!(flag & INS_MAP_LOAD))
1486 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1487 for (tmp = floor ? floor : GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above)
1487 if (tmp->type == PLAYER) 1488 if (tmp->type == PLAYER)
1488 tmp->contr->socket.update_look = 1; 1489 tmp->contr->socket->update_look = 1;
1489 1490
1490 /* If this object glows, it may affect lighting conditions that are 1491 /* If this object glows, it may affect lighting conditions that are
1491 * visible to others on this map. But update_all_los is really 1492 * 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 1493 * 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 1494 * on the map will get recalculated. The players could very well
… …
1541 tmp1; 1542 tmp1;
1542 1543
1543 /* first search for itself and remove any old instances */ 1544 /* first search for itself and remove any old instances */
1544 1545
1545 for (tmp = GET_MAP_OB (op->map, op->x, op->y); tmp != NULL; tmp = tmp->above) 1546 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 */ 1547 if (!strcmp (tmp->arch->name, arch_string)) /* same archetype */
1548 { 1548 tmp->destroy ();
1549 remove_ob (tmp);
1550 free_object (tmp);
1551 }
1552 }
1553 1549
1554 tmp1 = arch_to_object (archetype::find (arch_string)); 1550 tmp1 = arch_to_object (archetype::find (arch_string));
1555 1551
1556 tmp1->x = op->x; 1552 tmp1->x = op->x;
1557 tmp1->y = op->y; 1553 tmp1->y = op->y;
… …
1567 */ 1563 */
1568 1564
1569object * 1565object *
1570get_split_ob (object *orig_ob, uint32 nr) 1566get_split_ob (object *orig_ob, uint32 nr)
1571{ 1567{
1572 object * 1568 object *newob;
1573 newob;
1574 int
1575 is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0); 1569 int is_removed = (QUERY_FLAG (orig_ob, FLAG_REMOVED) != 0);
1576 1570
1577 if (orig_ob->nrof < nr) 1571 if (orig_ob->nrof < nr)
1578 { 1572 {
1579 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name); 1573 sprintf (errmsg, "There are only %d %ss.", orig_ob->nrof ? orig_ob->nrof : 1, &orig_ob->name);
1580 return NULL; 1574 return NULL;
1581 } 1575 }
1582 1576
1583 newob = object_create_clone (orig_ob); 1577 newob = object_create_clone (orig_ob);
1584 1578
1585 if ((orig_ob->nrof -= nr) < 1) 1579 if ((orig_ob->nrof -= nr) < 1)
1586 { 1580 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) 1581 else if (!is_removed)
1592 { 1582 {
1593 if (orig_ob->env != NULL) 1583 if (orig_ob->env != NULL)
1594 sub_weight (orig_ob->env, orig_ob->weight * nr); 1584 sub_weight (orig_ob->env, orig_ob->weight * nr);
1595 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY) 1585 if (orig_ob->env == NULL && orig_ob->map->in_memory != MAP_IN_MEMORY)
… …
1659 esrv_send_item (tmp, op); 1649 esrv_send_item (tmp, op);
1660 } 1650 }
1661 } 1651 }
1662 else 1652 else
1663 { 1653 {
1664 remove_ob (op); 1654 op->remove ();
1665 op->nrof = 0; 1655 op->nrof = 0;
1666 if (tmp) 1656 if (tmp)
1667 { 1657 {
1668 esrv_del_item (tmp->contr, op->count); 1658 esrv_del_item (tmp->contr, op->count);
1669 } 1659 }
… …
1675 1665
1676 if (i < op->nrof) 1666 if (i < op->nrof)
1677 op->nrof -= i; 1667 op->nrof -= i;
1678 else 1668 else
1679 { 1669 {
1680 remove_ob (op); 1670 op->remove ();
1681 op->nrof = 0; 1671 op->nrof = 0;
1682 } 1672 }
1683 1673
1684 /* Since we just removed op, op->above is null */ 1674 /* Since we just removed op, op->above is null */
1685 for (tmp = above; tmp != NULL; tmp = tmp->above) 1675 for (tmp = above; tmp != NULL; tmp = tmp->above)
… …
1694 1684
1695 if (op->nrof) 1685 if (op->nrof)
1696 return op; 1686 return op;
1697 else 1687 else
1698 { 1688 {
1699 free_object (op); 1689 op->destroy ();
1700 return NULL; 1690 return NULL;
1701 } 1691 }
1702} 1692}
1703 1693
1704/* 1694/*
… …
1765 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL); 1755 CLEAR_FLAG (op, FLAG_OBJ_ORIGINAL);
1766 CLEAR_FLAG (op, FLAG_REMOVED); 1756 CLEAR_FLAG (op, FLAG_REMOVED);
1767 if (op->nrof) 1757 if (op->nrof)
1768 { 1758 {
1769 for (tmp = inv; tmp != NULL; tmp = tmp->below) 1759 for (tmp = inv; tmp != NULL; tmp = tmp->below)
1770 if (CAN_MERGE (tmp, op)) 1760 if (object::can_merge (tmp, op))
1771 { 1761 {
1772 /* return the original object and remove inserted object 1762 /* return the original object and remove inserted object
1773 (client needs the original object) */ 1763 (client needs the original object) */
1774 tmp->nrof += op->nrof; 1764 tmp->nrof += op->nrof;
1775 /* Weight handling gets pretty funky. Since we are adding to 1765 /* Weight handling gets pretty funky. Since we are adding to
… …
2524 * create clone from object to another 2514 * create clone from object to another
2525 */ 2515 */
2526object * 2516object *
2527object_create_clone (object *asrc) 2517object_create_clone (object *asrc)
2528{ 2518{
2529 object *
2530 dst = NULL, *tmp, *src, *part, *prev, *item; 2519 object *dst = 0, *tmp, *src, *part, *prev, *item;
2531 2520
2532 if (!asrc) 2521 if (!asrc)
2533 return NULL; 2522 return 0;
2523
2534 src = asrc; 2524 src = asrc;
2535 if (src->head) 2525 if (src->head)
2536 src = src->head; 2526 src = src->head;
2537 2527
2538 prev = NULL; 2528 prev = 0;
2539 for (part = src; part; part = part->more) 2529 for (part = src; part; part = part->more)
2540 { 2530 {
2541 tmp = get_object (); 2531 tmp = part->clone ();
2542 copy_object (part, tmp);
2543 tmp->x -= src->x; 2532 tmp->x -= src->x;
2544 tmp->y -= src->y; 2533 tmp->y -= src->y;
2534
2545 if (!part->head) 2535 if (!part->head)
2546 { 2536 {
2547 dst = tmp; 2537 dst = tmp;
2548 tmp->head = NULL; 2538 tmp->head = 0;
2549 } 2539 }
2550 else 2540 else
2551 { 2541 {
2552 tmp->head = dst; 2542 tmp->head = dst;
2553 } 2543 }
2544
2554 tmp->more = NULL; 2545 tmp->more = 0;
2546
2555 if (prev) 2547 if (prev)
2556 prev->more = tmp; 2548 prev->more = tmp;
2549
2557 prev = tmp; 2550 prev = tmp;
2558 } 2551 }
2559 2552
2560 for (item = src->inv; item; item = item->below) 2553 for (item = src->inv; item; item = item->below)
2561 insert_ob_in_ob (object_create_clone (item), dst); 2554 insert_ob_in_ob (object_create_clone (item), dst);
… …
2587 } 2580 }
2588 2581
2589 fprintf (tempfile, obstr); 2582 fprintf (tempfile, obstr);
2590 fclose (tempfile); 2583 fclose (tempfile);
2591 2584
2592 op = get_object (); 2585 op = object::create ();
2593 2586
2594 object_thawer thawer (filename); 2587 object_thawer thawer (filename);
2595 2588
2596 if (thawer) 2589 if (thawer)
2597 load_object (thawer, op, 0); 2590 load_object (thawer, op, 0);

Diff Legend

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