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.33 by root, Sun Dec 31 17:17:22 2006 UTC

… …
540 case KW_slaying: thawer.get_ornull (op->slaying); break; 540 case KW_slaying: thawer.get_ornull (op->slaying); break;
541 541
542 case KW_arch: 542 case KW_arch:
543 { 543 {
544 const char *str = thawer.get_str (); 544 const char *str = thawer.get_str ();
545 fprintf (stderr, "arch %s\n", str);//D
545 546
546 if (op->arch) 547 if (op->arch)
547 { 548 {
548 /* If op->arch has been set, then this new object 549 /* If op->arch has been set, then this new object
549 * must be part of the inventory. So process 550 * must be part of the inventory. So process
… …
551 */ 552 */
552 archetype *arch = archetype::find (str); 553 archetype *arch = archetype::find (str);
553 554
554 object *tmp; 555 object *tmp;
555 556
556 if (arch != NULL) 557 if (arch)
557 tmp = arch_to_object (arch); 558 tmp = arch_to_object (arch);
558 else 559 else
559 { 560 {
560 tmp = object::create (); 561 tmp = object::create ();
561 /* record the name of the broken object */ 562 /* record the name of the broken object */
562 tmp->name = str; 563 tmp->name = str;
563 } 564 }
565
566 // decativate the object we, as we are still going
567 // to read the speed value. Objects should be activated
568 // when the map, object or player is completly loaded.
569 tmp->deactivate ();
564 570
565 parse_object (tmp, thawer, map_flags); 571 parse_object (tmp, thawer, map_flags);
566 572
567 if (tmp->arch) 573 if (tmp->arch)
568 { 574 {
… …
601 { 607 {
602 /* This is the actual archetype definition then */ 608 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 609 op->arch = archetype::find (str);
604 610
605 if (op->arch) 611 if (op->arch)
612 {
606 op->arch->clone.copy_to (op); 613 op->arch->clone.copy_to (op);
614 // copy_to activates, this should be fixed properly
615 op->deactivate ();
616 }
607 else if (!arch_init) 617 else if (!arch_init)
608 /* record the name of the broken object */ 618 /* record the name of the broken object */
609 op->name = str; 619 op->name = str;
610 } 620 }
611 } 621 }
… …
638 case KW_last_grace: thawer.get (op->last_grace); break; 648 case KW_last_grace: thawer.get (op->last_grace); break;
639 case KW_last_eat: thawer.get (op->last_eat); break; 649 case KW_last_eat: thawer.get (op->last_eat); break;
640 case KW_speed_left: thawer.get (op->speed_left); break; 650 case KW_speed_left: thawer.get (op->speed_left); break;
641 651
642 case KW_speed: 652 case KW_speed:
643 {
644 float speed;
645 thawer.get (speed); 653 thawer.get (op->speed);
646 op->set_speed (speed);
647 654
648 //TODO: maybe do in check_object 655 //TODO: maybe do in check_object
649 if (!(map_flags & MAP_STYLE)) 656 // removed check for style maps
650 if (op->speed < 0) 657 if (op->speed < 0)
651 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 658 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0;
652 } 659
653 break; 660 break;
654 661
655 case KW_slow_move: 662 case KW_slow_move:
656 op->move_slow |= MOVE_WALK; 663 op->move_slow |= MOVE_WALK;
657 thawer.get (op->move_slow_penalty); 664 thawer.get (op->move_slow_penalty);
… …
979 case KW_randomitems: 986 case KW_randomitems:
980 op->randomitems = find_treasurelist (thawer.get_str ()); 987 op->randomitems = find_treasurelist (thawer.get_str ());
981 break; 988 break;
982 989
983 case KW_msg: 990 case KW_msg:
984 {
985 thawer.get_ml (KW_endmsg, op->msg); 991 thawer.get_ml (KW_endmsg, op->msg);
986 //TODO: allow longer messages 992 //TODO: allow longer messages
987 if (strlen (op->msg) >= HUGE_BUF) 993 if (strlen (op->msg) >= HUGE_BUF)
988 { 994 {
989 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 995 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"; 996 op->msg = "ERROR, please report: string too long, winged.\n";
991 } 997 }
992 }
993 break; 998 break;
994 999
995 case KW_lore: 1000 case KW_lore:
996 {
997 shstr msgbuf;
998
999 thawer.get_ml (KW_endlore, op->lore); 1001 thawer.get_ml (KW_endlore, op->lore);
1000 //TODO: allow longer messages 1002 //TODO: allow longer messages
1001 /* Just print a warning so we can be reasonably safe 1003 /* Just print a warning so we can be reasonably safe
1002 * about not overflowing the buffer. 1004 * about not overflowing the buffer.
1003 */ 1005 */
1004 if (strlen (op->lore) > (HUGE_BUF / 2)) 1006 if (strlen (op->lore) > (HUGE_BUF / 2))
1005 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1007 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); 1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1007 }
1008 break; 1009 break;
1009 1010
1010 case KW_editable: 1011 case KW_editable:
1011 case KW_editor_folder: 1012 case KW_editor_folder:
1012 break; 1013 break;
… …
1029 1030
1030 case KW_EOF: 1031 case KW_EOF:
1031 return LL_EOF; 1032 return LL_EOF;
1032 1033
1033 case KW_ERROR: 1034 case KW_ERROR:
1034 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1035 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1035 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1036 //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; 1037 break;
1044 1038
1045 default: 1039 default:
1046 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1040 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]);
1047 break; 1041 break;
… …
1064 * 1058 *
1065 */ 1059 */
1066int 1060int
1067load_object (object_thawer &fp, object *op, int map_flags) 1061load_object (object_thawer &fp, object *op, int map_flags)
1068{ 1062{
1063 // cede every 500 objects loaded
1064 {
1065 static int cede_counter = 0;
1066
1067 if (++cede_counter >= 500)
1068 {
1069 cede_counter = 0;
1070 if (coroapi::nready ())
1071 coroapi::cede ();
1072 }
1073 }
1074
1069 return parse_object (op, fp, map_flags); 1075 return parse_object (op, fp, map_flags);
1070} 1076}
1071 1077
1072/* This takes a buffer, scans it for variables, and sets those variables 1078/* This takes a buffer, scans it for variables, and sets those variables
1073 * as appropriate in op. 1079 * as appropriate in op.
… …
1465 1471
1466 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1472 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1467 save_object (fp, tmp, flag); 1473 save_object (fp, tmp, flag);
1468 1474
1469 fp.put (op); 1475 fp.put (op);
1470 fprintf (fp, "end\n"); 1476 fp.put (KW_end);
1471} 1477}
1472 1478

Diff Legend

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