ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.29 by root, Mon Dec 25 17:11:16 2006 UTC vs.
Revision 1.31 by root, Sat Dec 30 10:16:10 2006 UTC

… …
641 641
642 case KW_speed: 642 case KW_speed:
643 thawer.get (op->speed); 643 thawer.get (op->speed);
644 644
645 //TODO: maybe do in check_object 645 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 646 // removed check for style maps
647 {
648 if (op->speed < 0) 647 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 648 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
650
651 update_ob_speed (op);
652 }
653 649
654 break; 650 break;
655 651
656 case KW_slow_move: 652 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 653 op->move_slow |= MOVE_WALK;
… …
980 case KW_randomitems: 976 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 977 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 978 break;
983 979
984 case KW_msg: 980 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 981 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 982 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 983 if (strlen (op->msg) >= HUGE_BUF)
989 { 984 {
990 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);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 986 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 987 }
993 }
994 break; 988 break;
995 989
996 case KW_lore: 990 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 991 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 992 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 993 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 994 * about not overflowing the buffer.
1004 */ 995 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 996 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 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",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 998 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 999 break;
1010 1000
1011 case KW_editable: 1001 case KW_editable:
1012 case KW_editor_folder: 1002 case KW_editor_folder:
1013 break; 1003 break;
… …
1030 1020
1031 case KW_EOF: 1021 case KW_EOF:
1032 return LL_EOF; 1022 return LL_EOF;
1033 1023
1034 case KW_ERROR: 1024 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1025 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //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
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; 1027 break;
1045 1028
1046 default: 1029 default:
1047 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]);
1048 break; 1031 break;
… …
1065 * 1048 *
1066 */ 1049 */
1067int 1050int
1068load_object (object_thawer &fp, object *op, int map_flags) 1051load_object (object_thawer &fp, object *op, int map_flags)
1069{ 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
1070 return parse_object (op, fp, map_flags); 1065 return parse_object (op, fp, map_flags);
1071} 1066}
1072 1067
1073/* 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
1074 * as appropriate in op. 1069 * as appropriate in op.
… …
1466 1461
1467 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1462 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1468 save_object (fp, tmp, flag); 1463 save_object (fp, tmp, flag);
1469 1464
1470 fp.put (op); 1465 fp.put (op);
1471 fprintf (fp, "end\n"); 1466 fp.put (KW_end, 0);
1472} 1467}
1473 1468

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines