| … | |
… | |
| 551 | */ |
551 | */ |
| 552 | archetype *arch = archetype::find (str); |
552 | archetype *arch = archetype::find (str); |
| 553 | |
553 | |
| 554 | object *tmp; |
554 | object *tmp; |
| 555 | |
555 | |
| 556 | if (arch != NULL) |
556 | if (arch) |
| 557 | tmp = arch_to_object (arch); |
557 | tmp = arch_to_object (arch); |
| 558 | else |
558 | else |
| 559 | { |
559 | { |
| 560 | tmp = object::create (); |
560 | tmp = object::create (); |
| 561 | /* record the name of the broken object */ |
561 | /* record the name of the broken object */ |
| … | |
… | |
| 563 | } |
563 | } |
| 564 | |
564 | |
| 565 | // decativate the object we, as we are still going |
565 | // decativate the object we, as we are still going |
| 566 | // to read the speed value. Objects should be activated |
566 | // to read the speed value. Objects should be activated |
| 567 | // when the map, object or player is completly loaded. |
567 | // when the map, object or player is completly loaded. |
| 568 | tmp->deactivate (false); |
568 | tmp->deactivate (); |
| 569 | |
569 | |
| 570 | parse_object (tmp, thawer, map_flags); |
570 | parse_object (tmp, thawer, map_flags); |
| 571 | |
571 | |
| 572 | if (tmp->arch) |
572 | if (tmp->arch) |
| 573 | { |
573 | { |
| … | |
… | |
| 606 | { |
606 | { |
| 607 | /* This is the actual archetype definition then */ |
607 | /* This is the actual archetype definition then */ |
| 608 | op->arch = archetype::find (str); |
608 | op->arch = archetype::find (str); |
| 609 | |
609 | |
| 610 | if (op->arch) |
610 | if (op->arch) |
|
|
611 | { |
| 611 | op->arch->clone.copy_to (op); |
612 | op->arch->clone.copy_to (op); |
|
|
613 | // copy_to activates, this should be fixed properly |
|
|
614 | op->deactivate (); |
|
|
615 | } |
| 612 | else if (!arch_init) |
616 | else if (!arch_init) |
| 613 | /* record the name of the broken object */ |
617 | /* record the name of the broken object */ |
| 614 | op->name = str; |
618 | op->name = str; |
| 615 | } |
619 | } |
| 616 | } |
620 | } |
| … | |
… | |
| 1054 | */ |
1058 | */ |
| 1055 | int |
1059 | int |
| 1056 | load_object (object_thawer &fp, object *op, int map_flags) |
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1057 | { |
1061 | { |
| 1058 | // cede every 500 objects loaded |
1062 | // cede every 500 objects loaded |
| 1059 | { |
1063 | coroapi::cede_every (500); |
| 1060 | static int cede_counter = 0; |
|
|
| 1061 | |
|
|
| 1062 | if (++cede_counter >= 500) |
|
|
| 1063 | { |
|
|
| 1064 | cede_counter = 0; |
|
|
| 1065 | if (coroapi::nready ()) |
|
|
| 1066 | coroapi::cede (); |
|
|
| 1067 | } |
|
|
| 1068 | } |
|
|
| 1069 | |
1064 | |
| 1070 | return parse_object (op, fp, map_flags); |
1065 | return parse_object (op, fp, map_flags); |
| 1071 | } |
1066 | } |
| 1072 | |
1067 | |
| 1073 | /* This takes a buffer, scans it for variables, and sets those variables |
1068 | /* This takes a buffer, scans it for variables, and sets those variables |
| … | |
… | |
| 1445 | * the only place this is not set is when saving the player. |
1440 | * the only place this is not set is when saving the player. |
| 1446 | */ |
1441 | */ |
| 1447 | void |
1442 | void |
| 1448 | save_object (object_freezer &fp, object *op, int flag) |
1443 | save_object (object_freezer &fp, object *op, int flag) |
| 1449 | { |
1444 | { |
|
|
1445 | // cede every 500 objects saved |
|
|
1446 | coroapi::cede_every (500); |
|
|
1447 | |
| 1450 | /* Even if the object does have an owner, it would seem that we should |
1448 | /* Even if the object does have an owner, it would seem that we should |
| 1451 | * still save it. |
1449 | * still save it. |
| 1452 | */ |
1450 | */ |
| 1453 | if (op->owner) |
1451 | if (op->owner) |
| 1454 | return; |
1452 | return; |
| … | |
… | |
| 1466 | |
1464 | |
| 1467 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1465 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1468 | save_object (fp, tmp, flag); |
1466 | save_object (fp, tmp, flag); |
| 1469 | |
1467 | |
| 1470 | fp.put (op); |
1468 | fp.put (op); |
| 1471 | fp.put (KW_end, 0); |
1469 | fp.put (KW_end); |
| 1472 | } |
1470 | } |
| 1473 | |
1471 | |
