… | |
… | |
24 | |
24 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
27 | variable. */ |
28 | |
28 | |
29 | |
|
|
30 | #include <global.h> |
29 | #include <global.h> |
31 | #include <loader.h> |
30 | #include <loader.h> |
32 | #include <sproto.h> |
31 | #include <sproto.h> |
33 | |
32 | |
34 | // future resource loader base class |
33 | ///////////////////////////////////////////////////////////////////////////// |
35 | struct loader_base |
|
|
36 | { |
|
|
37 | const char *filename; |
|
|
38 | virtual const char *type () const = 0; |
|
|
39 | |
34 | |
40 | virtual archetype *get_arch (const char *name); |
35 | loader_base::~loader_base () |
41 | virtual void put_arch (archetype *arch); |
|
|
42 | |
|
|
43 | virtual object *get_object (const char *name); |
|
|
44 | virtual void put_object (object *op); |
|
|
45 | |
|
|
46 | virtual player *get_player (); |
|
|
47 | virtual void put_player (player *pl); |
|
|
48 | |
|
|
49 | virtual region *get_region (const char *name); |
|
|
50 | virtual void put_region (region *region); |
|
|
51 | |
|
|
52 | virtual facetile *get_face (const char *name); |
|
|
53 | virtual void put_face (facetile *face); |
|
|
54 | |
|
|
55 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
56 | virtual void put_treasure (treasurelist *treasure); |
|
|
57 | |
|
|
58 | virtual animation *get_animation (const char *name); |
|
|
59 | virtual void put_animation (animation *anim); |
|
|
60 | }; |
|
|
61 | |
|
|
62 | // future generic resource loader |
|
|
63 | // handles generic stuff valid in most files, such as |
|
|
64 | // animations, treasures, faces and so on |
|
|
65 | struct loader_generic : loader_base |
|
|
66 | { |
36 | { |
67 | const char *type () const = 0; |
37 | } |
68 | |
|
|
69 | region *get_region (); |
|
|
70 | void put_region (region *region); |
|
|
71 | |
|
|
72 | facetile *get_face (const char *name); |
|
|
73 | void put_face (facetile *face); |
|
|
74 | |
|
|
75 | treasurelist *get_treasure (const char *name, bool one = false); |
|
|
76 | void put_treasure (treasurelist *treasure); |
|
|
77 | |
|
|
78 | animation *get_animation (const char *name); |
|
|
79 | void put_animation (animation *anim); |
|
|
80 | }; |
|
|
81 | |
38 | |
82 | // the base class warns about and skips everything |
39 | // the base class warns about and skips everything |
83 | archetype * |
40 | archetype * |
84 | loader_base::get_arch (const char *name) |
41 | loader_base::get_arch (const char *name) |
85 | { |
42 | { |
86 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n", |
43 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n", |
87 | filename, name, type ()); |
44 | filename, name); |
88 | |
45 | |
89 | return new archetype; |
46 | return new archetype; |
90 | } |
47 | } |
91 | |
48 | |
92 | object * |
49 | object * |
93 | loader_base::get_object (const char *name) |
50 | loader_base::get_object (const char *name) |
94 | { |
51 | { |
95 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n", |
52 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n", |
96 | filename, name, type ()); |
53 | filename, name); |
97 | |
54 | |
98 | return object::create (); |
55 | return object::create (); |
99 | } |
56 | } |
100 | |
57 | |
101 | player * |
58 | player * |
102 | loader_base::get_player () |
59 | loader_base::get_player () |
103 | { |
60 | { |
104 | LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n", |
61 | LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n", |
105 | filename, type ()); |
62 | filename); |
106 | |
63 | |
107 | return player::create (); |
64 | return player::create (); |
108 | } |
65 | } |
109 | |
66 | |
110 | region * |
67 | region * |
111 | loader_base::get_region (const char *name) |
68 | loader_base::get_region (const char *name) |
112 | { |
69 | { |
113 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n", |
70 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n", |
114 | filename, name, type ()); |
71 | filename, name); |
115 | |
72 | |
116 | return new region; |
73 | return new region; |
117 | } |
74 | } |
118 | |
75 | |
119 | facetile * |
76 | facetile * |
120 | loader_base::get_face (const char *name) |
77 | loader_base::get_face (const char *name) |
121 | { |
78 | { |
122 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n", |
79 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n", |
123 | filename, name, type ()); |
80 | filename, name); |
124 | |
81 | |
125 | return new facetile; |
82 | return new facetile; |
126 | } |
83 | } |
127 | |
84 | |
128 | treasurelist * |
85 | treasurelist * |
129 | loader_base::get_treasure (const char *name, bool one) |
86 | loader_base::get_treasure (const char *name, bool one) |
130 | { |
87 | { |
131 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n", |
88 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n", |
132 | filename, name, type ()); |
89 | filename, name); |
133 | |
90 | |
134 | return new treasurelist;//D |
91 | return new treasurelist;//D |
135 | } |
92 | } |
136 | |
93 | |
137 | animation * |
94 | animation * |
138 | loader_base::get_animation (const char *name) |
95 | loader_base::get_animation (const char *name) |
139 | { |
96 | { |
140 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n", |
97 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n", |
141 | filename, name, type ()); |
98 | filename, name); |
142 | |
99 | |
143 | return new animation; |
100 | return new animation; |
144 | } |
101 | } |
145 | |
102 | |
146 | void |
103 | void |
… | |
… | |
182 | void |
139 | void |
183 | loader_base::put_animation (animation *anim) |
140 | loader_base::put_animation (animation *anim) |
184 | { |
141 | { |
185 | delete anim; |
142 | delete anim; |
186 | } |
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 | |
|
|
191 | ///////////////////////////////////////////////////////////////////////////// |
187 | |
192 | |
188 | /* Maps the MOVE_* values to names */ |
193 | /* Maps the MOVE_* values to names */ |
189 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
194 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
190 | |
195 | |
191 | /* This table is only necessary to convert objects that existed before the |
196 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
713 | tmp = arch_to_object (arch); |
718 | tmp = arch_to_object (arch); |
714 | else |
719 | else |
715 | { |
720 | { |
716 | tmp = object::create (); |
721 | tmp = object::create (); |
717 | /* record the name of the broken object */ |
722 | /* record the name of the broken object */ |
|
|
723 | //TODO: but do not log??? |
718 | tmp->name = str; |
724 | tmp->name = str; |
719 | } |
725 | } |
720 | |
726 | |
721 | // decativate the object we, as we are still going |
727 | // decativate the object we, as we are still going |
722 | // to read the speed value. Objects should be activated |
728 | // to read the speed value. Objects should be activated |
… | |
… | |
780 | op->other_arch = archetype::find (thawer.get_str ()); |
786 | op->other_arch = archetype::find (thawer.get_str ()); |
781 | break; |
787 | break; |
782 | |
788 | |
783 | case KW_animation: |
789 | case KW_animation: |
784 | { |
790 | { |
|
|
791 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
792 | op->animation_id = 0; |
|
|
793 | |
785 | const char *str = thawer.get_str (); |
794 | const char *str = thawer.get_str (); |
786 | |
|
|
787 | if (!str) |
|
|
788 | { |
|
|
789 | op->animation_id = 0; |
|
|
790 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
791 | } |
|
|
792 | else if ((op->animation_id = find_animation (str))) |
795 | if (str && (op->animation_id = find_animation (str))) |
793 | SET_FLAG (op, FLAG_ANIMATE); |
796 | SET_FLAG (op, FLAG_ANIMATE); |
794 | } |
797 | } |
795 | |
|
|
796 | break; |
798 | break; |
797 | |
799 | |
798 | case KW_last_heal: thawer.get (op->last_heal); break; |
800 | case KW_last_heal: thawer.get (op->last_heal); break; |
799 | case KW_last_sp: thawer.get (op->last_sp); break; |
801 | case KW_last_sp: thawer.get (op->last_sp); break; |
800 | case KW_last_grace: thawer.get (op->last_grace); break; |
802 | case KW_last_grace: thawer.get (op->last_grace); break; |
… | |
… | |
865 | case KW_path_denied: thawer.get (op->path_denied); break; |
867 | case KW_path_denied: thawer.get (op->path_denied); break; |
866 | case KW_invisible: thawer.get (op->invisible); break; |
868 | case KW_invisible: thawer.get (op->invisible); break; |
867 | case KW_magic: thawer.get (op->magic); break; |
869 | case KW_magic: thawer.get (op->magic); break; |
868 | case KW_state: thawer.get (op->state); break; |
870 | case KW_state: thawer.get (op->state); break; |
869 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
871 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
870 | case KW_material: thawer.get (op->material); break; |
872 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
871 | case KW_materialname: thawer.get (op->materialname); break; |
873 | case KW_materialname: thawer.get (op->materialname); break; |
872 | |
874 | |
873 | /* These are the new values */ |
875 | /* These are the new values */ |
874 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
876 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
875 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
877 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
… | |
… | |
1137 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1139 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1138 | break; |
1140 | break; |
1139 | |
1141 | |
1140 | case KW_randomitems: |
1142 | case KW_randomitems: |
1141 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1143 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
1144 | //if (!op->randomitems) |
|
|
1145 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
1142 | break; |
1146 | break; |
1143 | |
1147 | |
1144 | case KW_msg: |
1148 | case KW_msg: |
1145 | thawer.get_ml (KW_endmsg, op->msg); |
1149 | thawer.get_ml (KW_endmsg, op->msg); |
1146 | //TODO: allow longer messages |
1150 | //TODO: allow longer messages |
… | |
… | |
1189 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1193 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1190 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1194 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1191 | break; |
1195 | break; |
1192 | |
1196 | |
1193 | default: |
1197 | default: |
1194 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1198 | if (!thawer.parse_error (kw, "object", op->name)) |
|
|
1199 | return false; |
1195 | break; |
1200 | break; |
1196 | } |
1201 | } |
1197 | } |
1202 | } |
1198 | } |
1203 | } |
1199 | |
1204 | |
… | |
… | |
1533 | f.put (resist_save[i], op->resist[i]); |
1538 | f.put (resist_save[i], op->resist[i]); |
1534 | |
1539 | |
1535 | CMP_OUT (path_attuned); |
1540 | CMP_OUT (path_attuned); |
1536 | CMP_OUT (path_repelled); |
1541 | CMP_OUT (path_repelled); |
1537 | CMP_OUT (path_denied); |
1542 | CMP_OUT (path_denied); |
1538 | CMP_OUT (material); |
1543 | CMP_OUT2 (material, materials);//TODO: nuke |
1539 | CMP_OUT (materialname); |
1544 | CMP_OUT (materialname); |
1540 | CMP_OUT (value); |
1545 | CMP_OUT (value); |
1541 | CMP_OUT (carrying); |
1546 | CMP_OUT (carrying); |
1542 | CMP_OUT (weight); |
1547 | CMP_OUT (weight); |
1543 | CMP_OUT (invisible); |
1548 | CMP_OUT (invisible); |