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.17 by root, Thu Sep 14 22:33:59 2006 UTC vs.
Revision 1.22 by root, Tue Dec 12 21:39:56 2006 UTC

… …
528 528
529 case KW_oid: 529 case KW_oid:
530 thawer.get (op, thawer.get_sint32 ()); 530 thawer.get (op, thawer.get_sint32 ());
531 break; 531 break;
532 532
533 case KW_name: 533 case KW_name: thawer.get (op->name); break;
534 thawer.get (op->name); 534 case KW_name_pl: thawer.get (op->name_pl); break;
535 break; 535 case KW_title: thawer.get (op->title); break;
536 case KW_name_pl:
537 thawer.get (op->name_pl);
538 break;
539 case KW_title:
540 thawer.get (op->title);
541 break;
542 case KW_custom_name:
543 thawer.get (op->custom_name); 536 case KW_custom_name: thawer.get (op->custom_name); break;
544 break; 537
545 case KW_attach:
546 thawer.get_ornull (op->attach); 538 case KW_attach: thawer.get_ornull (op->attach); break;
547 break;
548 case KW_skill:
549 thawer.get_ornull (op->skill); 539 case KW_skill: thawer.get_ornull (op->skill); break;
550 break;
551 case KW_race:
552 thawer.get_ornull (op->race); 540 case KW_race: thawer.get_ornull (op->race); break;
553 break;
554 case KW_slaying:
555 thawer.get_ornull (op->slaying); 541 case KW_slaying: thawer.get_ornull (op->slaying); break;
556 break;
557 542
558 case KW_arch: 543 case KW_arch:
559 { 544 {
560 const char *str = thawer.get_str (); 545 const char *str = thawer.get_str ();
561 546
… …
571 556
572 if (arch != NULL) 557 if (arch != NULL)
573 tmp = arch_to_object (arch); 558 tmp = arch_to_object (arch);
574 else 559 else
575 { 560 {
576 tmp = get_object (); 561 tmp = object::create ();
577 /* record the name of the broken object */ 562 /* record the name of the broken object */
578 tmp->name = str; 563 tmp->name = str;
579 } 564 }
580 565
581 parse_object (tmp, thawer, map_flags); 566 parse_object (tmp, thawer, map_flags);
… …
608 op_inv = tmp; 593 op_inv = tmp;
609 } 594 }
610 else 595 else
611 { 596 {
612 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
613 free_object (tmp); 598 tmp->destroy ();
614 } 599 }
615 } 600 }
616 else 601 else
617 { 602 {
618 /* This is the actual archetype definition then */ 603 /* This is the actual archetype definition then */
619 op->arch = archetype::find (str); 604 op->arch = archetype::find (str);
620 605
621 if (op->arch != NULL) 606 if (op->arch)
622 copy_object (&op->arch->clone, op); 607 op->arch->clone.copy_to (op);
623 else if (!arch_init) 608 else if (!arch_init)
624 /* record the name of the broken object */ 609 /* record the name of the broken object */
625 op->name = str; 610 op->name = str;
626 } 611 }
627 } 612 }
… …
647 } 632 }
648 } 633 }
649 634
650 break; 635 break;
651 636
652 case KW_last_heal:
653 thawer.get (op->last_heal); 637 case KW_last_heal: thawer.get (op->last_heal); break;
654 break; 638 case KW_last_sp: thawer.get (op->last_sp); break;
655 case KW_last_sp: 639 case KW_last_grace: thawer.get (op->last_grace); break;
656 thawer.get (op->last_sp); 640 case KW_last_eat: thawer.get (op->last_eat); break;
657 break; 641 case KW_speed_left: thawer.get (op->speed_left); break;
658 case KW_last_grace:
659 thawer.get (op->last_grace);
660 break;
661 case KW_last_eat:
662 thawer.get (op->last_eat);
663 break;
664 case KW_speed_left:
665 thawer.get (op->speed_left);
666 break;
667 642
668 case KW_speed: 643 case KW_speed:
669 thawer.get (op->speed); 644 thawer.get (op->speed);
670 645
671 //TODO: maybe do in check_object 646 //TODO: maybe do in check_object
… …
686 661
687 case KW_face: 662 case KW_face:
688 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 663 op->face = &new_faces[FindFace (thawer.get_str (), 0)];
689 break; 664 break;
690 665
691 case KW_x:
692 thawer.get (op->x); 666 case KW_x: thawer.get (op->x); break;
693 break;
694 case KW_y:
695 thawer.get (op->y); 667 case KW_y: thawer.get (op->y); break;
696 break; 668
697 case KW_Str: // uppercase alias 669 case KW_Str: // uppercase alias
698 case KW_str:
699 thawer.get (op->stats.Str); 670 case KW_str: thawer.get (op->stats.Str); break;
700 break;
701 case KW_Dex: // uppercase alias 671 case KW_Dex: // uppercase alias
702 case KW_dex:
703 thawer.get (op->stats.Dex); 672 case KW_dex: thawer.get (op->stats.Dex); break;
704 break;
705 case KW_Con: // uppercase alias 673 case KW_Con: // uppercase alias
706 case KW_con:
707 thawer.get (op->stats.Con); 674 case KW_con: thawer.get (op->stats.Con); break;
708 break;
709 case KW_Wis: // uppercase alias 675 case KW_Wis: // uppercase alias
710 case KW_wis:
711 thawer.get (op->stats.Wis); 676 case KW_wis: thawer.get (op->stats.Wis); break;
712 break;
713 case KW_Cha: // uppercase alias 677 case KW_Cha: // uppercase alias
714 case KW_cha:
715 thawer.get (op->stats.Cha); 678 case KW_cha: thawer.get (op->stats.Cha); break;
716 break;
717 case KW_Int: // uppercase alias 679 case KW_Int: // uppercase alias
718 case KW_int:
719 thawer.get (op->stats.Int); 680 case KW_int: thawer.get (op->stats.Int); break;
720 break;
721 case KW_Pow: // uppercase alias 681 case KW_Pow: // uppercase alias
722 case KW_pow:
723 thawer.get (op->stats.Pow); 682 case KW_pow: thawer.get (op->stats.Pow); break;
724 break;
725 case KW_hp:
726 thawer.get (op->stats.hp);
727 break;
728 case KW_maxhp:
729 thawer.get (op->stats.maxhp);
730 break;
731 case KW_sp:
732 thawer.get (op->stats.sp);
733 break;
734 case KW_maxsp:
735 thawer.get (op->stats.maxsp);
736 break;
737 case KW_grace:
738 thawer.get (op->stats.grace);
739 break;
740 case KW_maxgrace:
741 thawer.get (op->stats.maxgrace);
742 break;
743 683
744 case KW_exp: 684 case KW_hp: thawer.get (op->stats.hp); break;
745 thawer.get (op->stats.exp); 685 case KW_maxhp: thawer.get (op->stats.maxhp); break;
746 break; 686 case KW_sp: thawer.get (op->stats.sp); break;
747 case KW_perm_exp: 687 case KW_maxsp: thawer.get (op->stats.maxsp); break;
748 thawer.get (op->perm_exp); 688 case KW_grace: thawer.get (op->stats.grace); break;
749 break; 689 case KW_maxgrace: thawer.get (op->stats.maxgrace); break;
750 case KW_food: 690
751 thawer.get (op->stats.food); 691 case KW_exp: thawer.get (op->stats.exp); break;
752 break; 692 case KW_perm_exp: thawer.get (op->perm_exp); break;
753 case KW_dam: 693 case KW_food: thawer.get (op->stats.food); break;
754 thawer.get (op->stats.dam); 694 case KW_dam: thawer.get (op->stats.dam); break;
755 break; 695 case KW_wc: thawer.get (op->stats.wc); break;
756 case KW_wc: 696 case KW_ac: thawer.get (op->stats.ac); break;
757 thawer.get (op->stats.wc); 697 case KW_nrof: thawer.get (op->nrof); break;
758 break; 698 case KW_level: thawer.get (op->level); break;
759 case KW_ac: 699 case KW_direction: thawer.get (op->direction); break;
760 thawer.get (op->stats.ac); 700 case KW_type: thawer.get (op->type); break;
761 break; 701 case KW_subtype: thawer.get (op->subtype); break;
762 case KW_nrof: 702 case KW_value: thawer.get (op->value); break;
763 thawer.get (op->nrof); 703 case KW_weight: thawer.get (op->weight); break;
764 break; 704 case KW_carrying: thawer.get (op->carrying); break;
765 case KW_level: 705 case KW_attacktype: thawer.get (op->attacktype); break;
766 thawer.get (op->level); 706 case KW_path_attuned: thawer.get (op->path_attuned); break;
767 break; 707 case KW_path_repelled: thawer.get (op->path_repelled); break;
768 case KW_direction: 708 case KW_path_denied: thawer.get (op->path_denied); break;
769 thawer.get (op->direction); 709 case KW_invisible: thawer.get (op->invisible); break;
770 break; 710 case KW_magic: thawer.get (op->magic); break;
771 case KW_type: 711 case KW_state: thawer.get (op->state); break;
772 thawer.get (op->type); 712 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break;
773 break; 713 case KW_material: thawer.get (op->material); break;
774 case KW_subtype: 714 case KW_materialname: thawer.get (op->materialname); break;
775 thawer.get (op->subtype);
776 break;
777 case KW_value:
778 thawer.get (op->value);
779 break;
780 case KW_weight:
781 thawer.get (op->weight);
782 break;
783 case KW_carrying:
784 thawer.get (op->carrying);
785 break;
786 case KW_attacktype:
787 thawer.get (op->attacktype);
788 break;
789 case KW_path_attuned:
790 thawer.get (op->path_attuned);
791 break;
792 case KW_path_repelled:
793 thawer.get (op->path_repelled);
794 break;
795 case KW_path_denied:
796 thawer.get (op->path_denied);
797 break;
798 case KW_invisible:
799 thawer.get (op->invisible);
800 break;
801 case KW_magic:
802 thawer.get (op->magic);
803 break;
804 case KW_state:
805 thawer.get (op->state);
806 break;
807 case KW_move_slow_penalty:
808 thawer.get (op->move_slow_penalty);
809 break;
810 case KW_material:
811 thawer.get (op->material);
812 break;
813 case KW_materialname:
814 thawer.get (op->materialname);
815 break;
816 715
817 /* These are the new values */ 716 /* These are the new values */
818 case KW_move_block:
819 set_move (op->move_block, thawer.get_str ()); 717 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break;
820 break;
821 case KW_move_allow:
822 set_move (op->move_allow, thawer.get_str ()); 718 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break;
823 break;
824 case KW_move_type:
825 set_move (op->move_type, thawer.get_str ()); 719 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break;
826 break;
827 case KW_move_on:
828 set_move (op->move_on, thawer.get_str ()); 720 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break;
829 break;
830 case KW_move_off:
831 set_move (op->move_off, thawer.get_str ()); 721 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break;
832 break;
833 case KW_move_slow:
834 set_move (op->move_slow, thawer.get_str ()); 722 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break;
835 break;
836 723
837 /* These are all legacy - any new objects should use the move_ .. values */ 724 /* These are all legacy - any new objects should use the move_ .. values */
838 case KW_no_pass: 725 case KW_no_pass:
839 { 726 {
840 if (thawer.get_sint32 ()) 727 if (thawer.get_sint32 ())
… …
931 //TODO: move to check_object or so 818 //TODO: move to check_object or so
932 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) 819 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
933 add_friendly_object (op); 820 add_friendly_object (op);
934 break; 821 break;
935 822
936 case KW_monster: 823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
937 GET_FLAG (op, FLAG_MONSTER); 824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
938 break; 825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
939 case KW_neutral: 826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
940 GET_FLAG (op, FLAG_NEUTRAL); 827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
941 break; 828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break;
942 case KW_no_attack: 829 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
943 GET_FLAG (op, FLAG_NO_ATTACK); 830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
944 break; 831 case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break;
945 case KW_no_damage: 832 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
946 GET_FLAG (op, FLAG_NO_DAMAGE); 833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
947 break; 834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
948 case KW_generator: 835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break;
949 GET_FLAG (op, FLAG_GENERATOR); 836 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
950 break; 837 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break;
951 case KW_use_content_on_gen: 838 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break;
952 GET_FLAG (op, FLAG_CONTENT_ON_GEN); 839 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break;
953 break; 840 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break;
954 case KW_is_thrown: 841 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break;
955 GET_FLAG (op, FLAG_IS_THROWN); 842 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break;
956 break; 843 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break;
957 case KW_auto_apply: 844 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break;
958 GET_FLAG (op, FLAG_AUTO_APPLY); 845 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break;
959 break; 846 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break;
960 case KW_treasure: 847 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break;
961 GET_FLAG (op, FLAG_TREASURE); 848 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break;
962 break; 849 case KW_scared: GET_FLAG (op, FLAG_SCARED); break;
963 case KW_see_invisible: 850 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break;
964 GET_FLAG (op, FLAG_SEE_INVISIBLE); 851 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break;
965 break; 852 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break;
966 case KW_can_roll: 853 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break;
967 GET_FLAG (op, FLAG_CAN_ROLL); 854 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break;
968 break; 855 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
969 case KW_overlay_floor: 856 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break;
970 GET_FLAG (op, FLAG_OVERLAY_FLOOR); 857 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break;
971 break; 858 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break;
972 case KW_is_turnable: 859 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break;
973 GET_FLAG (op, FLAG_IS_TURNABLE); 860 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break;
974 break; 861 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break;
975 case KW_is_used_up: 862 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break;
976 GET_FLAG (op, FLAG_IS_USED_UP); 863 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break;
977 break; 864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
978 case KW_alive: 865 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
979 GET_FLAG (op, FLAG_ALIVE); 866 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
980 break; 867 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
981 case KW_applied: 868 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
982 GET_FLAG (op, FLAG_APPLIED); 869 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
983 break; 870 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
984 case KW_unpaid: 871 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
985 GET_FLAG (op, FLAG_UNPAID); 872 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
986 break; 873 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
987 case KW_is_animated: 874 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
988 GET_FLAG (op, FLAG_ANIMATE); 875 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break;
989 break; 876 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break;
990 case KW_no_pick: 877 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break;
991 GET_FLAG (op, FLAG_NO_PICK); 878 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break;
992 break; 879 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break;
993 case KW_reflecting: 880 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break;
994 GET_FLAG (op, FLAG_REFLECTING); 881 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break;
995 break; 882 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break;
996 case KW_changing: 883 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break;
997 GET_FLAG (op, FLAG_CHANGING); 884 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break;
998 break; 885 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break;
999 case KW_splitting: 886 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break;
1000 GET_FLAG (op, FLAG_SPLITTING); 887 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break;
1001 break; 888 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break;
1002 case KW_hitback: 889 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break;
1003 GET_FLAG (op, FLAG_HITBACK); 890 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break;
1004 break; 891 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break;
1005 case KW_startequip: 892 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break;
1006 GET_FLAG (op, FLAG_STARTEQUIP); 893 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break;
1007 break; 894 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break;
1008 case KW_blocksview: 895 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break;
1009 GET_FLAG (op, FLAG_BLOCKSVIEW); 896 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break;
1010 break; 897 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break;
1011 case KW_undead: 898 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break;
1012 GET_FLAG (op, FLAG_UNDEAD); 899 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break;
1013 break; 900 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break;
1014 case KW_scared: 901 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break;
1015 GET_FLAG (op, FLAG_SCARED); 902 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break;
1016 break; 903 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
1017 case KW_unaggressive: 904 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
1018 GET_FLAG (op, FLAG_UNAGGRESSIVE); 905 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
1019 break; 906 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
1020 case KW_reflect_missile: 907 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
1021 GET_FLAG (op, FLAG_REFL_MISSILE);
1022 break;
1023 case KW_reflect_spell:
1024 GET_FLAG (op, FLAG_REFL_SPELL);
1025 break;
1026 case KW_no_magic:
1027 GET_FLAG (op, FLAG_NO_MAGIC);
1028 break;
1029 case KW_no_drop:
1030 GET_FLAG (op, FLAG_NO_DROP);
1031 break;
1032 case KW_random_movement:
1033 GET_FLAG (op, FLAG_RANDOM_MOVE);
1034 break;
1035 case KW_was_wiz:
1036 GET_FLAG (op, FLAG_WAS_WIZ);
1037 break;
1038 case KW_no_fix_player:
1039 GET_FLAG (op, FLAG_NO_FIX_PLAYER);
1040 break;
1041 case KW_is_lightable:
1042 GET_FLAG (op, FLAG_IS_LIGHTABLE);
1043 break;
1044 case KW_tear_down:
1045 GET_FLAG (op, FLAG_TEAR_DOWN);
1046 break;
1047 case KW_can_use_shield:
1048 GET_FLAG (op, FLAG_USE_SHIELD);
1049 break;
1050 case KW_can_cast_spell:
1051 GET_FLAG (op, FLAG_CAST_SPELL);
1052 break;
1053 case KW_can_use_scroll:
1054 GET_FLAG (op, FLAG_USE_SCROLL);
1055 break;
1056 case KW_can_use_range:
1057 GET_FLAG (op, FLAG_USE_RANGE);
1058 break;
1059 case KW_can_use_bow:
1060 GET_FLAG (op, FLAG_USE_BOW);
1061 break;
1062 case KW_can_use_armour:
1063 GET_FLAG (op, FLAG_USE_ARMOUR);
1064 break;
1065 case KW_can_use_weapon:
1066 GET_FLAG (op, FLAG_USE_WEAPON);
1067 break;
1068 case KW_can_use_ring:
1069 GET_FLAG (op, FLAG_USE_RING);
1070 break;
1071 case KW_has_ready_bow:
1072 GET_FLAG (op, FLAG_READY_BOW);
1073 break;
1074 case KW_xrays:
1075 GET_FLAG (op, FLAG_XRAYS);
1076 break;
1077 case KW_is_floor:
1078 GET_FLAG (op, FLAG_IS_FLOOR);
1079 break;
1080 case KW_lifesave:
1081 GET_FLAG (op, FLAG_LIFESAVE);
1082 break;
1083 case KW_no_strength:
1084 GET_FLAG (op, FLAG_NO_STRENGTH);
1085 break;
1086 case KW_sleep:
1087 GET_FLAG (op, FLAG_SLEEP);
1088 break;
1089 case KW_stand_still:
1090 GET_FLAG (op, FLAG_STAND_STILL);
1091 break;
1092 case KW_random_move:
1093 GET_FLAG (op, FLAG_RANDOM_MOVE);
1094 break;
1095 case KW_only_attack:
1096 GET_FLAG (op, FLAG_ONLY_ATTACK);
1097 break;
1098 case KW_activate_on_push:
1099 GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH);
1100 break;
1101 case KW_activate_on_release:
1102 GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE);
1103 break;
1104 case KW_confused:
1105 GET_FLAG (op, FLAG_CONFUSED);
1106 break;
1107 case KW_stealth:
1108 GET_FLAG (op, FLAG_STEALTH);
1109 break;
1110 case KW_cursed:
1111 GET_FLAG (op, FLAG_CURSED);
1112 break;
1113 case KW_damned:
1114 GET_FLAG (op, FLAG_DAMNED);
1115 break;
1116 case KW_see_anywhere:
1117 GET_FLAG (op, FLAG_SEE_ANYWHERE);
1118 break;
1119 case KW_known_magical:
1120 GET_FLAG (op, FLAG_KNOWN_MAGICAL);
1121 break;
1122 case KW_known_cursed:
1123 GET_FLAG (op, FLAG_KNOWN_CURSED);
1124 break;
1125 case KW_can_use_skill:
1126 GET_FLAG (op, FLAG_CAN_USE_SKILL);
1127 break;
1128 case KW_been_applied:
1129 GET_FLAG (op, FLAG_BEEN_APPLIED);
1130 break;
1131 case KW_has_ready_scroll:
1132 GET_FLAG (op, FLAG_READY_SCROLL);
1133 break;
1134 case KW_can_use_rod:
1135 GET_FLAG (op, FLAG_USE_ROD);
1136 break;
1137 case KW_can_use_horn:
1138 GET_FLAG (op, FLAG_USE_HORN);
1139 break;
1140 case KW_unique:
1141 GET_FLAG (op, FLAG_UNIQUE);
1142 break;
1143 case KW_make_invisible:
1144 GET_FLAG (op, FLAG_MAKE_INVIS);
1145 break;
1146 case KW_inv_locked:
1147 GET_FLAG (op, FLAG_INV_LOCKED);
1148 break;
1149 case KW_is_wooded:
1150 GET_FLAG (op, FLAG_IS_WOODED);
1151 break;
1152 case KW_is_hilly:
1153 GET_FLAG (op, FLAG_IS_HILLY);
1154 break;
1155 case KW_is_water:
1156 GET_FLAG (op, FLAG_IS_WATER);
1157 break;
1158 case KW_has_ready_skill:
1159 GET_FLAG (op, FLAG_READY_SKILL);
1160 break;
1161 case KW_has_ready_weapon:
1162 GET_FLAG (op, FLAG_READY_WEAPON);
1163 break;
1164 case KW_no_skill_ident:
1165 GET_FLAG (op, FLAG_NO_SKILL_IDENT);
1166 break;
1167 case KW_is_blind:
1168 GET_FLAG (op, FLAG_BLIND);
1169 break;
1170 case KW_can_see_in_dark:
1171 GET_FLAG (op, FLAG_SEE_IN_DARK);
1172 break;
1173 case KW_is_cauldron:
1174 GET_FLAG (op, FLAG_IS_CAULDRON);
1175 break;
1176 case KW_no_steal:
1177 GET_FLAG (op, FLAG_NO_STEAL);
1178 break;
1179 case KW_one_hit:
1180 GET_FLAG (op, FLAG_ONE_HIT);
1181 break;
1182 case KW_berserk:
1183 GET_FLAG (op, FLAG_BERSERK);
1184 break;
1185 case KW_is_buildable:
1186 GET_FLAG (op, FLAG_IS_BUILDABLE);
1187 break;
1188 908
1189 case KW_armour: 909 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
1190 thawer.get (op->resist[ATNR_PHYSICAL]); 910 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
1191 break; 911 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
1192 case KW_resist_physical: 912 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
1193 thawer.get (op->resist[ATNR_PHYSICAL]);
1194 break;
1195 case KW_resist_magic:
1196 thawer.get (op->resist[ATNR_MAGIC]);
1197 break;
1198 case KW_resist_fire:
1199 thawer.get (op->resist[ATNR_FIRE]);
1200 break;
1201 case KW_resist_electricity:
1202 thawer.get (op->resist[ATNR_ELECTRICITY]); 913 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break;
1203 break; 914 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break;
1204 case KW_resist_cold: 915 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break;
1205 thawer.get (op->resist[ATNR_COLD]); 916 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break;
1206 break; 917 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break;
1207 case KW_resist_confusion:
1208 thawer.get (op->resist[ATNR_CONFUSION]);
1209 break;
1210 case KW_resist_acid:
1211 thawer.get (op->resist[ATNR_ACID]);
1212 break;
1213 case KW_resist_drain:
1214 thawer.get (op->resist[ATNR_DRAIN]);
1215 break;
1216 case KW_resist_weaponmagic:
1217 thawer.get (op->resist[ATNR_WEAPONMAGIC]); 918 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break;
1218 break; 919 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break;
1219 case KW_resist_ghosthit: 920 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break;
1220 thawer.get (op->resist[ATNR_GHOSTHIT]); 921 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break;
1221 break; 922 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break;
1222 case KW_resist_poison:
1223 thawer.get (op->resist[ATNR_POISON]);
1224 break;
1225 case KW_resist_slow:
1226 thawer.get (op->resist[ATNR_SLOW]);
1227 break;
1228 case KW_resist_paralyze:
1229 thawer.get (op->resist[ATNR_PARALYZE]);
1230 break;
1231 case KW_resist_turn_undead:
1232 thawer.get (op->resist[ATNR_TURN_UNDEAD]); 923 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break;
1233 break; 924 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break;
1234 case KW_resist_fear:
1235 thawer.get (op->resist[ATNR_FEAR]);
1236 break;
1237 case KW_resist_cancellation:
1238 thawer.get (op->resist[ATNR_CANCELLATION]); 925 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break;
1239 break; 926 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break;
1240 case KW_resist_deplete: 927 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break;
1241 thawer.get (op->resist[ATNR_DEPLETE]); 928 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break;
1242 break;
1243 case KW_resist_death:
1244 thawer.get (op->resist[ATNR_DEATH]);
1245 break;
1246 case KW_resist_chaos:
1247 thawer.get (op->resist[ATNR_CHAOS]);
1248 break;
1249 case KW_resist_counterspell:
1250 thawer.get (op->resist[ATNR_COUNTERSPELL]); 929 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break;
1251 break; 930 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break;
1252 case KW_resist_godpower: 931 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break;
1253 thawer.get (op->resist[ATNR_GODPOWER]); 932 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break;
1254 break; 933 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break;
1255 case KW_resist_holyword: 934 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break;
1256 thawer.get (op->resist[ATNR_HOLYWORD]); 935 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break;
1257 break;
1258 case KW_resist_blind:
1259 thawer.get (op->resist[ATNR_BLIND]);
1260 break;
1261 case KW_resist_internal:
1262 thawer.get (op->resist[ATNR_INTERNAL]);
1263 break;
1264 case KW_resist_life_stealing:
1265 thawer.get (op->resist[ATNR_LIFE_STEALING]);
1266 break;
1267 case KW_resist_disease:
1268 thawer.get (op->resist[ATNR_DISEASE]);
1269 break;
1270 936
1271 case KW_luck: 937 case KW_luck: thawer.get (op->stats.luck); break;
1272 thawer.get (op->stats.luck); 938 case KW_run_away: thawer.get (op->run_away); break;
1273 break; 939 case KW_pick_up: thawer.get (op->pick_up); break;
1274 case KW_run_away: 940 case KW_item_power: thawer.get (op->item_power); break;
1275 thawer.get (op->run_away); 941 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break;
1276 break; 942 case KW_anim_speed: thawer.get (op->anim_speed); break;
1277 case KW_pick_up: 943 case KW_container: thawer.get (op->weight_limit); break;
1278 thawer.get (op->pick_up); 944 case KW_will_apply: thawer.get (op->will_apply); break;
1279 break; 945 case KW_attack_movement: thawer.get (op->attack_movement); break;
1280 case KW_item_power: 946 case KW_move_state: thawer.get (op->move_status); break;
1281 thawer.get (op->item_power); 947 case KW_expmul: thawer.get (op->expmul); break;
1282 break; 948 case KW_glow_radius: thawer.get (op->glow_radius); break;
1283 case KW_gen_sp_armour: 949 case KW_weapontype: thawer.get (op->weapontype); break;
1284 thawer.get (op->gen_sp_armour); 950 case KW_tooltype: thawer.get (op->tooltype); break;
1285 break; 951 case KW_casting_time: thawer.get (op->casting_time); break;
1286 case KW_anim_speed: 952 case KW_elevation: thawer.get (op->elevation); break;
1287 thawer.get (op->anim_speed); 953 case KW_smoothlevel: thawer.get (op->smoothlevel); break;
1288 break; 954 case KW_client_type: thawer.get (op->client_type); break;
1289 case KW_container: 955 case KW_duration: thawer.get (op->duration); break;
1290 thawer.get (op->weight_limit); 956 case KW_range: thawer.get (op->range); break;
1291 break; 957 case KW_range_modifier: thawer.get (op->range_modifier); break;
1292 case KW_will_apply: 958 case KW_dam_modifier: thawer.get (op->dam_modifier); break;
1293 thawer.get (op->will_apply); 959 case KW_duration_modifier: thawer.get (op->duration_modifier); break;
1294 break;
1295 case KW_attack_movement:
1296 thawer.get (op->attack_movement);
1297 break;
1298 case KW_move_state:
1299 thawer.get (op->move_status);
1300 break;
1301 case KW_expmul:
1302 thawer.get (op->expmul);
1303 break;
1304 case KW_glow_radius:
1305 thawer.get (op->glow_radius);
1306 break;
1307 case KW_weapontype:
1308 thawer.get (op->weapontype);
1309 break;
1310 case KW_tooltype:
1311 thawer.get (op->tooltype);
1312 break;
1313 case KW_casting_time:
1314 thawer.get (op->casting_time);
1315 break;
1316 case KW_elevation:
1317 thawer.get (op->elevation);
1318 break;
1319 case KW_smoothlevel:
1320 thawer.get (op->smoothlevel);
1321 break;
1322 case KW_client_type:
1323 thawer.get (op->client_type);
1324 break;
1325 case KW_duration:
1326 thawer.get (op->duration);
1327 break;
1328 case KW_range:
1329 thawer.get (op->range);
1330 break;
1331 case KW_range_modifier:
1332 thawer.get (op->range_modifier);
1333 break;
1334 case KW_dam_modifier:
1335 thawer.get (op->dam_modifier);
1336 break;
1337 case KW_duration_modifier:
1338 thawer.get (op->duration_modifier);
1339 break;
1340 960
1341 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 961 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1342 //TODO: parse from other include files 962 //TODO: parse from other include files
1343 case KW_body_range: 963 case KW_body_range: thawer.get (op->body_info[0]); break;
1344 thawer.get (op->body_info[0]); 964 case KW_body_arm: thawer.get (op->body_info[1]); break;
1345 break; 965 case KW_body_torso: thawer.get (op->body_info[2]); break;
1346 case KW_body_arm: 966 case KW_body_head: thawer.get (op->body_info[3]); break;
1347 thawer.get (op->body_info[1]); 967 case KW_body_neck: thawer.get (op->body_info[4]); break;
1348 break; 968 case KW_body_skill: thawer.get (op->body_info[5]); break;
1349 case KW_body_torso: 969 case KW_body_finger: thawer.get (op->body_info[6]); break;
1350 thawer.get (op->body_info[2]); 970 case KW_body_shoulder: thawer.get (op->body_info[7]); break;
1351 break; 971 case KW_body_foot: thawer.get (op->body_info[8]); break;
1352 case KW_body_head: 972 case KW_body_hand: thawer.get (op->body_info[9]); break;
1353 thawer.get (op->body_info[3]); 973 case KW_body_wrist: thawer.get (op->body_info[10]); break;
1354 break; 974 case KW_body_waist: thawer.get (op->body_info[11]); break;
1355 case KW_body_neck:
1356 thawer.get (op->body_info[4]);
1357 break;
1358 case KW_body_skill:
1359 thawer.get (op->body_info[5]);
1360 break;
1361 case KW_body_finger:
1362 thawer.get (op->body_info[6]);
1363 break;
1364 case KW_body_shoulder:
1365 thawer.get (op->body_info[7]);
1366 break;
1367 case KW_body_foot:
1368 thawer.get (op->body_info[8]);
1369 break;
1370 case KW_body_hand:
1371 thawer.get (op->body_info[9]);
1372 break;
1373 case KW_body_wrist:
1374 thawer.get (op->body_info[10]);
1375 break;
1376 case KW_body_waist:
1377 thawer.get (op->body_info[11]);
1378 break;
1379 case KW_can_apply: 975 case KW_can_apply:
1380 break; 976 break;
1381 977
1382 case KW_connected: 978 case KW_connected:
1383 add_button_link (op, op->map, thawer.get_sint32 ()); 979 add_button_link (op, op->map, thawer.get_sint32 ());
… …
1485 * override values and in c_wiz to mutate values. 1081 * override values and in c_wiz to mutate values.
1486 */ 1082 */
1487int 1083int
1488set_variable (object *op, char *buf) 1084set_variable (object *op, char *buf)
1489{ 1085{
1490 return 0;
1491#if 0
1492 int retval;
1493 object_thawer thawer (0); 1086 object_thawer thawer (buf, (AV *)0);
1494 1087
1495 strcpy (msgbuf, "");
1496 strcpy (lorebuf, "");
1497 retval = parse_object (op, thawer, 0); 1088 return parse_object (op, thawer, 0);
1498 yy_switch_to_buffer (yycurbuf);
1499 yy_delete_buffer (yybufstate);
1500 yy_pop_state ();
1501 return retval;
1502#endif
1503} 1089}
1504
1505/* This array equates the FLAG_ values with the V_ values. Use -1 to
1506 * put gaps in the array that should not be processed.
1507 * The order matches the order of the define values in 'define.h'.
1508 */
1509
1510/* This is a list of pointers that correspond to the FLAG_.. values.
1511 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1512 * the 15'th element of this array should match that name.
1513 * If an entry is NULL, that is a flag not to loaded/saved.
1514 */
1515static const char *const flag_names[NUM_FLAGS + 1] = {
1516 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1517 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1518 "is_animated", NULL /* slow_move */ ,
1519 NULL /* flying */ , "monster", "friendly", "generator",
1520 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1521 "see_invisible", "can_roll", "overlay_floor",
1522 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1523 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1524 "changing", "splitting", "hitback", "startequip",
1525 "blocksview", "undead", "scared", "unaggressive",
1526 "reflect_missile", "reflect_spell", /* 40 */
1527 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1528 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1529 "pick_up", "unique", "no_drop", /* 50 */
1530 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1531 "can_use_bow", "can_use_armour", "can_use_weapon",
1532 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1533 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1534 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1535 "stealth", NULL, NULL, "cursed", "damned",
1536 "see_anywhere", "known_magical", "known_cursed",
1537 "can_use_skill", "been_applied", /* 80 */
1538 "has_ready_scroll", "can_use_rod", NULL,
1539 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1540 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1541 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1542 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1543 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1544 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1545 NULL
1546};
1547
1548 1090
1549/* 1091/*
1550 * Initialises the array of variable-names. Needed before any 1092 * Initialises the array of variable-names. Needed before any
1551 * objects can be loaded. Called by init_library(). 1093 * objects can be loaded. Called by init_library().
1552 */ 1094 */
… …
1609 1151
1610// compare *op against *tmp and output differences 1152// compare *op against *tmp and output differences
1611void 1153void
1612put (object_freezer &f, object *op, object *tmp) 1154put (object_freezer &f, object *op, object *tmp)
1613{ 1155{
1156 static const keyword resist_save[NROFATTACKS] = {
1157# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1158# include "attackinc.h"
1159# undef def
1160 };
1161
1162 /* This is a list of keywords that correspond to the FLAG_.. values.
1163 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1164 * the 15'th element of this array should match that name.
1165 * If an entry is NULL, that is a flag not to loaded/saved.
1166 */
1167 static const keyword flag_names [NUM_FLAGS] = {
1168 KW_alive,
1169 KW_wiz,
1170 KW_NULL,
1171 KW_NULL,
1172 KW_was_wiz,
1173 KW_applied,
1174 KW_unpaid,
1175 KW_can_use_shield,
1176 KW_no_pick,
1177 KW_NULL, // walk_on
1178 KW_NULL, // no_pass
1179 /* 10 */
1180 KW_is_animated,
1181 KW_NULL, // slow_move
1182 KW_NULL, // flying
1183 KW_monster,
1184 KW_friendly,
1185 KW_generator,
1186 KW_is_thrown,
1187 KW_auto_apply,
1188 KW_treasure,
1189 KW_player_sold,
1190 /* 20 */
1191 KW_see_invisible,
1192 KW_can_roll,
1193 KW_overlay_floor,
1194 KW_is_turnable,
1195 KW_NULL, // walk_off
1196 KW_NULL, // fly_on
1197 KW_NULL, // fly_off
1198 KW_is_used_up,
1199 KW_identified,
1200 KW_reflecting,
1201 /* 30 */
1202 KW_changing,
1203 KW_splitting,
1204 KW_hitback,
1205 KW_startequip,
1206 KW_blocksview,
1207 KW_undead,
1208 KW_scared,
1209 KW_unaggressive,
1210 KW_reflect_missile,
1211 KW_reflect_spell,
1212 /* 40 */
1213 KW_no_magic,
1214 KW_no_fix_player,
1215 KW_is_lightable,
1216 KW_tear_down,
1217 KW_run_away,
1218 KW_NULL, // pass_thru
1219 KW_NULL, // an_pass_thru
1220 KW_pick_up,
1221 KW_unique,
1222 KW_no_drop,
1223 /* 50 */
1224 KW_NULL, // wizcast
1225 KW_can_cast_spell,
1226 KW_can_use_scroll,
1227 KW_can_use_range,
1228 KW_can_use_bow,
1229 KW_can_use_armour,
1230 KW_can_use_weapon,
1231 KW_can_use_ring,
1232 KW_has_ready_range,
1233 KW_has_ready_bow,
1234 /* 60 */
1235 KW_xrays,
1236 KW_NULL,
1237 KW_is_floor,
1238 KW_lifesave,
1239 KW_no_strength,
1240 KW_sleep,
1241 KW_stand_still,
1242 KW_random_move,
1243 KW_only_attack,
1244 KW_confused,
1245 /* 70 */
1246 KW_stealth,
1247 KW_NULL,
1248 KW_NULL,
1249 KW_cursed,
1250 KW_damned,
1251 KW_see_anywhere,
1252 KW_known_magical,
1253 KW_known_cursed,
1254 KW_can_use_skill,
1255 KW_been_applied,
1256 /* 80 */
1257 KW_has_ready_scroll,
1258 KW_can_use_rod,
1259 KW_NULL,
1260 KW_can_use_horn,
1261 KW_make_invisible,
1262 KW_inv_locked,
1263 KW_is_wooded,
1264 KW_is_hilly,
1265 KW_has_ready_skill,
1266 KW_has_ready_weapon,
1267 /* 90 */
1268 KW_no_skill_ident,
1269 KW_is_blind,
1270 KW_can_see_in_dark,
1271 KW_is_cauldron,
1272 KW_NULL,
1273 KW_no_steal,
1274 KW_one_hit,
1275 KW_NULL,
1276 KW_berserk,
1277 KW_neutral,
1278 /* 100 */
1279 KW_no_attack,
1280 KW_no_damage,
1281 KW_NULL,
1282 KW_NULL,
1283 KW_activate_on_push,
1284 KW_activate_on_release,
1285 KW_is_water,
1286 KW_use_content_on_gen,
1287 KW_NULL,
1288 KW_is_buildable,
1289 /* 110 */
1290 };
1291
1614 int i; 1292 int i;
1615 1293
1616 /* This saves the key/value lists. We do it first so that any 1294 /* This saves the key/value lists. We do it first so that any
1617 * keys that match field names will be overwritten by the loader. 1295 * keys that match field names will be overwritten by the loader.
1618 */ 1296 */
… …
1620 { 1298 {
1621 /* Find the field in the opposing member. */ 1299 /* Find the field in the opposing member. */
1622 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1300 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1623 1301
1624 /* If there's no partnering field, or it's got a different value, save our field. */ 1302 /* If there's no partnering field, or it's got a different value, save our field. */
1625 if (arch_field == NULL || my_field->value != arch_field->value) 1303 if (!arch_field || my_field->value != arch_field->value)
1626 f.put (my_field->key, my_field->value); 1304 f.put (my_field->key, my_field->value);
1627 } 1305 }
1628 1306
1629 /* We don't need to worry about the arch's extra fields - they 1307 /* We don't need to worry about the arch's extra fields - they
1630 * will get taken care of the copy_object function. 1308 * will get taken care of the copy_to method.
1631 */ 1309 */
1632 1310
1633 { 1311 {
1634 char uids[64]; 1312 char uids[64];
1635 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1313 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1651 if (op->lore != tmp->lore) 1329 if (op->lore != tmp->lore)
1652 f.put (KW_lore, KW_endlore, op->lore); 1330 f.put (KW_lore, KW_endlore, op->lore);
1653 1331
1654 CMP_OUT (other_arch); 1332 CMP_OUT (other_arch);
1655 CMP_OUT (face); 1333 CMP_OUT (face);
1656
1657 if (!op->face || !op->face->name)
1658 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1659 1334
1660 if (op->animation_id != tmp->animation_id) 1335 if (op->animation_id != tmp->animation_id)
1661 if (op->animation_id) 1336 if (op->animation_id)
1662 { 1337 {
1663 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1338 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1823 save_object (fp, tmp, flag); 1498 save_object (fp, tmp, flag);
1824 old = tmp; 1499 old = tmp;
1825 } 1500 }
1826 1501
1827 if (!(flag & 2)) 1502 if (!(flag & 2))
1828 { 1503 op->destroy ();
1829 remove_ob (op);
1830 free_object (op);
1831 }
1832 1504
1833 fp.put (op); 1505 fp.put (op);
1834 fprintf (fp, "end\n"); 1506 fprintf (fp, "end\n");
1835} 1507}
1836 1508

Diff Legend

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