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.175 by root, Mon Oct 29 23:55:52 2012 UTC vs.
Revision 1.176 by root, Wed Nov 14 06:21:39 2012 UTC

630 f.delayed_deref (this, owner, f.get_str ()); 630 f.delayed_deref (this, owner, f.get_str ());
631 break; 631 break;
632 632
633 case KW_animation: 633 case KW_animation:
634 { 634 {
635 this->clr_flag (FLAG_ANIMATE); 635 clr_flag (FLAG_ANIMATE);
636 animation_id = 0; 636 animation_id = 0;
637 637
638 if (f.has_value () && (animation_id = find_animation (f.get_str ()))) 638 if (f.has_value () && (animation_id = animation::find (f.get_str ()).number))
639 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here 639 set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
640 } 640 }
641 break; 641 break;
642 642
643 case KW_last_heal: f.get (last_heal); break; 643 case KW_last_heal: f.get (last_heal); break;
644 case KW_last_sp: f.get (last_sp); break; 644 case KW_last_sp: f.get (last_sp); break;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines