| … | |
… | |
| 638 | case KW_last_grace: thawer.get (op->last_grace); break; |
638 | case KW_last_grace: thawer.get (op->last_grace); break; |
| 639 | case KW_last_eat: thawer.get (op->last_eat); break; |
639 | case KW_last_eat: thawer.get (op->last_eat); break; |
| 640 | case KW_speed_left: thawer.get (op->speed_left); break; |
640 | case KW_speed_left: thawer.get (op->speed_left); break; |
| 641 | |
641 | |
| 642 | case KW_speed: |
642 | case KW_speed: |
| 643 | { |
|
|
| 644 | float speed; |
|
|
| 645 | thawer.get (speed); |
643 | thawer.get (op->speed); |
| 646 | op->set_speed (speed); |
|
|
| 647 | |
644 | |
| 648 | //TODO: maybe do in check_object |
645 | //TODO: maybe do in check_object |
| 649 | if (!(map_flags & MAP_STYLE)) |
646 | // removed check for style maps |
| 650 | if (op->speed < 0) |
647 | if (op->speed < 0) |
| 651 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
648 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
| 652 | } |
649 | |
| 653 | break; |
650 | break; |
| 654 | |
651 | |
| 655 | case KW_slow_move: |
652 | case KW_slow_move: |
| 656 | op->move_slow |= MOVE_WALK; |
653 | op->move_slow |= MOVE_WALK; |
| 657 | thawer.get (op->move_slow_penalty); |
654 | thawer.get (op->move_slow_penalty); |
| … | |
… | |
| 979 | case KW_randomitems: |
976 | case KW_randomitems: |
| 980 | op->randomitems = find_treasurelist (thawer.get_str ()); |
977 | op->randomitems = find_treasurelist (thawer.get_str ()); |
| 981 | break; |
978 | break; |
| 982 | |
979 | |
| 983 | case KW_msg: |
980 | case KW_msg: |
| 984 | { |
|
|
| 985 | thawer.get_ml (KW_endmsg, op->msg); |
981 | thawer.get_ml (KW_endmsg, op->msg); |
| 986 | //TODO: allow longer messages |
982 | //TODO: allow longer messages |
| 987 | if (strlen (op->msg) >= HUGE_BUF) |
983 | if (strlen (op->msg) >= HUGE_BUF) |
| 988 | { |
984 | { |
| 989 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
985 | LOG (llevDebug, "\n\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"; |
986 | op->msg = "ERROR, please report: string too long, winged.\n"; |
| 991 | } |
987 | } |
| 992 | } |
|
|
| 993 | break; |
988 | break; |
| 994 | |
989 | |
| 995 | case KW_lore: |
990 | case KW_lore: |
| 996 | { |
|
|
| 997 | shstr msgbuf; |
|
|
| 998 | |
|
|
| 999 | thawer.get_ml (KW_endlore, op->lore); |
991 | thawer.get_ml (KW_endlore, op->lore); |
| 1000 | //TODO: allow longer messages |
992 | //TODO: allow longer messages |
| 1001 | /* Just print a warning so we can be reasonably safe |
993 | /* Just print a warning so we can be reasonably safe |
| 1002 | * about not overflowing the buffer. |
994 | * about not overflowing the buffer. |
| 1003 | */ |
995 | */ |
| 1004 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
996 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
| 1005 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
997 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
| 1006 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
998 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
| 1007 | } |
|
|
| 1008 | break; |
999 | break; |
| 1009 | |
1000 | |
| 1010 | case KW_editable: |
1001 | case KW_editable: |
| 1011 | case KW_editor_folder: |
1002 | case KW_editor_folder: |
| 1012 | break; |
1003 | break; |
| … | |
… | |
| 1029 | |
1020 | |
| 1030 | case KW_EOF: |
1021 | case KW_EOF: |
| 1031 | return LL_EOF; |
1022 | return LL_EOF; |
| 1032 | |
1023 | |
| 1033 | case KW_ERROR: |
1024 | case KW_ERROR: |
| 1034 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1025 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
| 1035 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
1026 | //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; |
1027 | break; |
| 1044 | |
1028 | |
| 1045 | default: |
1029 | default: |
| 1046 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1030 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
| 1047 | break; |
1031 | break; |
| … | |
… | |
| 1064 | * |
1048 | * |
| 1065 | */ |
1049 | */ |
| 1066 | int |
1050 | int |
| 1067 | load_object (object_thawer &fp, object *op, int map_flags) |
1051 | load_object (object_thawer &fp, object *op, int map_flags) |
| 1068 | { |
1052 | { |
|
|
1053 | // cede every 500 objects loaded |
|
|
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 | |
| 1069 | return parse_object (op, fp, map_flags); |
1065 | return parse_object (op, fp, map_flags); |
| 1070 | } |
1066 | } |
| 1071 | |
1067 | |
| 1072 | /* This takes a buffer, scans it for variables, and sets those variables |
1068 | /* This takes a buffer, scans it for variables, and sets those variables |
| 1073 | * as appropriate in op. |
1069 | * as appropriate in op. |
| … | |
… | |
| 1465 | |
1461 | |
| 1466 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1462 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
| 1467 | save_object (fp, tmp, flag); |
1463 | save_object (fp, tmp, flag); |
| 1468 | |
1464 | |
| 1469 | fp.put (op); |
1465 | fp.put (op); |
| 1470 | fprintf (fp, "end\n"); |
1466 | fp.put (KW_end, 0); |
| 1471 | } |
1467 | } |
| 1472 | |
1468 | |
