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