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.36 by root, Mon Jan 1 21:19:51 2007 UTC

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

Diff Legend

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