1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | variable. */ |
27 | variable. */ |
27 | |
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 | |
|
|
191 | ///////////////////////////////////////////////////////////////////////////// |
32 | |
192 | |
33 | /* Maps the MOVE_* values to names */ |
193 | /* Maps the MOVE_* values to names */ |
34 | 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 }; |
35 | |
195 | |
36 | /* 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 |
… | |
… | |
263 | static void |
423 | static void |
264 | check_loaded_object (object *op) |
424 | check_loaded_object (object *op) |
265 | { |
425 | { |
266 | int ip; |
426 | int ip; |
267 | |
427 | |
268 | /* We do some specialized handling to handle legacy cases of name_pl. |
428 | /* We do some specialised handling to handle legacy cases of name_pl. |
269 | * If the object doesn't have a name_pl, we just use the object name - |
429 | * If the object doesn't have a name_pl, we just use the object name - |
270 | * this isn't perfect (things won't be properly pluralized), but works to |
430 | * this isn't perfect (things won't be properly pluralised), but works to |
271 | * that degree (5 heart is still quite understandable). But the case we |
431 | * that degree (5 heart is still quite understandable). But the case we |
272 | * also have to catch is if this object is not using the normal name for |
432 | * also have to catch is if this object is not using the normal name for |
273 | * the object. In that case, we also want to use the loaded name. |
433 | * the object. In that case, we also want to use the loaded name. |
274 | * Otherwise, what happens is that the the plural name will lose |
434 | * Otherwise, what happens is that the the plural name will lose |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
435 | * information (appear as just 'hearts' and not 'goblins heart') |
… | |
… | |
320 | { |
480 | { |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
481 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
322 | op->gen_sp_armour = op->last_heal; |
482 | op->gen_sp_armour = op->last_heal; |
323 | op->last_heal = 0; |
483 | op->last_heal = 0; |
324 | } |
484 | } |
325 | if (editor) |
485 | |
326 | ip = 0; |
|
|
327 | else |
|
|
328 | ip = calc_item_power (op, 0); |
486 | ip = calc_item_power (op, 0); |
329 | /* Legacy objects from before item power was in the game */ |
487 | /* Legacy objects from before item power was in the game */ |
330 | if (!op->item_power && ip) |
488 | if (!op->item_power && ip) |
331 | { |
489 | { |
332 | if (ip > 3) |
490 | if (ip > 3) |
333 | { |
491 | { |
… | |
… | |
375 | } |
533 | } |
376 | |
534 | |
377 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
535 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
378 | { |
536 | { |
379 | if (op->stats.hp > op->stats.maxhp) |
537 | if (op->stats.hp > op->stats.maxhp) |
|
|
538 | { |
380 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
539 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
540 | op->stats.maxhp = op->stats.hp; |
|
|
541 | } |
381 | |
542 | |
382 | /* The archs just need to be updated for this */ |
543 | /* The archs just need to be updated for this */ |
383 | if (op->move_type == 0) |
544 | if (op->move_type == 0) |
384 | op->move_type = MOVE_WALK; |
545 | op->move_type = MOVE_WALK; |
385 | } |
546 | } |
… | |
… | |
540 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
701 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
541 | |
702 | |
542 | case KW_arch: |
703 | case KW_arch: |
543 | { |
704 | { |
544 | const char *str = thawer.get_str (); |
705 | const char *str = thawer.get_str (); |
545 | fprintf (stderr, "arch %s\n", str);//D |
|
|
546 | |
706 | |
547 | if (op->arch) |
707 | if (op->arch) |
548 | { |
708 | { |
549 | /* If op->arch has been set, then this new object |
709 | /* If op->arch has been set, then this new object |
550 | * must be part of the inventory. So process |
710 | * must be part of the inventory. So process |
… | |
… | |
632 | if (!str) |
792 | if (!str) |
633 | { |
793 | { |
634 | op->animation_id = 0; |
794 | op->animation_id = 0; |
635 | CLEAR_FLAG (op, FLAG_ANIMATE); |
795 | CLEAR_FLAG (op, FLAG_ANIMATE); |
636 | } |
796 | } |
637 | else |
|
|
638 | { |
|
|
639 | op->animation_id = find_animation (str); |
797 | else if ((op->animation_id = find_animation (str))) |
640 | SET_FLAG (op, FLAG_ANIMATE); |
798 | SET_FLAG (op, FLAG_ANIMATE); |
641 | } |
|
|
642 | } |
799 | } |
643 | |
800 | |
644 | break; |
801 | break; |
645 | |
802 | |
646 | case KW_last_heal: thawer.get (op->last_heal); break; |
803 | case KW_last_heal: thawer.get (op->last_heal); break; |
… | |
… | |
653 | thawer.get (op->speed); |
810 | thawer.get (op->speed); |
654 | |
811 | |
655 | //TODO: maybe do in check_object |
812 | //TODO: maybe do in check_object |
656 | // removed check for style maps |
813 | // removed check for style maps |
657 | if (op->speed < 0) |
814 | if (op->speed < 0) |
658 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
815 | op->speed_left = op->speed_left - rndm (); |
659 | |
816 | |
660 | break; |
817 | break; |
661 | |
818 | |
662 | case KW_slow_move: |
819 | case KW_slow_move: |
663 | op->move_slow |= MOVE_WALK; |
820 | op->move_slow |= MOVE_WALK; |
… | |
… | |
713 | case KW_path_denied: thawer.get (op->path_denied); break; |
870 | case KW_path_denied: thawer.get (op->path_denied); break; |
714 | case KW_invisible: thawer.get (op->invisible); break; |
871 | case KW_invisible: thawer.get (op->invisible); break; |
715 | case KW_magic: thawer.get (op->magic); break; |
872 | case KW_magic: thawer.get (op->magic); break; |
716 | case KW_state: thawer.get (op->state); break; |
873 | case KW_state: thawer.get (op->state); break; |
717 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
874 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
718 | case KW_material: thawer.get (op->material); break; |
875 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
719 | case KW_materialname: thawer.get (op->materialname); break; |
876 | case KW_materialname: thawer.get (op->materialname); break; |
720 | |
877 | |
721 | /* These are the new values */ |
878 | /* These are the new values */ |
722 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
879 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
723 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
880 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
… | |
… | |
817 | CLEAR_FLAG (op, FLAG_WIZCAST); |
974 | CLEAR_FLAG (op, FLAG_WIZCAST); |
818 | } |
975 | } |
819 | break; |
976 | break; |
820 | |
977 | |
821 | case KW_friendly: |
978 | case KW_friendly: |
822 | GET_FLAG (op, FLAG_FRIENDLY); |
979 | if (thawer.get_sint32 ()) |
823 | //TODO: move to check_object or so |
980 | if (op->type != PLAYER) |
824 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
825 | add_friendly_object (op); |
981 | add_friendly_object (op); |
|
|
982 | |
826 | break; |
983 | break; |
827 | |
984 | |
828 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
985 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
829 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
986 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
830 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
987 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
831 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
988 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
989 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
832 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
990 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
833 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
991 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
834 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
992 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
835 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
993 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
836 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
994 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
… | |
… | |
907 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
1065 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
908 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
1066 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
909 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
1067 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
910 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
1068 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
911 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
1069 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
1070 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
912 | |
1071 | |
913 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1072 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
914 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1073 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
915 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
1074 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
916 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
1075 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
… | |
… | |
990 | case KW_msg: |
1149 | case KW_msg: |
991 | thawer.get_ml (KW_endmsg, op->msg); |
1150 | thawer.get_ml (KW_endmsg, op->msg); |
992 | //TODO: allow longer messages |
1151 | //TODO: allow longer messages |
993 | if (strlen (op->msg) >= HUGE_BUF) |
1152 | if (strlen (op->msg) >= HUGE_BUF) |
994 | { |
1153 | { |
995 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
1154 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
996 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1155 | op->msg = "ERROR, please report: string too long, winged.\n"; |
997 | } |
1156 | } |
998 | break; |
1157 | break; |
999 | |
1158 | |
1000 | case KW_lore: |
1159 | case KW_lore: |
… | |
… | |
1002 | //TODO: allow longer messages |
1161 | //TODO: allow longer messages |
1003 | /* Just print a warning so we can be reasonably safe |
1162 | /* Just print a warning so we can be reasonably safe |
1004 | * about not overflowing the buffer. |
1163 | * about not overflowing the buffer. |
1005 | */ |
1164 | */ |
1006 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1165 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1007 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1166 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1008 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1167 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1009 | break; |
1168 | break; |
1010 | |
1169 | |
1011 | case KW_editable: |
1170 | case KW_editable: |
1012 | case KW_editor_folder: |
1171 | case KW_editor_folder: |
… | |
… | |
1035 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1194 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1036 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1195 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1037 | break; |
1196 | break; |
1038 | |
1197 | |
1039 | default: |
1198 | default: |
1040 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1199 | if (!thawer.parse_error (kw, "object", op->name)) |
|
|
1200 | return false; |
1041 | break; |
1201 | break; |
1042 | } |
1202 | } |
1043 | } |
1203 | } |
1044 | } |
1204 | } |
1045 | |
1205 | |
… | |
… | |
1058 | * |
1218 | * |
1059 | */ |
1219 | */ |
1060 | int |
1220 | int |
1061 | load_object (object_thawer &fp, object *op, int map_flags) |
1221 | load_object (object_thawer &fp, object *op, int map_flags) |
1062 | { |
1222 | { |
1063 | // cede every 500 objects loaded |
1223 | coroapi::cede_every (1000); // cede once in a while |
1064 | { |
|
|
1065 | static int cede_counter = 0; |
|
|
1066 | |
|
|
1067 | if (++cede_counter >= 500) |
|
|
1068 | { |
|
|
1069 | cede_counter = 0; |
|
|
1070 | if (coroapi::nready ()) |
|
|
1071 | coroapi::cede (); |
|
|
1072 | } |
|
|
1073 | } |
|
|
1074 | |
1224 | |
1075 | return parse_object (op, fp, map_flags); |
1225 | return parse_object (op, fp, map_flags); |
1076 | } |
1226 | } |
1077 | |
1227 | |
1078 | /* This takes a buffer, scans it for variables, and sets those variables |
1228 | /* This takes a buffer, scans it for variables, and sets those variables |
… | |
… | |
1277 | KW_berserk, |
1427 | KW_berserk, |
1278 | KW_neutral, |
1428 | KW_neutral, |
1279 | /* 100 */ |
1429 | /* 100 */ |
1280 | KW_no_attack, |
1430 | KW_no_attack, |
1281 | KW_no_damage, |
1431 | KW_no_damage, |
1282 | KW_NULL, |
1432 | KW_obj_original, |
1283 | KW_NULL, |
1433 | KW_NULL, |
1284 | KW_activate_on_push, |
1434 | KW_activate_on_push, |
1285 | KW_activate_on_release, |
1435 | KW_activate_on_release, |
1286 | KW_is_water, |
1436 | KW_is_water, |
1287 | KW_use_content_on_gen, |
1437 | KW_use_content_on_gen, |
1288 | KW_NULL, |
1438 | KW_NULL, |
1289 | KW_is_buildable, |
1439 | KW_is_buildable, |
1290 | /* 110 */ |
1440 | /* 110 */ |
|
|
1441 | KW_destroy_on_death, |
|
|
1442 | KW_NULL, |
1291 | }; |
1443 | }; |
1292 | |
1444 | |
1293 | int i; |
1445 | int i; |
1294 | |
1446 | |
1295 | /* This saves the key/value lists. We do it first so that any |
1447 | /* This saves the key/value lists. We do it first so that any |
1296 | * keys that match field names will be overwritten by the loader. |
1448 | * keys that match field names will be overwritten by the loader. |
1297 | */ |
1449 | */ |
1298 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1450 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1299 | { |
1451 | { |
1300 | /* Find the field in the opposing member. */ |
1452 | /* Find the field in the opposing member. */ |
1301 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1453 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1302 | |
1454 | |
1303 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1455 | /* If there's no partnering field, or it's got a different value, save our field. */ |
… | |
… | |
1387 | f.put (resist_save[i], op->resist[i]); |
1539 | f.put (resist_save[i], op->resist[i]); |
1388 | |
1540 | |
1389 | CMP_OUT (path_attuned); |
1541 | CMP_OUT (path_attuned); |
1390 | CMP_OUT (path_repelled); |
1542 | CMP_OUT (path_repelled); |
1391 | CMP_OUT (path_denied); |
1543 | CMP_OUT (path_denied); |
1392 | CMP_OUT (material); |
1544 | CMP_OUT2 (material, materials);//TODO: nuke |
1393 | CMP_OUT (materialname); |
1545 | CMP_OUT (materialname); |
1394 | CMP_OUT (value); |
1546 | CMP_OUT (value); |
1395 | CMP_OUT (carrying); |
1547 | CMP_OUT (carrying); |
1396 | CMP_OUT (weight); |
1548 | CMP_OUT (weight); |
1397 | CMP_OUT (invisible); |
1549 | CMP_OUT (invisible); |