| … | |
… | |
| 540 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
540 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
| 541 | |
541 | |
| 542 | case KW_arch: |
542 | case KW_arch: |
| 543 | { |
543 | { |
| 544 | const char *str = thawer.get_str (); |
544 | const char *str = thawer.get_str (); |
| 545 | fprintf (stderr, "arch %s\n", str);//D |
|
|
| 546 | |
545 | |
| 547 | if (op->arch) |
546 | if (op->arch) |
| 548 | { |
547 | { |
| 549 | /* If op->arch has been set, then this new object |
548 | /* If op->arch has been set, then this new object |
| 550 | * must be part of the inventory. So process |
549 | * must be part of the inventory. So process |
| … | |
… | |
| 990 | case KW_msg: |
989 | case KW_msg: |
| 991 | thawer.get_ml (KW_endmsg, op->msg); |
990 | thawer.get_ml (KW_endmsg, op->msg); |
| 992 | //TODO: allow longer messages |
991 | //TODO: allow longer messages |
| 993 | if (strlen (op->msg) >= HUGE_BUF) |
992 | if (strlen (op->msg) >= HUGE_BUF) |
| 994 | { |
993 | { |
| 995 | 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); |
| 996 | op->msg = "ERROR, please report: string too long, winged.\n"; |
995 | op->msg = "ERROR, please report: string too long, winged.\n"; |
| 997 | } |
996 | } |
| 998 | break; |
997 | break; |
| 999 | |
998 | |
| 1000 | case KW_lore: |
999 | case KW_lore: |
| … | |
… | |
| 1002 | //TODO: allow longer messages |
1001 | //TODO: allow longer messages |
| 1003 | /* Just print a warning so we can be reasonably safe |
1002 | /* Just print a warning so we can be reasonably safe |
| 1004 | * about not overflowing the buffer. |
1003 | * about not overflowing the buffer. |
| 1005 | */ |
1004 | */ |
| 1006 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1005 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
| 1007 | 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", |
| 1008 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1007 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
| 1009 | break; |
1008 | break; |
| 1010 | |
1009 | |
| 1011 | case KW_editable: |
1010 | case KW_editable: |
| 1012 | case KW_editor_folder: |
1011 | case KW_editor_folder: |
| … | |
… | |
| 1058 | * |
1057 | * |
| 1059 | */ |
1058 | */ |
| 1060 | int |
1059 | int |
| 1061 | load_object (object_thawer &fp, object *op, int map_flags) |
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1062 | { |
1061 | { |
| 1063 | // cede every 500 objects loaded |
1062 | coroapi::cede_every (1000); // cede once in a while |
| 1064 | { |
|
|
| 1065 | static int cede_counter = 0; |
|
|
| 1066 | |
|
|
| 1067 | if (++cede_counter >= 500) |
|
|
| 1068 | { |
|
|
| 1069 | cede_counter = 0; |
|
|
| 1070 | if (coroapi::nready ()) |
|
|
| 1071 | coroapi::cede (); |
|
|
| 1072 | } |
|
|
| 1073 | } |
|
|
| 1074 | |
1063 | |
| 1075 | return parse_object (op, fp, map_flags); |
1064 | return parse_object (op, fp, map_flags); |
| 1076 | } |
1065 | } |
| 1077 | |
1066 | |
| 1078 | /* 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 |
