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.148 by root, Wed Nov 11 23:27:56 2009 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC

… …
480 animate_object (this, direction); 480 animate_object (this, direction);
481 } 481 }
482} 482}
483 483
484static void 484static void
485set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, object_thawer &f)
486{ 486{
487 static const struct flagstr { 487 static const struct flagstr {
488 const char *name; 488 const char *name;
489 MoveType flags; 489 MoveType flags;
490 } move_flags[] = { 490 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 496 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 497 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 498 { "all" , MOVE_ALL },
499 }; 499 };
500 500
501 if (!str) 501 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 502
507 if (isdigit (*str)) 503 if (!*str || isdigit (*str))
508 { 504 {
509 mt = atoi (str); 505 mt = atoi (str);
510 return; 506 return;
511 } 507 }
512 508
513 mt = 0; 509 mt = 0;
514 510
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 512 {
517 bool negate = 0; 513 bool negate = 0;
518 514
519 if (*str == '-') 515 if (*str == '-')
520 { 516 {
… …
554 for (;;) 550 for (;;)
555 { 551 {
556 switch (f.kw) 552 switch (f.kw)
557 { 553 {
558 case KW_uuid: 554 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 555 if (!uuid.parse (f.get_str ()))
561 { 556 {
562 f.parse_warn ("unparseable uuid"); 557 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 558 uuid = UUID::gen ();
564 } 559 }
565 break; 560 break;
566 561
567 case KW_oid: 562 case KW_oid:
568 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
569 break; 564 break;
… …
634 case KW_animation: 629 case KW_animation:
635 { 630 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
637 animation_id = 0; 632 animation_id = 0;
638 633
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 634 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 636 }
643 break; 637 break;
644 638
645 case KW_last_heal: f.get (last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
… …
662 move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 657 f.get (move_slow_penalty);
664 break; 658 break;
665 659
666 case KW_face: 660 case KW_face:
667 face = face_find (f.get_str ()); 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 662 break;
669 663
670 case KW_sound: 664 case KW_sound:
665 if (f.has_value ())
666 {
671 sound = sound_find (f.get_str ()); 667 sound = sound_find (f.get_str ());
672 if (!sound) 668 if (!sound)
673 f.parse_warn ("sound not found"); 669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
671 else
672 sound = 0;
674 break; 673 break;
675 674
676 case KW_sound_destroy: 675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
677 sound_destroy = sound_find (f.get_str ()); 678 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 679 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 680 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
681 }
682 else
683 sound_destroy = 0;
680 break; 684 break;
681 685
682 case KW_x: f.get (x); break; 686 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 687 case KW_y: f.get (y); break;
684 688
… …
735 material = name_to_material (sh); 739 material = name_to_material (sh);
736 } 740 }
737 break; 741 break;
738 742
739 /* These are the new values */ 743 /* These are the new values */
740 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
741 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
742 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
743 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
744 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
745 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
746 750
747 /* These are all legacy - any new objects should use the move_ .. values */ 751 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_no_pass: 752 case KW_no_pass:
749 { 753 {
750 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
996 add_link (map, connected); 1000 add_link (map, connected);
997 } 1001 }
998 break; 1002 break;
999 1003
1000 case KW_randomitems: 1004 case KW_randomitems:
1001 if (f.get_str ()) 1005 if (f.has_value ())
1002 { 1006 {
1003 randomitems = 1007 randomitems =
1004 loading_arch 1008 loading_arch
1005 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
1006 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());

Diff Legend

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