… | |
… | |
263 | static void |
263 | static void |
264 | check_loaded_object (object *op) |
264 | check_loaded_object (object *op) |
265 | { |
265 | { |
266 | int ip; |
266 | int ip; |
267 | |
267 | |
268 | /* We do some specialized handling to handle legacy cases of name_pl. |
268 | /* We do some specialised handling to handle legacy cases of name_pl. |
269 | * If the object doesn't have a name_pl, we just use the object name - |
269 | * If the object doesn't have a name_pl, we just use the object name - |
270 | * this isn't perfect (things won't be properly pluralized), but works to |
270 | * this isn't perfect (things won't be properly pluralised), but works to |
271 | * that degree (5 heart is still quite understandable). But the case we |
271 | * that degree (5 heart is still quite understandable). But the case we |
272 | * also have to catch is if this object is not using the normal name for |
272 | * also have to catch is if this object is not using the normal name for |
273 | * the object. In that case, we also want to use the loaded name. |
273 | * the object. In that case, we also want to use the loaded name. |
274 | * Otherwise, what happens is that the the plural name will lose |
274 | * Otherwise, what happens is that the the plural name will lose |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
… | |
… | |
320 | { |
320 | { |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
322 | op->gen_sp_armour = op->last_heal; |
322 | op->gen_sp_armour = op->last_heal; |
323 | op->last_heal = 0; |
323 | op->last_heal = 0; |
324 | } |
324 | } |
325 | if (editor) |
325 | |
326 | ip = 0; |
|
|
327 | else |
|
|
328 | ip = calc_item_power (op, 0); |
326 | ip = calc_item_power (op, 0); |
329 | /* Legacy objects from before item power was in the game */ |
327 | /* Legacy objects from before item power was in the game */ |
330 | if (!op->item_power && ip) |
328 | if (!op->item_power && ip) |
331 | { |
329 | { |
332 | if (ip > 3) |
330 | if (ip > 3) |
333 | { |
331 | { |
… | |
… | |
551 | */ |
549 | */ |
552 | archetype *arch = archetype::find (str); |
550 | archetype *arch = archetype::find (str); |
553 | |
551 | |
554 | object *tmp; |
552 | object *tmp; |
555 | |
553 | |
556 | if (arch != NULL) |
554 | if (arch) |
557 | tmp = arch_to_object (arch); |
555 | tmp = arch_to_object (arch); |
558 | else |
556 | else |
559 | { |
557 | { |
560 | tmp = object::create (); |
558 | tmp = object::create (); |
561 | /* record the name of the broken object */ |
559 | /* record the name of the broken object */ |
562 | tmp->name = str; |
560 | tmp->name = str; |
563 | } |
561 | } |
|
|
562 | |
|
|
563 | // decativate the object we, as we are still going |
|
|
564 | // to read the speed value. Objects should be activated |
|
|
565 | // when the map, object or player is completly loaded. |
|
|
566 | tmp->deactivate (); |
564 | |
567 | |
565 | parse_object (tmp, thawer, map_flags); |
568 | parse_object (tmp, thawer, map_flags); |
566 | |
569 | |
567 | if (tmp->arch) |
570 | if (tmp->arch) |
568 | { |
571 | { |
… | |
… | |
601 | { |
604 | { |
602 | /* This is the actual archetype definition then */ |
605 | /* This is the actual archetype definition then */ |
603 | op->arch = archetype::find (str); |
606 | op->arch = archetype::find (str); |
604 | |
607 | |
605 | if (op->arch) |
608 | if (op->arch) |
|
|
609 | { |
606 | op->arch->clone.copy_to (op); |
610 | op->arch->clone.copy_to (op); |
|
|
611 | // copy_to activates, this should be fixed properly |
|
|
612 | op->deactivate (); |
|
|
613 | } |
607 | else if (!arch_init) |
614 | else if (!arch_init) |
608 | /* record the name of the broken object */ |
615 | /* record the name of the broken object */ |
609 | op->name = str; |
616 | op->name = str; |
610 | } |
617 | } |
611 | } |
618 | } |
… | |
… | |
980 | case KW_msg: |
987 | case KW_msg: |
981 | thawer.get_ml (KW_endmsg, op->msg); |
988 | thawer.get_ml (KW_endmsg, op->msg); |
982 | //TODO: allow longer messages |
989 | //TODO: allow longer messages |
983 | if (strlen (op->msg) >= HUGE_BUF) |
990 | if (strlen (op->msg) >= HUGE_BUF) |
984 | { |
991 | { |
985 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
992 | 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"; |
993 | op->msg = "ERROR, please report: string too long, winged.\n"; |
987 | } |
994 | } |
988 | break; |
995 | break; |
989 | |
996 | |
990 | case KW_lore: |
997 | case KW_lore: |
… | |
… | |
992 | //TODO: allow longer messages |
999 | //TODO: allow longer messages |
993 | /* Just print a warning so we can be reasonably safe |
1000 | /* Just print a warning so we can be reasonably safe |
994 | * about not overflowing the buffer. |
1001 | * about not overflowing the buffer. |
995 | */ |
1002 | */ |
996 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1003 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
997 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1004 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
998 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1005 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
999 | break; |
1006 | break; |
1000 | |
1007 | |
1001 | case KW_editable: |
1008 | case KW_editable: |
1002 | case KW_editor_folder: |
1009 | case KW_editor_folder: |
… | |
… | |
1048 | * |
1055 | * |
1049 | */ |
1056 | */ |
1050 | int |
1057 | int |
1051 | load_object (object_thawer &fp, object *op, int map_flags) |
1058 | load_object (object_thawer &fp, object *op, int map_flags) |
1052 | { |
1059 | { |
1053 | // cede every 500 objects loaded |
1060 | 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 | |
1061 | |
1065 | return parse_object (op, fp, map_flags); |
1062 | return parse_object (op, fp, map_flags); |
1066 | } |
1063 | } |
1067 | |
1064 | |
1068 | /* This takes a buffer, scans it for variables, and sets those variables |
1065 | /* This takes a buffer, scans it for variables, and sets those variables |
… | |
… | |
1461 | |
1458 | |
1462 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1459 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1463 | save_object (fp, tmp, flag); |
1460 | save_object (fp, tmp, flag); |
1464 | |
1461 | |
1465 | fp.put (op); |
1462 | fp.put (op); |
1466 | fp.put (KW_end, 0); |
1463 | fp.put (KW_end); |
1467 | } |
1464 | } |
1468 | |
1465 | |