… | |
… | |
27 | variable. */ |
27 | variable. */ |
28 | |
28 | |
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <loader.h> |
30 | #include <loader.h> |
31 | #include <sproto.h> |
31 | #include <sproto.h> |
32 | |
|
|
33 | ///////////////////////////////////////////////////////////////////////////// |
|
|
34 | |
|
|
35 | loader_base::~loader_base () |
|
|
36 | { |
|
|
37 | } |
|
|
38 | |
|
|
39 | // the base class warns about and skips everything |
|
|
40 | archetype * |
|
|
41 | loader_base::get_arch (const char *name) |
|
|
42 | { |
|
|
43 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n", |
|
|
44 | filename, name); |
|
|
45 | |
|
|
46 | return new archetype; |
|
|
47 | } |
|
|
48 | |
|
|
49 | object * |
|
|
50 | loader_base::get_object (const char *name) |
|
|
51 | { |
|
|
52 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n", |
|
|
53 | filename, name); |
|
|
54 | |
|
|
55 | return object::create (); |
|
|
56 | } |
|
|
57 | |
|
|
58 | player * |
|
|
59 | loader_base::get_player () |
|
|
60 | { |
|
|
61 | LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n", |
|
|
62 | filename); |
|
|
63 | |
|
|
64 | return player::create (); |
|
|
65 | } |
|
|
66 | |
|
|
67 | region * |
|
|
68 | loader_base::get_region (const char *name) |
|
|
69 | { |
|
|
70 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n", |
|
|
71 | filename, name); |
|
|
72 | |
|
|
73 | return new region; |
|
|
74 | } |
|
|
75 | |
|
|
76 | facetile * |
|
|
77 | loader_base::get_face (const char *name) |
|
|
78 | { |
|
|
79 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n", |
|
|
80 | filename, name); |
|
|
81 | |
|
|
82 | return new facetile; |
|
|
83 | } |
|
|
84 | |
|
|
85 | treasurelist * |
|
|
86 | loader_base::get_treasure (const char *name, bool one) |
|
|
87 | { |
|
|
88 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n", |
|
|
89 | filename, name); |
|
|
90 | |
|
|
91 | return new treasurelist;//D |
|
|
92 | } |
|
|
93 | |
|
|
94 | animation * |
|
|
95 | loader_base::get_animation (const char *name) |
|
|
96 | { |
|
|
97 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n", |
|
|
98 | filename, name); |
|
|
99 | |
|
|
100 | return new animation; |
|
|
101 | } |
|
|
102 | |
|
|
103 | void |
|
|
104 | loader_base::put_arch (archetype *arch) |
|
|
105 | { |
|
|
106 | delete arch; |
|
|
107 | } |
|
|
108 | |
|
|
109 | void |
|
|
110 | loader_base::put_object (object *op) |
|
|
111 | { |
|
|
112 | op->destroy (); |
|
|
113 | } |
|
|
114 | |
|
|
115 | void |
|
|
116 | loader_base::put_player (player *pl) |
|
|
117 | { |
|
|
118 | delete pl; |
|
|
119 | } |
|
|
120 | |
|
|
121 | void |
|
|
122 | loader_base::put_region (region *region) |
|
|
123 | { |
|
|
124 | delete region; |
|
|
125 | } |
|
|
126 | |
|
|
127 | void |
|
|
128 | loader_base::put_face (facetile *face) |
|
|
129 | { |
|
|
130 | delete face; |
|
|
131 | } |
|
|
132 | |
|
|
133 | void |
|
|
134 | loader_base::put_treasure (treasurelist *treasure) |
|
|
135 | { |
|
|
136 | delete treasure; |
|
|
137 | } |
|
|
138 | |
|
|
139 | void |
|
|
140 | loader_base::put_animation (animation *anim) |
|
|
141 | { |
|
|
142 | delete anim; |
|
|
143 | } |
|
|
144 | |
|
|
145 | ///////////////////////////////////////////////////////////////////////////// |
|
|
146 | |
|
|
147 | bool loader_base::parse (object_thawer &thawer) |
|
|
148 | { |
|
|
149 | for (;;) |
|
|
150 | { |
|
|
151 | keyword kw = thawer.get_kv (); |
|
|
152 | |
|
|
153 | switch (kw) |
|
|
154 | { |
|
|
155 | case KW_region: |
|
|
156 | { |
|
|
157 | region *rgn = get_region (thawer.get_str ()); |
|
|
158 | |
|
|
159 | if (!parse_region (thawer, rgn)) |
|
|
160 | { |
|
|
161 | delete rgn; |
|
|
162 | return false; |
|
|
163 | } |
|
|
164 | |
|
|
165 | put_region (rgn); |
|
|
166 | } |
|
|
167 | break; |
|
|
168 | |
|
|
169 | case KW_EOF: |
|
|
170 | return true; |
|
|
171 | |
|
|
172 | default: |
|
|
173 | if (!thawer.parse_error (kw, "resource file")) |
|
|
174 | return false; |
|
|
175 | } |
|
|
176 | } |
|
|
177 | } |
|
|
178 | |
|
|
179 | bool loader_base::load (const char *filename) |
|
|
180 | { |
|
|
181 | this->filename = filename; |
|
|
182 | |
|
|
183 | object_thawer fp (filename); |
|
|
184 | |
|
|
185 | if (!fp) |
|
|
186 | return false; |
|
|
187 | |
|
|
188 | return parse (fp); |
|
|
189 | } |
|
|
190 | |
32 | |
191 | ///////////////////////////////////////////////////////////////////////////// |
33 | ///////////////////////////////////////////////////////////////////////////// |
192 | |
34 | |
193 | /* Maps the MOVE_* values to names */ |
35 | /* Maps the MOVE_* values to names */ |
194 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
… | |
… | |
631 | } |
473 | } |
632 | } |
474 | } |
633 | } |
475 | } |
634 | |
476 | |
635 | #define GET_FLAG(op,flag) \ |
477 | #define GET_FLAG(op,flag) \ |
636 | if (thawer.get_sint32 ()) \ |
478 | if (f.get_sint32 ()) \ |
637 | SET_FLAG (op, flag); \ |
479 | SET_FLAG (op, flag); \ |
638 | else \ |
480 | else \ |
639 | CLEAR_FLAG (op, flag) \ |
481 | CLEAR_FLAG (op, flag) \ |
640 | |
482 | |
641 | int |
483 | bool |
642 | parse_object (object *op, object_thawer &thawer, int map_flags) |
484 | object::parse_kv (object_thawer &f) |
643 | { |
485 | { |
644 | bool ismore = 0; |
486 | assert (f.kw == KW_object || f.kw == KW_arch); |
|
|
487 | |
|
|
488 | if (f.kw == KW_object) |
|
|
489 | f.get (name); // preset name from object name |
|
|
490 | |
|
|
491 | f.next (); |
|
|
492 | |
645 | object *op_inv = op->inv; |
493 | object *op_inv = inv; |
646 | |
494 | |
647 | for (;;) |
495 | for (;;) |
648 | { |
496 | { |
649 | keyword kw = thawer.get_kv (); |
|
|
650 | |
|
|
651 | switch (kw) |
497 | switch (f.kw) |
652 | { |
498 | { |
653 | case KW_Object: // uppercase alias |
|
|
654 | case KW_object: |
|
|
655 | thawer.get (op->name); |
|
|
656 | |
|
|
657 | if (op->arch) |
|
|
658 | op->arch->name = op->name; |
|
|
659 | |
|
|
660 | break; |
|
|
661 | |
|
|
662 | case KW_uuid: |
499 | case KW_uuid: |
663 | if (const char *s = thawer.get_str ()) |
500 | if (const char *s = f.get_str ()) |
664 | { |
501 | { |
665 | unsigned int version; |
502 | unsigned int version; |
666 | unsigned long long seq; |
503 | unsigned long long seq; |
667 | |
504 | |
668 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
505 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
669 | { |
506 | { |
670 | op->uuid.seq = seq; |
507 | uuid.seq = seq; |
671 | break; |
508 | break; |
672 | } |
509 | } |
673 | } |
510 | } |
674 | |
511 | |
675 | op->uuid = gen_uuid (); |
512 | uuid = gen_uuid (); |
676 | break; |
513 | break; |
677 | |
514 | |
678 | case KW_oid: |
515 | case KW_oid: |
679 | thawer.get (op, thawer.get_sint32 ()); |
516 | f.get (this, f.get_sint32 ()); |
680 | break; |
517 | break; |
681 | |
518 | |
682 | case KW_name: thawer.get (op->name); break; |
519 | case KW_name: f.get (name); break; |
683 | case KW_name_pl: thawer.get (op->name_pl); break; |
520 | case KW_name_pl: f.get (name_pl); break; |
684 | case KW_title: thawer.get (op->title); break; |
521 | case KW_title: f.get (title); break; |
685 | case KW_custom_name: thawer.get (op->custom_name); break; |
522 | case KW_custom_name: f.get (custom_name); break; |
686 | |
523 | |
687 | case KW_attach: thawer.get_ornull (op->attach); break; |
524 | case KW_attach: f.get_ornull (attach); break; |
688 | case KW_skill: thawer.get_ornull (op->skill); break; |
525 | case KW_skill: f.get_ornull (skill); break; |
689 | case KW_race: thawer.get_ornull (op->race); break; |
526 | case KW_race: f.get_ornull (race); break; |
690 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
527 | case KW_slaying: f.get_ornull (slaying); break; |
691 | |
528 | |
692 | case KW_arch: |
529 | case KW_arch: |
693 | { |
530 | { |
694 | const char *str = thawer.get_str (); |
|
|
695 | |
|
|
696 | if (op->arch) |
|
|
697 | { |
|
|
698 | /* If op->arch has been set, then this new object |
|
|
699 | * must be part of the inventory. So process |
|
|
700 | * appropriately. |
|
|
701 | */ |
|
|
702 | archetype *arch = archetype::find (str); |
|
|
703 | |
|
|
704 | object *tmp; |
|
|
705 | |
|
|
706 | if (arch) |
|
|
707 | tmp = arch_to_object (arch); |
|
|
708 | else |
|
|
709 | { |
|
|
710 | tmp = object::create (); |
531 | object *tmp = object::read (f); |
711 | /* record the name of the broken object */ |
|
|
712 | //TODO: but do not log??? |
|
|
713 | tmp->name = str; |
|
|
714 | } |
|
|
715 | |
|
|
716 | // decativate the object we, as we are still going |
|
|
717 | // to read the speed value. Objects should be activated |
|
|
718 | // when the map, object or player is completly loaded. |
|
|
719 | tmp->deactivate (); |
532 | tmp->deactivate (); |
720 | |
533 | |
721 | parse_object (tmp, thawer, map_flags); |
|
|
722 | |
|
|
723 | if (tmp->arch) |
|
|
724 | { |
534 | { |
725 | // was: insert_ob_in_ob (tmp, op); |
535 | // was: insert_ob_in_ob (tmp, op); |
726 | // but manually adding it can improve map loading times a lot |
536 | // but manually adding it can improve map loading times a lot |
727 | // also, appending instead of prepending keeps the |
537 | // also, appending instead of prepending keeps the |
728 | // save ordering the same between repeated load/saves. |
538 | // save ordering the same between repeated load/saves. |
729 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
539 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
730 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
540 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
731 | |
541 | |
732 | if (!op_inv) |
542 | if (!op_inv) |
733 | { |
543 | { |
734 | op->inv = tmp; |
|
|
735 | tmp->above = 0; |
|
|
736 | } |
|
|
737 | else |
|
|
738 | { |
|
|
739 | while (op_inv->below) |
|
|
740 | op_inv = op_inv->below; |
|
|
741 | |
|
|
742 | op_inv->below = tmp; |
|
|
743 | tmp->above = op_inv; |
|
|
744 | } |
|
|
745 | |
|
|
746 | tmp->below = 0; |
|
|
747 | tmp->env = op; |
|
|
748 | op_inv = tmp; |
544 | inv = tmp; |
|
|
545 | tmp->above = 0; |
749 | } |
546 | } |
750 | else |
547 | else |
751 | { |
548 | { |
752 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
549 | while (op_inv->below) |
753 | tmp->destroy (); |
550 | op_inv = op_inv->below; |
|
|
551 | |
|
|
552 | op_inv->below = tmp; |
|
|
553 | tmp->above = op_inv; |
754 | } |
554 | } |
|
|
555 | |
|
|
556 | tmp->below = 0; |
|
|
557 | tmp->env = this; |
|
|
558 | op_inv = tmp; |
755 | } |
559 | } |
756 | else |
|
|
757 | { |
|
|
758 | /* This is the actual archetype definition then */ |
|
|
759 | op->arch = archetype::find (str); |
|
|
760 | |
|
|
761 | if (op->arch) |
|
|
762 | { |
|
|
763 | op->arch->clone.copy_to (op); |
|
|
764 | // copy_to activates, this should be fixed properly |
|
|
765 | op->deactivate (); |
|
|
766 | } |
|
|
767 | else if (!arch_init) |
|
|
768 | /* record the name of the broken object */ |
|
|
769 | op->name = str; |
|
|
770 | } |
|
|
771 | } |
560 | } |
772 | break; |
561 | continue; |
773 | |
562 | |
774 | case KW_other_arch: |
563 | case KW_other_arch: |
775 | op->other_arch = archetype::find (thawer.get_str ()); |
564 | other_arch = archetype::find (f.get_str ()); |
776 | break; |
565 | break; |
777 | |
566 | |
778 | case KW_animation: |
567 | case KW_animation: |
779 | { |
568 | { |
780 | CLEAR_FLAG (op, FLAG_ANIMATE); |
569 | CLEAR_FLAG (this, FLAG_ANIMATE); |
781 | op->animation_id = 0; |
570 | animation_id = 0; |
782 | |
571 | |
783 | const char *str = thawer.get_str (); |
572 | const char *str = f.get_str (); |
784 | if (str && (op->animation_id = find_animation (str))) |
573 | if (str && (animation_id = find_animation (str))) |
785 | SET_FLAG (op, FLAG_ANIMATE); |
574 | SET_FLAG (this, FLAG_ANIMATE); |
786 | } |
575 | } |
787 | break; |
576 | break; |
788 | |
577 | |
789 | case KW_last_heal: thawer.get (op->last_heal); break; |
578 | case KW_last_heal: f.get (last_heal); break; |
790 | case KW_last_sp: thawer.get (op->last_sp); break; |
579 | case KW_last_sp: f.get (last_sp); break; |
791 | case KW_last_grace: thawer.get (op->last_grace); break; |
580 | case KW_last_grace: f.get (last_grace); break; |
792 | case KW_last_eat: thawer.get (op->last_eat); break; |
581 | case KW_last_eat: f.get (last_eat); break; |
793 | case KW_speed_left: thawer.get (op->speed_left); break; |
582 | case KW_speed_left: f.get (speed_left); break; |
794 | |
583 | |
795 | case KW_speed: |
584 | case KW_speed: |
796 | thawer.get (op->speed); |
585 | f.get (speed); |
797 | |
586 | |
798 | //TODO: maybe do in check_object |
587 | //TODO: maybe do in check_object |
799 | // removed check for style maps |
588 | // removed check for style maps |
800 | if (op->speed < 0) |
589 | if (speed < 0) |
801 | op->speed_left = op->speed_left - rndm (); |
590 | speed_left = speed_left - rndm (); |
802 | |
591 | |
803 | break; |
592 | break; |
804 | |
593 | |
805 | case KW_slow_move: |
594 | case KW_slow_move: |
806 | op->move_slow |= MOVE_WALK; |
595 | move_slow |= MOVE_WALK; |
807 | thawer.get (op->move_slow_penalty); |
596 | f.get (move_slow_penalty); |
808 | break; |
597 | break; |
809 | |
598 | |
810 | case KW_face: |
599 | case KW_face: |
811 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
600 | face = &new_faces[FindFace (f.get_str (), 0)]; |
812 | break; |
601 | break; |
813 | |
602 | |
814 | case KW_x: thawer.get (op->x); break; |
603 | case KW_x: f.get (x); break; |
815 | case KW_y: thawer.get (op->y); break; |
604 | case KW_y: f.get (y); break; |
816 | |
605 | |
817 | case KW_Str: // uppercase alias |
606 | case KW_Str: // uppercase alias |
818 | case KW_str: thawer.get (op->stats.Str); break; |
607 | case KW_str: f.get (stats.Str); break; |
819 | case KW_Dex: // uppercase alias |
608 | case KW_Dex: // uppercase alias |
820 | case KW_dex: thawer.get (op->stats.Dex); break; |
609 | case KW_dex: f.get (stats.Dex); break; |
821 | case KW_Con: // uppercase alias |
610 | case KW_Con: // uppercase alias |
822 | case KW_con: thawer.get (op->stats.Con); break; |
611 | case KW_con: f.get (stats.Con); break; |
823 | case KW_Wis: // uppercase alias |
612 | case KW_Wis: // uppercase alias |
824 | case KW_wis: thawer.get (op->stats.Wis); break; |
613 | case KW_wis: f.get (stats.Wis); break; |
825 | case KW_Cha: // uppercase alias |
614 | case KW_Cha: // uppercase alias |
826 | case KW_cha: thawer.get (op->stats.Cha); break; |
615 | case KW_cha: f.get (stats.Cha); break; |
827 | case KW_Int: // uppercase alias |
616 | case KW_Int: // uppercase alias |
828 | case KW_int: thawer.get (op->stats.Int); break; |
617 | case KW_int: f.get (stats.Int); break; |
829 | case KW_Pow: // uppercase alias |
618 | case KW_Pow: // uppercase alias |
830 | case KW_pow: thawer.get (op->stats.Pow); break; |
619 | case KW_pow: f.get (stats.Pow); break; |
831 | |
620 | |
832 | case KW_hp: thawer.get (op->stats.hp); break; |
621 | case KW_hp: f.get (stats.hp); break; |
833 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
622 | case KW_maxhp: f.get (stats.maxhp); break; |
834 | case KW_sp: thawer.get (op->stats.sp); break; |
623 | case KW_sp: f.get (stats.sp); break; |
835 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
624 | case KW_maxsp: f.get (stats.maxsp); break; |
836 | case KW_grace: thawer.get (op->stats.grace); break; |
625 | case KW_grace: f.get (stats.grace); break; |
837 | case KW_maxgrace: thawer.get (op->stats.maxgrace); break; |
626 | case KW_maxgrace: f.get (stats.maxgrace); break; |
838 | |
627 | |
839 | case KW_exp: thawer.get (op->stats.exp); break; |
628 | case KW_exp: f.get (stats.exp); break; |
840 | case KW_perm_exp: thawer.get (op->perm_exp); break; |
629 | case KW_perm_exp: f.get (perm_exp); break; |
841 | case KW_food: thawer.get (op->stats.food); break; |
630 | case KW_food: f.get (stats.food); break; |
842 | case KW_dam: thawer.get (op->stats.dam); break; |
631 | case KW_dam: f.get (stats.dam); break; |
843 | case KW_wc: thawer.get (op->stats.wc); break; |
632 | case KW_wc: f.get (stats.wc); break; |
844 | case KW_ac: thawer.get (op->stats.ac); break; |
633 | case KW_ac: f.get (stats.ac); break; |
845 | case KW_nrof: thawer.get (op->nrof); break; |
634 | case KW_nrof: f.get (nrof); break; |
846 | case KW_level: thawer.get (op->level); break; |
635 | case KW_level: f.get (level); break; |
847 | case KW_direction: thawer.get (op->direction); break; |
636 | case KW_direction: f.get (direction); break; |
848 | case KW_type: thawer.get (op->type); break; |
637 | case KW_type: f.get (type); break; |
849 | case KW_subtype: thawer.get (op->subtype); break; |
638 | case KW_subtype: f.get (subtype); break; |
850 | case KW_value: thawer.get (op->value); break; |
639 | case KW_value: f.get (value); break; |
851 | case KW_weight: thawer.get (op->weight); break; |
640 | case KW_weight: f.get (weight); break; |
852 | case KW_carrying: thawer.get (op->carrying); break; |
641 | case KW_carrying: f.get (carrying); break; |
853 | case KW_attacktype: thawer.get (op->attacktype); break; |
642 | case KW_attacktype: f.get (attacktype); break; |
854 | case KW_path_attuned: thawer.get (op->path_attuned); break; |
643 | case KW_path_attuned: f.get (path_attuned); break; |
855 | case KW_path_repelled: thawer.get (op->path_repelled); break; |
644 | case KW_path_repelled: f.get (path_repelled); break; |
856 | case KW_path_denied: thawer.get (op->path_denied); break; |
645 | case KW_path_denied: f.get (path_denied); break; |
857 | case KW_invisible: thawer.get (op->invisible); break; |
646 | case KW_invisible: f.get (invisible); break; |
858 | case KW_magic: thawer.get (op->magic); break; |
647 | case KW_magic: f.get (magic); break; |
859 | case KW_state: thawer.get (op->state); break; |
648 | case KW_state: f.get (state); break; |
860 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
649 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
861 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
650 | case KW_material: f.get (materials); break; //TODO: nuke |
862 | case KW_materialname: thawer.get (op->materialname); break; |
651 | case KW_materialname: f.get (materialname); break; |
863 | |
652 | |
864 | /* These are the new values */ |
653 | /* These are the new values */ |
865 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
654 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
866 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
655 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
867 | case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; |
656 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
868 | case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; |
657 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
869 | case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; |
658 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
870 | case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; |
659 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
871 | |
660 | |
872 | /* These are all legacy - any new objects should use the move_ .. values */ |
661 | /* These are all legacy - any new objects should use the move_ .. values */ |
873 | case KW_no_pass: |
662 | case KW_no_pass: |
874 | { |
663 | { |
875 | if (thawer.get_sint32 ()) |
664 | if (f.get_sint32 ()) |
876 | op->move_block = MOVE_ALL; |
665 | move_block = MOVE_ALL; |
877 | else |
666 | else |
878 | op->move_block = 0; |
667 | move_block = 0; |
879 | } |
668 | } |
880 | |
669 | |
881 | break; |
670 | break; |
882 | |
671 | |
883 | /* These are all legacy - any new objects should use the move_ .. values */ |
672 | /* These are all legacy - any new objects should use the move_ .. values */ |
884 | case KW_walk_on: |
673 | case KW_walk_on: |
885 | { |
674 | { |
886 | if (thawer.get_sint32 ()) |
675 | if (f.get_sint32 ()) |
887 | op->move_on |= MOVE_WALK; |
676 | move_on |= MOVE_WALK; |
888 | else |
677 | else |
889 | op->move_on &= ~MOVE_WALK; |
678 | move_on &= ~MOVE_WALK; |
890 | } |
679 | } |
891 | |
680 | |
892 | break; |
681 | break; |
893 | |
682 | |
894 | /* These are all legacy - any new objects should use the move_ .. values */ |
683 | /* These are all legacy - any new objects should use the move_ .. values */ |
895 | case KW_walk_off: |
684 | case KW_walk_off: |
896 | { |
685 | { |
897 | if (thawer.get_sint32 ()) |
686 | if (f.get_sint32 ()) |
898 | op->move_off |= MOVE_WALK; |
687 | move_off |= MOVE_WALK; |
899 | else |
688 | else |
900 | op->move_off &= ~MOVE_WALK; |
689 | move_off &= ~MOVE_WALK; |
901 | } |
690 | } |
902 | break; |
691 | break; |
903 | |
692 | |
904 | /* These are all legacy - any new objects should use the move_ .. values */ |
693 | /* These are all legacy - any new objects should use the move_ .. values */ |
905 | case KW_fly_on: |
694 | case KW_fly_on: |
906 | { |
695 | { |
907 | if (thawer.get_sint32 ()) |
696 | if (f.get_sint32 ()) |
908 | op->move_on |= MOVE_FLY_LOW; |
697 | move_on |= MOVE_FLY_LOW; |
909 | else |
698 | else |
910 | op->move_on &= ~MOVE_FLY_LOW; |
699 | move_on &= ~MOVE_FLY_LOW; |
911 | } |
700 | } |
912 | break; |
701 | break; |
913 | |
702 | |
914 | /* These are all legacy - any new objects should use the move_ .. values */ |
703 | /* These are all legacy - any new objects should use the move_ .. values */ |
915 | case KW_fly_off: |
704 | case KW_fly_off: |
916 | { |
705 | { |
917 | if (thawer.get_sint32 ()) |
706 | if (f.get_sint32 ()) |
918 | op->move_off |= MOVE_FLY_LOW; |
707 | move_off |= MOVE_FLY_LOW; |
919 | else |
708 | else |
920 | op->move_off &= ~MOVE_FLY_LOW; |
709 | move_off &= ~MOVE_FLY_LOW; |
921 | } |
710 | } |
922 | break; |
711 | break; |
923 | |
712 | |
924 | //TODO: remove these after converting archetypes |
713 | //TODO: remove these after converting archetypes |
925 | case KW_can_use_wand: |
714 | case KW_can_use_wand: |
926 | GET_FLAG (op, FLAG_USE_RANGE); |
715 | GET_FLAG (this, FLAG_USE_RANGE); |
927 | break; |
716 | break; |
928 | |
717 | |
929 | /* These are all legacy - any new objects should use the move_ .. values */ |
718 | /* These are all legacy - any new objects should use the move_ .. values */ |
930 | case KW_flying: |
719 | case KW_flying: |
931 | { |
720 | { |
932 | if (thawer.get_sint32 ()) |
721 | if (f.get_sint32 ()) |
933 | op->move_type |= MOVE_FLY_LOW; |
722 | move_type |= MOVE_FLY_LOW; |
934 | else |
723 | else |
935 | op->move_type &= ~MOVE_FLY_LOW; |
724 | move_type &= ~MOVE_FLY_LOW; |
936 | } |
725 | } |
937 | break; |
726 | break; |
938 | |
727 | |
939 | |
728 | |
940 | case KW_identified: |
729 | case KW_identified: |
941 | GET_FLAG (op, FLAG_IDENTIFIED); |
730 | GET_FLAG (this, FLAG_IDENTIFIED); |
942 | //TODO: move to check_object or so |
731 | //TODO: move to check_object or so |
943 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
732 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
944 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
733 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
945 | |
734 | |
946 | break; |
735 | break; |
947 | |
736 | |
948 | case KW_wiz: |
737 | case KW_wiz: |
949 | GET_FLAG (op, FLAG_WIZ); |
738 | GET_FLAG (this, FLAG_WIZ); |
950 | //TODO: move to check_object |
739 | //TODO: move to check_object |
951 | if (QUERY_FLAG (op, FLAG_WIZ)) |
740 | if (QUERY_FLAG (this, FLAG_WIZ)) |
952 | { |
741 | { |
953 | SET_FLAG (op, FLAG_WAS_WIZ); |
742 | SET_FLAG (this, FLAG_WAS_WIZ); |
954 | SET_FLAG (op, FLAG_WIZPASS); |
743 | SET_FLAG (this, FLAG_WIZPASS); |
955 | SET_FLAG (op, FLAG_WIZCAST); |
744 | SET_FLAG (this, FLAG_WIZCAST); |
956 | } |
745 | } |
957 | else |
746 | else |
958 | { |
747 | { |
959 | CLEAR_FLAG (op, FLAG_WIZPASS); |
748 | CLEAR_FLAG (this, FLAG_WIZPASS); |
960 | CLEAR_FLAG (op, FLAG_WIZCAST); |
749 | CLEAR_FLAG (this, FLAG_WIZCAST); |
961 | } |
750 | } |
962 | break; |
751 | break; |
963 | |
752 | |
964 | case KW_friendly: |
753 | case KW_friendly: |
965 | if (thawer.get_sint32 ()) |
754 | if (f.get_sint32 ()) |
966 | if (op->type != PLAYER) |
755 | if (type != PLAYER) |
967 | add_friendly_object (op); |
756 | add_friendly_object (this); |
968 | |
757 | |
969 | break; |
758 | break; |
970 | |
759 | |
971 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
760 | case KW_monster: GET_FLAG (this, FLAG_MONSTER); break; |
972 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
761 | case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break; |
973 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
762 | case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break; |
974 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
763 | case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break; |
975 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
764 | case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break; |
976 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
765 | case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break; |
977 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
766 | case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break; |
978 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
767 | case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break; |
979 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
768 | case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break; |
980 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
769 | case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break; |
981 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
770 | case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break; |
982 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
771 | case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break; |
983 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
772 | case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break; |
984 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
773 | case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break; |
985 | case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; |
774 | case KW_alive: GET_FLAG (this, FLAG_ALIVE); break; |
986 | case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; |
775 | case KW_applied: GET_FLAG (this, FLAG_APPLIED); break; |
987 | case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; |
776 | case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break; |
988 | case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; |
777 | case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break; |
989 | case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; |
778 | case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break; |
990 | case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; |
779 | case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break; |
991 | case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; |
780 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
992 | case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; |
781 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
993 | case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; |
782 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
994 | case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; |
783 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
995 | case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; |
784 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
996 | case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; |
785 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
997 | case KW_scared: GET_FLAG (op, FLAG_SCARED); break; |
786 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
998 | case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; |
787 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
999 | case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; |
788 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
1000 | case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; |
789 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
1001 | case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; |
790 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
1002 | case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; |
791 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
1003 | case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
792 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1004 | case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; |
793 | case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break; |
1005 | case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; |
794 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
1006 | case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; |
795 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
1007 | case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; |
796 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
1008 | case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; |
797 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
1009 | case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; |
798 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
1010 | case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; |
799 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
1011 | case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; |
800 | case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break; |
1012 | case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; |
801 | case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break; |
1013 | case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; |
802 | case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break; |
1014 | case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; |
803 | case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break; |
1015 | case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; |
804 | case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break; |
1016 | case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; |
805 | case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break; |
1017 | case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; |
806 | case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break; |
1018 | case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; |
807 | case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break; |
1019 | case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; |
808 | case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break; |
1020 | case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; |
809 | case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break; |
1021 | case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; |
810 | case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break; |
1022 | case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; |
811 | case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break; |
1023 | case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; |
812 | case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break; |
1024 | case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
813 | case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
1025 | case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; |
814 | case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break; |
1026 | case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; |
815 | case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break; |
1027 | case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; |
816 | case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break; |
1028 | case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; |
817 | case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break; |
1029 | case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; |
818 | case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break; |
1030 | case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; |
819 | case KW_cursed: GET_FLAG (this, FLAG_CURSED); break; |
1031 | case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; |
820 | case KW_damned: GET_FLAG (this, FLAG_DAMNED); break; |
1032 | case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; |
821 | case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break; |
1033 | case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; |
822 | case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break; |
1034 | case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; |
823 | case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break; |
1035 | case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; |
824 | case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break; |
1036 | case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; |
825 | case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break; |
1037 | case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; |
826 | case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break; |
1038 | case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; |
827 | case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break; |
1039 | case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; |
828 | case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break; |
1040 | case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; |
829 | case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break; |
1041 | case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; |
830 | case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break; |
1042 | case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; |
831 | case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break; |
1043 | case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; |
832 | case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break; |
1044 | case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; |
833 | case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break; |
1045 | case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; |
834 | case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break; |
1046 | case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; |
835 | case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break; |
1047 | case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; |
836 | case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break; |
1048 | case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; |
837 | case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break; |
1049 | case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; |
838 | case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break; |
1050 | case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; |
839 | case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break; |
1051 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
840 | case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break; |
1052 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
841 | case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break; |
1053 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
842 | case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break; |
1054 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
843 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
1055 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
844 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
1056 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
845 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
1057 | |
846 | |
1058 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
847 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
1059 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
848 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
1060 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
849 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
1061 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
850 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
1062 | case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; |
851 | case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break; |
1063 | case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; |
852 | case KW_resist_cold: f.get (resist[ATNR_COLD]); break; |
1064 | case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; |
853 | case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break; |
1065 | case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; |
854 | case KW_resist_acid: f.get (resist[ATNR_ACID]); break; |
1066 | case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; |
855 | case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break; |
1067 | case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; |
856 | case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break; |
1068 | case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; |
857 | case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break; |
1069 | case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; |
858 | case KW_resist_poison: f.get (resist[ATNR_POISON]); break; |
1070 | case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; |
859 | case KW_resist_slow: f.get (resist[ATNR_SLOW]); break; |
1071 | case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; |
860 | case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break; |
1072 | case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; |
861 | case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break; |
1073 | case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; |
862 | case KW_resist_fear: f.get (resist[ATNR_FEAR]); break; |
1074 | case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; |
863 | case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break; |
1075 | case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; |
864 | case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break; |
1076 | case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; |
865 | case KW_resist_death: f.get (resist[ATNR_DEATH]); break; |
1077 | case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; |
866 | case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break; |
1078 | case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; |
867 | case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break; |
1079 | case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; |
868 | case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break; |
1080 | case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; |
869 | case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break; |
1081 | case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; |
870 | case KW_resist_blind: f.get (resist[ATNR_BLIND]); break; |
1082 | case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; |
871 | case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break; |
1083 | case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; |
872 | case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break; |
1084 | case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; |
873 | case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break; |
1085 | |
874 | |
1086 | case KW_luck: thawer.get (op->stats.luck); break; |
875 | case KW_luck: f.get (stats.luck); break; |
1087 | case KW_run_away: thawer.get (op->run_away); break; |
876 | case KW_run_away: f.get (run_away); break; |
1088 | case KW_pick_up: thawer.get (op->pick_up); break; |
877 | case KW_pick_up: f.get (pick_up); break; |
1089 | case KW_item_power: thawer.get (op->item_power); break; |
878 | case KW_item_power: f.get (item_power); break; |
1090 | case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; |
879 | case KW_gen_sp_armour: f.get (gen_sp_armour); break; |
1091 | case KW_anim_speed: thawer.get (op->anim_speed); break; |
880 | case KW_anim_speed: f.get (anim_speed); break; |
1092 | case KW_container: thawer.get (op->weight_limit); break; |
881 | case KW_container: f.get (weight_limit); break; |
1093 | case KW_will_apply: thawer.get (op->will_apply); break; |
882 | case KW_will_apply: f.get (will_apply); break; |
1094 | case KW_attack_movement: thawer.get (op->attack_movement); break; |
883 | case KW_attack_movement: f.get (attack_movement); break; |
1095 | case KW_move_state: thawer.get (op->move_status); break; |
884 | case KW_move_state: f.get (move_status); break; |
1096 | case KW_expmul: thawer.get (op->expmul); break; |
885 | case KW_expmul: f.get (expmul); break; |
1097 | case KW_glow_radius: thawer.get (op->glow_radius); break; |
886 | case KW_glow_radius: f.get (glow_radius); break; |
1098 | case KW_weapontype: thawer.get (op->weapontype); break; |
887 | case KW_weapontype: f.get (weapontype); break; |
1099 | case KW_tooltype: thawer.get (op->tooltype); break; |
888 | case KW_tooltype: f.get (tooltype); break; |
1100 | case KW_casting_time: thawer.get (op->casting_time); break; |
889 | case KW_casting_time: f.get (casting_time); break; |
1101 | case KW_elevation: thawer.get (op->elevation); break; |
890 | case KW_elevation: f.get (elevation); break; |
1102 | case KW_smoothlevel: thawer.get (op->smoothlevel); break; |
891 | case KW_smoothlevel: f.get (smoothlevel); break; |
1103 | case KW_client_type: thawer.get (op->client_type); break; |
892 | case KW_client_type: f.get (client_type); break; |
1104 | case KW_duration: thawer.get (op->duration); break; |
893 | case KW_duration: f.get (duration); break; |
1105 | case KW_range: thawer.get (op->range); break; |
894 | case KW_range: f.get (range); break; |
1106 | case KW_range_modifier: thawer.get (op->range_modifier); break; |
895 | case KW_range_modifier: f.get (range_modifier); break; |
1107 | case KW_dam_modifier: thawer.get (op->dam_modifier); break; |
896 | case KW_dam_modifier: f.get (dam_modifier); break; |
1108 | case KW_duration_modifier: thawer.get (op->duration_modifier); break; |
897 | case KW_duration_modifier: f.get (duration_modifier); break; |
1109 | |
898 | |
1110 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
899 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
1111 | //TODO: parse from other include files |
900 | //TODO: parse from other include files |
1112 | case KW_body_range: thawer.get (op->body_info[0]); break; |
901 | case KW_body_range: f.get (body_info[0]); break; |
1113 | case KW_body_arm: thawer.get (op->body_info[1]); break; |
902 | case KW_body_arm: f.get (body_info[1]); break; |
1114 | case KW_body_torso: thawer.get (op->body_info[2]); break; |
903 | case KW_body_torso: f.get (body_info[2]); break; |
1115 | case KW_body_head: thawer.get (op->body_info[3]); break; |
904 | case KW_body_head: f.get (body_info[3]); break; |
1116 | case KW_body_neck: thawer.get (op->body_info[4]); break; |
905 | case KW_body_neck: f.get (body_info[4]); break; |
1117 | case KW_body_skill: thawer.get (op->body_info[5]); break; |
906 | case KW_body_skill: f.get (body_info[5]); break; |
1118 | case KW_body_finger: thawer.get (op->body_info[6]); break; |
907 | case KW_body_finger: f.get (body_info[6]); break; |
1119 | case KW_body_shoulder: thawer.get (op->body_info[7]); break; |
908 | case KW_body_shoulder: f.get (body_info[7]); break; |
1120 | case KW_body_foot: thawer.get (op->body_info[8]); break; |
909 | case KW_body_foot: f.get (body_info[8]); break; |
1121 | case KW_body_hand: thawer.get (op->body_info[9]); break; |
910 | case KW_body_hand: f.get (body_info[9]); break; |
1122 | case KW_body_wrist: thawer.get (op->body_info[10]); break; |
911 | case KW_body_wrist: f.get (body_info[10]); break; |
1123 | case KW_body_waist: thawer.get (op->body_info[11]); break; |
912 | case KW_body_waist: f.get (body_info[11]); break; |
1124 | case KW_can_apply: |
913 | case KW_can_apply: |
1125 | break; |
914 | break; |
1126 | |
915 | |
1127 | case KW_connected: |
916 | case KW_connected: |
1128 | add_button_link (op, op->map, thawer.get_sint32 ()); |
917 | add_button_link (this, map, f.get_sint32 ()); |
1129 | break; |
918 | break; |
1130 | |
919 | |
1131 | case KW_randomitems: |
920 | case KW_randomitems: |
1132 | op->randomitems = find_treasurelist (thawer.get_str ()); |
921 | randomitems = find_treasurelist (f.get_str ()); |
1133 | //if (!op->randomitems) |
922 | //if (!randomitems) |
1134 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
923 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
1135 | break; |
924 | break; |
1136 | |
925 | |
1137 | case KW_msg: |
926 | case KW_msg: |
1138 | thawer.get_ml (KW_endmsg, op->msg); |
927 | f.get_ml (KW_endmsg, msg); |
1139 | //TODO: allow longer messages |
928 | //TODO: allow longer messages |
1140 | if (strlen (op->msg) >= HUGE_BUF) |
929 | if (strlen (msg) >= HUGE_BUF) |
1141 | { |
930 | { |
1142 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
931 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg); |
1143 | op->msg = "ERROR, please report: string too long, winged.\n"; |
932 | msg = "ERROR, please report: string too long, winged.\n"; |
1144 | } |
933 | } |
1145 | break; |
934 | break; |
1146 | |
935 | |
1147 | case KW_lore: |
936 | case KW_lore: |
1148 | thawer.get_ml (KW_endlore, op->lore); |
937 | f.get_ml (KW_endlore, lore); |
1149 | //TODO: allow longer messages |
938 | //TODO: allow longer messages |
1150 | /* Just print a warning so we can be reasonably safe |
939 | /* Just print a warning so we can be reasonably safe |
1151 | * about not overflowing the buffer. |
940 | * about not overflowing the buffer. |
1152 | */ |
941 | */ |
1153 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
942 | if (strlen (lore) > (HUGE_BUF / 2)) |
1154 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
943 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1155 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
944 | HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore); |
1156 | break; |
945 | break; |
1157 | |
946 | |
1158 | case KW_editable: |
947 | case KW_editable: |
1159 | case KW_editor_folder: |
948 | case KW_editor_folder: |
1160 | break; |
949 | break; |
1161 | |
950 | |
1162 | case KW_More: // uppercase alias |
|
|
1163 | case KW_more: |
|
|
1164 | /* We need to record that this is a multipart object, |
|
|
1165 | * so the calling function can glue things back together |
|
|
1166 | */ |
|
|
1167 | ismore = 1; |
|
|
1168 | break; |
|
|
1169 | |
|
|
1170 | case KW_end: |
951 | case KW_end: |
1171 | check_loaded_object (op); |
952 | check_loaded_object (this); |
1172 | |
953 | |
1173 | if (!arch_init) |
954 | if (!arch_init) |
1174 | op->instantiate (); |
955 | instantiate (); |
1175 | |
956 | |
1176 | return ismore ? LL_MORE : LL_NORMAL; |
957 | f.next (); |
1177 | |
|
|
1178 | case KW_EOF: |
|
|
1179 | return LL_EOF; |
958 | return true; |
1180 | |
959 | |
1181 | case KW_ERROR: |
960 | case KW_ERROR: |
1182 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
961 | set_ob_key_value (this, f.kw_str, f.value, true); |
1183 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
962 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
1184 | break; |
963 | break; |
1185 | |
964 | |
1186 | default: |
965 | default: |
1187 | if (!thawer.parse_error (kw, "object", op->name)) |
966 | if (!f.parse_error ("object", name)) |
1188 | return false; |
967 | return false; |
1189 | break; |
968 | break; |
1190 | } |
969 | } |
|
|
970 | |
|
|
971 | f.next (); |
1191 | } |
972 | } |
1192 | } |
973 | } |
1193 | |
974 | |
1194 | /* |
975 | object * |
1195 | * Loads an object from the given file-pointer. |
976 | object::read (object_thawer &f, maptile *map) |
1196 | * Variables will be read and parsed and patched into the object |
|
|
1197 | * until the string "end" is reached, or the end of the file. |
|
|
1198 | * |
|
|
1199 | * bufstat is used to determine various file attributes: |
|
|
1200 | * LO_REPATE (0): We are reading from the same buffer as the last call. |
|
|
1201 | * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions |
|
|
1202 | * will also be reading from this (treasure file, artifacts.) |
|
|
1203 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
|
|
1204 | * be reset. |
|
|
1205 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
|
|
1206 | * |
|
|
1207 | */ |
|
|
1208 | int |
|
|
1209 | load_object (object_thawer &fp, object *op, int map_flags) |
|
|
1210 | { |
977 | { |
1211 | coroapi::cede_every (1000); // cede once in a while |
978 | assert (f.kw == KW_arch); |
1212 | |
979 | |
1213 | return parse_object (op, fp, map_flags); |
980 | archetype *arch = archetype::find (f.get_str ()); |
|
|
981 | |
|
|
982 | if (!arch) |
|
|
983 | { |
|
|
984 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
|
|
985 | arch = archetype::find ("earthwall"); |
|
|
986 | } |
|
|
987 | |
|
|
988 | assert (arch); //D maybe use exception handling of sorts? |
|
|
989 | |
|
|
990 | object *op = object::create (); |
|
|
991 | |
|
|
992 | op->map = map; |
|
|
993 | op->arch = arch; |
|
|
994 | arch->clone.copy_to (op); |
|
|
995 | // copy_to activates, this should be fixed properly |
|
|
996 | op->deactivate (); |
|
|
997 | |
|
|
998 | if (!op->parse_kv (f)) |
|
|
999 | { |
|
|
1000 | delete op; |
|
|
1001 | return 0; |
|
|
1002 | } |
|
|
1003 | |
|
|
1004 | return op; |
1214 | } |
1005 | } |
1215 | |
1006 | |
1216 | /* This takes a buffer, scans it for variables, and sets those variables |
1007 | /* This takes a buffer, scans it for variables, and sets those variables |
1217 | * as appropriate in op. |
1008 | * as appropriate in op. |
1218 | * |
1009 | * |
… | |
… | |
1220 | * override values and in c_wiz to mutate values. |
1011 | * override values and in c_wiz to mutate values. |
1221 | */ |
1012 | */ |
1222 | int |
1013 | int |
1223 | set_variable (object *op, char *buf) |
1014 | set_variable (object *op, char *buf) |
1224 | { |
1015 | { |
1225 | object_thawer thawer (buf, (AV *)0); |
1016 | object_thawer f (buf, (AV *)0); |
1226 | |
1017 | |
1227 | return parse_object (op, thawer, 0); |
1018 | return op->parse_kv (f); |
1228 | } |
|
|
1229 | |
|
|
1230 | /* |
|
|
1231 | * Initialises the array of variable-names. Needed before any |
|
|
1232 | * objects can be loaded. Called by init_library(). |
|
|
1233 | */ |
|
|
1234 | |
|
|
1235 | void |
|
|
1236 | init_vars () |
|
|
1237 | { |
|
|
1238 | } |
1019 | } |
1239 | |
1020 | |
1240 | /* This returns a string of the integer movement type */ |
1021 | /* This returns a string of the integer movement type */ |
1241 | #if 0 |
1022 | #if 0 |
1242 | // unused function |
1023 | // unused function |
… | |
… | |
1287 | return retbuf + 1; |
1068 | return retbuf + 1; |
1288 | } |
1069 | } |
1289 | #endif |
1070 | #endif |
1290 | |
1071 | |
1291 | // compare *op against *tmp and output differences |
1072 | // compare *op against *tmp and output differences |
1292 | void |
1073 | static void |
1293 | put (object_freezer &f, object *op, object *tmp) |
1074 | write_diff (object_freezer &f, object *op, object *tmp) |
1294 | { |
1075 | { |
1295 | static const keyword resist_save[NROFATTACKS] = { |
1076 | static const keyword resist_save[NROFATTACKS] = { |
1296 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1077 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1297 | # include "attackinc.h" |
1078 | # include "attackinc.h" |
1298 | # undef def |
1079 | # undef def |
… | |
… | |
1587 | /* |
1368 | /* |
1588 | * Dumps all variables in an object to a file. |
1369 | * Dumps all variables in an object to a file. |
1589 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1370 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1590 | * the only place this is not set is when saving the player. |
1371 | * the only place this is not set is when saving the player. |
1591 | */ |
1372 | */ |
1592 | void |
1373 | bool |
1593 | save_object (object_freezer &fp, object *op, int flag) |
1374 | object::write (object_freezer &f) |
1594 | { |
1375 | { |
1595 | /* Even if the object does have an owner, it would seem that we should |
1376 | /* Even if the object does have an owner, it would seem that we should |
1596 | * still save it. |
1377 | * still save it. |
1597 | */ |
1378 | */ |
1598 | if (op->owner) |
1379 | if (owner) |
1599 | return; |
1380 | return true; |
1600 | |
1381 | |
1601 | /* If it is unpaid and we don't want to save those, just return. */ |
|
|
1602 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
|
|
1603 | return; |
|
|
1604 | |
|
|
1605 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1382 | archetype *at = arch ? (archetype *)arch : empty_archetype; |
1606 | |
1383 | |
1607 | fp.put (KW_arch, at->name); |
1384 | f.put (KW_arch, at->name); |
1608 | put (fp, op, &at->clone); |
1385 | write_diff (f, this, &at->clone); |
1609 | |
1386 | |
1610 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
|
|
1611 | |
|
|
1612 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1387 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1613 | save_object (fp, tmp, flag); |
1388 | tmp->write (f); |
1614 | |
1389 | |
1615 | fp.put (op); |
1390 | f.put (this); |
1616 | fp.put (KW_end); |
1391 | f.put (KW_end); |
|
|
1392 | |
|
|
1393 | return true; |
1617 | } |
1394 | } |
1618 | |
1395 | |
|
|
1396 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1397 | |
|
|
1398 | bool load_resource_file (const char *filename) |
|
|
1399 | { |
|
|
1400 | object_thawer f (filename); |
|
|
1401 | |
|
|
1402 | f.next (); |
|
|
1403 | |
|
|
1404 | for (;;) |
|
|
1405 | { |
|
|
1406 | switch (f.kw) |
|
|
1407 | { |
|
|
1408 | case KW_region: |
|
|
1409 | if (!region::read (f)) |
|
|
1410 | return false; |
|
|
1411 | break; |
|
|
1412 | |
|
|
1413 | case KW_EOF: |
|
|
1414 | return true; |
|
|
1415 | |
|
|
1416 | default: |
|
|
1417 | if (!f.parse_error ("resource file")) |
|
|
1418 | return false; |
|
|
1419 | } |
|
|
1420 | |
|
|
1421 | f.next (); |
|
|
1422 | } |
|
|
1423 | } |
|
|
1424 | |