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.30 by root, Tue Dec 26 08:54:59 2006 UTC vs.
Revision 1.32 by elmex, Sat Dec 30 21:07:46 2006 UTC

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

Diff Legend

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