| … | |
… | |
| 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 | } |
| … | |
… | |
| 638 | case KW_last_grace: thawer.get (op->last_grace); break; |
645 | case KW_last_grace: thawer.get (op->last_grace); break; |
| 639 | case KW_last_eat: thawer.get (op->last_eat); break; |
646 | case KW_last_eat: thawer.get (op->last_eat); break; |
| 640 | case KW_speed_left: thawer.get (op->speed_left); break; |
647 | case KW_speed_left: thawer.get (op->speed_left); break; |
| 641 | |
648 | |
| 642 | case KW_speed: |
649 | case KW_speed: |
| 643 | { |
|
|
| 644 | float speed; |
|
|
| 645 | thawer.get (speed); |
650 | thawer.get (op->speed); |
| 646 | op->set_speed (speed); |
|
|
| 647 | |
651 | |
| 648 | //TODO: maybe do in check_object |
652 | //TODO: maybe do in check_object |
| 649 | if (!(map_flags & MAP_STYLE)) |
653 | // removed check for style maps |
| 650 | if (op->speed < 0) |
654 | if (op->speed < 0) |
| 651 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
655 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
| 652 | } |
656 | |
| 653 | break; |
657 | break; |
| 654 | |
658 | |
| 655 | case KW_slow_move: |
659 | case KW_slow_move: |
| 656 | op->move_slow |= MOVE_WALK; |
660 | op->move_slow |= MOVE_WALK; |
| 657 | thawer.get (op->move_slow_penalty); |
661 | thawer.get (op->move_slow_penalty); |
| … | |
… | |
| 979 | case KW_randomitems: |
983 | case KW_randomitems: |
| 980 | op->randomitems = find_treasurelist (thawer.get_str ()); |
984 | op->randomitems = find_treasurelist (thawer.get_str ()); |
| 981 | break; |
985 | break; |
| 982 | |
986 | |
| 983 | case KW_msg: |
987 | case KW_msg: |
| 984 | { |
|
|
| 985 | thawer.get_ml (KW_endmsg, op->msg); |
988 | thawer.get_ml (KW_endmsg, op->msg); |
| 986 | //TODO: allow longer messages |
989 | //TODO: allow longer messages |
| 987 | if (strlen (op->msg) >= HUGE_BUF) |
990 | if (strlen (op->msg) >= HUGE_BUF) |
| 988 | { |
991 | { |
| 989 | 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); |
| 990 | op->msg = "ERROR, please report: string too long, winged.\n"; |
993 | op->msg = "ERROR, please report: string too long, winged.\n"; |
| 991 | } |
994 | } |
| 992 | } |
|
|
| 993 | break; |
995 | break; |
| 994 | |
996 | |
| 995 | case KW_lore: |
997 | case KW_lore: |
| 996 | { |
|
|
| 997 | shstr msgbuf; |
|
|
| 998 | |
|
|
| 999 | thawer.get_ml (KW_endlore, op->lore); |
998 | thawer.get_ml (KW_endlore, op->lore); |
| 1000 | //TODO: allow longer messages |
999 | //TODO: allow longer messages |
| 1001 | /* Just print a warning so we can be reasonably safe |
1000 | /* Just print a warning so we can be reasonably safe |
| 1002 | * about not overflowing the buffer. |
1001 | * about not overflowing the buffer. |
| 1003 | */ |
1002 | */ |
| 1004 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1003 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
| 1005 | 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", |
| 1006 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1005 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
| 1007 | } |
|
|
| 1008 | break; |
1006 | break; |
| 1009 | |
1007 | |
| 1010 | case KW_editable: |
1008 | case KW_editable: |
| 1011 | case KW_editor_folder: |
1009 | case KW_editor_folder: |
| 1012 | break; |
1010 | break; |
| … | |
… | |
| 1029 | |
1027 | |
| 1030 | case KW_EOF: |
1028 | case KW_EOF: |
| 1031 | return LL_EOF; |
1029 | return LL_EOF; |
| 1032 | |
1030 | |
| 1033 | case KW_ERROR: |
1031 | case KW_ERROR: |
| 1034 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1032 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
| 1035 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
1033 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
| 1036 | |
|
|
| 1037 | //TODO: skip line, ugly, factor parsing better |
|
|
| 1038 | if (thawer.last_value) |
|
|
| 1039 | thawer.line = thawer.last_value; |
|
|
| 1040 | |
|
|
| 1041 | thawer.line += strlen (thawer.line) + 1; |
|
|
| 1042 | |
|
|
| 1043 | break; |
1034 | break; |
| 1044 | |
1035 | |
| 1045 | default: |
1036 | default: |
| 1046 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1037 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
| 1047 | break; |
1038 | break; |
| … | |
… | |
| 1064 | * |
1055 | * |
| 1065 | */ |
1056 | */ |
| 1066 | int |
1057 | int |
| 1067 | load_object (object_thawer &fp, object *op, int map_flags) |
1058 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1068 | { |
1059 | { |
|
|
1060 | coroapi::cede_every (1000); // cede once in a while |
|
|
1061 | |
| 1069 | return parse_object (op, fp, map_flags); |
1062 | return parse_object (op, fp, map_flags); |
| 1070 | } |
1063 | } |
| 1071 | |
1064 | |
| 1072 | /* 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 |
| 1073 | * as appropriate in op. |
1066 | * as appropriate in op. |
| … | |
… | |
| 1465 | |
1458 | |
| 1466 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1459 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1467 | save_object (fp, tmp, flag); |
1460 | save_object (fp, tmp, flag); |
| 1468 | |
1461 | |
| 1469 | fp.put (op); |
1462 | fp.put (op); |
| 1470 | fprintf (fp, "end\n"); |
1463 | fp.put (KW_end); |
| 1471 | } |
1464 | } |
| 1472 | |
1465 | |
