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.55 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.56 by root, Fri Feb 9 01:52:10 2007 UTC

718 tmp = arch_to_object (arch); 718 tmp = arch_to_object (arch);
719 else 719 else
720 { 720 {
721 tmp = object::create (); 721 tmp = object::create ();
722 /* record the name of the broken object */ 722 /* record the name of the broken object */
723 //TODO: but do not log???
723 tmp->name = str; 724 tmp->name = str;
724 } 725 }
725 726
726 // decativate the object we, as we are still going 727 // decativate the object we, as we are still going
727 // to read the speed value. Objects should be activated 728 // to read the speed value. Objects should be activated
785 op->other_arch = archetype::find (thawer.get_str ()); 786 op->other_arch = archetype::find (thawer.get_str ());
786 break; 787 break;
787 788
788 case KW_animation: 789 case KW_animation:
789 { 790 {
791 CLEAR_FLAG (op, FLAG_ANIMATE);
792 op->animation_id = 0;
793
790 const char *str = thawer.get_str (); 794 const char *str = thawer.get_str ();
791
792 if (!str)
793 {
794 op->animation_id = 0;
795 CLEAR_FLAG (op, FLAG_ANIMATE);
796 }
797 else if ((op->animation_id = find_animation (str))) 795 if (str && (op->animation_id = find_animation (str)))
798 SET_FLAG (op, FLAG_ANIMATE); 796 SET_FLAG (op, FLAG_ANIMATE);
799 } 797 }
800
801 break; 798 break;
802 799
803 case KW_last_heal: thawer.get (op->last_heal); break; 800 case KW_last_heal: thawer.get (op->last_heal); break;
804 case KW_last_sp: thawer.get (op->last_sp); break; 801 case KW_last_sp: thawer.get (op->last_sp); break;
805 case KW_last_grace: thawer.get (op->last_grace); break; 802 case KW_last_grace: thawer.get (op->last_grace); break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines