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.169 by root, Sun May 1 16:58:15 2011 UTC vs.
Revision 1.170 by root, Sat May 7 17:14:41 2011 UTC

747 case KW_move_type: set_move (move_type , f); break; 747 case KW_move_type: set_move (move_type , f); break;
748 case KW_move_on: set_move (move_on , f); break; 748 case KW_move_on: set_move (move_on , f); break;
749 case KW_move_off: set_move (move_off , f); break; 749 case KW_move_off: set_move (move_off , f); break;
750 case KW_move_slow: set_move (move_slow , f); break; 750 case KW_move_slow: set_move (move_slow , f); break;
751 751
752 /* These are all legacy - any new objects should use the move_ .. values */
753 case KW_no_pass:
754 {
755 if (f.get_sint32 ())
756 move_block = MOVE_ALL;
757 else
758 move_block = 0;
759 }
760
761 break;
762
763 /* These are all legacy - any new objects should use the move_ .. values */
764 case KW_walk_on:
765 {
766 if (f.get_sint32 ())
767 move_on |= MOVE_WALK;
768 else
769 move_on &= ~MOVE_WALK;
770 }
771
772 break;
773
774 /* These are all legacy - any new objects should use the move_ .. values */
775 case KW_walk_off:
776 {
777 if (f.get_sint32 ())
778 move_off |= MOVE_WALK;
779 else
780 move_off &= ~MOVE_WALK;
781 }
782 break;
783
784 /* These are all legacy - any new objects should use the move_ .. values */
785 case KW_fly_on:
786 {
787 if (f.get_sint32 ())
788 move_on |= MOVE_FLY_LOW;
789 else
790 move_on &= ~MOVE_FLY_LOW;
791 }
792 break;
793
794 /* These are all legacy - any new objects should use the move_ .. values */
795 case KW_fly_off:
796 {
797 if (f.get_sint32 ())
798 move_off |= MOVE_FLY_LOW;
799 else
800 move_off &= ~MOVE_FLY_LOW;
801 }
802 break;
803
804 //TODO: remove these after converting archetypes 752 //TODO: remove these after converting archetypes
805 case KW_can_use_wand: 753 case KW_can_use_wand:
806 GET_FLAG (this, FLAG_USE_RANGE); 754 GET_FLAG (this, FLAG_USE_RANGE);
807 break; 755 break;
808
809 /* These are all legacy - any new objects should use the move_ .. values */
810 case KW_flying:
811 {
812 if (f.get_sint32 ())
813 move_type |= MOVE_FLY_LOW;
814 else
815 move_type &= ~MOVE_FLY_LOW;
816 }
817 break;
818
819 756
820 case KW_identified: 757 case KW_identified:
821 GET_FLAG (this, FLAG_IDENTIFIED); 758 GET_FLAG (this, FLAG_IDENTIFIED);
822 //TODO: move to check_object or so 759 //TODO: move to check_object or so
823 if (this->flag [FLAG_IDENTIFIED]) 760 if (this->flag [FLAG_IDENTIFIED])

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines