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