| … | |
… | |
| 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 */ |
| 562 | tmp->name = str; |
562 | tmp->name = str; |
| 563 | } |
563 | } |
|
|
564 | |
|
|
565 | // decativate the object we, as we are still going |
|
|
566 | // to read the speed value. Objects should be activated |
|
|
567 | // when the map, object or player is completly loaded. |
|
|
568 | tmp->deactivate (); |
| 564 | |
569 | |
| 565 | parse_object (tmp, thawer, map_flags); |
570 | parse_object (tmp, thawer, map_flags); |
| 566 | |
571 | |
| 567 | if (tmp->arch) |
572 | if (tmp->arch) |
| 568 | { |
573 | { |
| … | |
… | |
| 601 | { |
606 | { |
| 602 | /* This is the actual archetype definition then */ |
607 | /* This is the actual archetype definition then */ |
| 603 | op->arch = archetype::find (str); |
608 | op->arch = archetype::find (str); |
| 604 | |
609 | |
| 605 | if (op->arch) |
610 | if (op->arch) |
|
|
611 | { |
| 606 | 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 | } |
| 607 | else if (!arch_init) |
616 | else if (!arch_init) |
| 608 | /* record the name of the broken object */ |
617 | /* record the name of the broken object */ |
| 609 | op->name = str; |
618 | op->name = str; |
| 610 | } |
619 | } |
| 611 | } |
620 | } |
| … | |
… | |
| 980 | case KW_msg: |
989 | case KW_msg: |
| 981 | thawer.get_ml (KW_endmsg, op->msg); |
990 | thawer.get_ml (KW_endmsg, op->msg); |
| 982 | //TODO: allow longer messages |
991 | //TODO: allow longer messages |
| 983 | if (strlen (op->msg) >= HUGE_BUF) |
992 | if (strlen (op->msg) >= HUGE_BUF) |
| 984 | { |
993 | { |
| 985 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
994 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
| 986 | op->msg = "ERROR, please report: string too long, winged.\n"; |
995 | op->msg = "ERROR, please report: string too long, winged.\n"; |
| 987 | } |
996 | } |
| 988 | break; |
997 | break; |
| 989 | |
998 | |
| 990 | case KW_lore: |
999 | case KW_lore: |
| … | |
… | |
| 992 | //TODO: allow longer messages |
1001 | //TODO: allow longer messages |
| 993 | /* Just print a warning so we can be reasonably safe |
1002 | /* Just print a warning so we can be reasonably safe |
| 994 | * about not overflowing the buffer. |
1003 | * about not overflowing the buffer. |
| 995 | */ |
1004 | */ |
| 996 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1005 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
| 997 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1006 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
| 998 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1007 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
| 999 | break; |
1008 | break; |
| 1000 | |
1009 | |
| 1001 | case KW_editable: |
1010 | case KW_editable: |
| 1002 | case KW_editor_folder: |
1011 | case KW_editor_folder: |
| … | |
… | |
| 1048 | * |
1057 | * |
| 1049 | */ |
1058 | */ |
| 1050 | int |
1059 | int |
| 1051 | load_object (object_thawer &fp, object *op, int map_flags) |
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1052 | { |
1061 | { |
| 1053 | // cede every 500 objects loaded |
1062 | coroapi::cede_every (1000); // cede once in a while |
| 1054 | { |
|
|
| 1055 | static int cede_counter = 0; |
|
|
| 1056 | |
|
|
| 1057 | if (++cede_counter >= 500) |
|
|
| 1058 | { |
|
|
| 1059 | cede_counter = 0; |
|
|
| 1060 | if (coroapi::nready ()) |
|
|
| 1061 | coroapi::cede (); |
|
|
| 1062 | } |
|
|
| 1063 | } |
|
|
| 1064 | |
1063 | |
| 1065 | return parse_object (op, fp, map_flags); |
1064 | return parse_object (op, fp, map_flags); |
| 1066 | } |
1065 | } |
| 1067 | |
1066 | |
| 1068 | /* This takes a buffer, scans it for variables, and sets those variables |
1067 | /* This takes a buffer, scans it for variables, and sets those variables |
| … | |
… | |
| 1461 | |
1460 | |
| 1462 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1461 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1463 | save_object (fp, tmp, flag); |
1462 | save_object (fp, tmp, flag); |
| 1464 | |
1463 | |
| 1465 | fp.put (op); |
1464 | fp.put (op); |
| 1466 | fp.put (KW_end, 0); |
1465 | fp.put (KW_end); |
| 1467 | } |
1466 | } |
| 1468 | |
1467 | |
