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 | // resource loader pure base class |
|
|
34 | struct loader_base |
|
|
35 | { |
|
|
36 | const char *filename; |
|
|
37 | virtual const char *type () const = 0; |
|
|
38 | |
|
|
39 | virtual archetype *get_arch (const char *name); |
|
|
40 | virtual void put_arch (archetype *arch); |
|
|
41 | |
|
|
42 | virtual object *get_object (const char *name); |
|
|
43 | virtual void put_object (object *op); |
|
|
44 | |
|
|
45 | virtual player *get_player (); |
|
|
46 | virtual void put_player (player *pl); |
|
|
47 | |
|
|
48 | virtual region *get_region (const char *name); |
|
|
49 | virtual void put_region (region *region); |
|
|
50 | |
|
|
51 | virtual facetile *get_face (const char *name); |
|
|
52 | virtual void put_face (facetile *face); |
|
|
53 | |
|
|
54 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
55 | virtual void put_treasure (treasurelist *treasure); |
|
|
56 | |
|
|
57 | virtual animation *get_animation (const char *name); |
|
|
58 | virtual void put_animation (animation *anim); |
|
|
59 | }; |
|
|
60 | |
|
|
61 | // pure base class for default archetype loader |
|
|
62 | struct loader_arch : virtual loader_base { |
|
|
63 | archetype *get_arch (const char *name); |
|
|
64 | void put_arch (archetype *arch); |
|
|
65 | }; |
|
|
66 | |
|
|
67 | // pure base class for default object loader |
|
|
68 | struct loader_object : virtual loader_base { |
|
|
69 | object *get_object (const char *name); |
|
|
70 | void put_object (object *op); |
|
|
71 | }; |
|
|
72 | |
|
|
73 | // pure base class for default player loader |
|
|
74 | struct loader_player : virtual loader_base { |
|
|
75 | virtual player *get_player (); |
|
|
76 | virtual void put_player (player *pl); |
|
|
77 | }; |
|
|
78 | |
|
|
79 | // pure base class for default region loader |
|
|
80 | struct loader_region : virtual loader_base { |
|
|
81 | region *get_region (); |
|
|
82 | void put_region (region *region); |
|
|
83 | }; |
|
|
84 | |
|
|
85 | // pure base class for default face loader |
|
|
86 | struct loader_face : virtual loader_base { |
|
|
87 | facetile *get_face (const char *name); |
|
|
88 | void put_face (facetile *face); |
|
|
89 | }; |
|
|
90 | |
|
|
91 | // pure base class for default treasure loader |
|
|
92 | struct loader_treasure : virtual loader_base { |
|
|
93 | treasurelist *get_treasure (const char *name, bool one = false); |
|
|
94 | void put_treasure (treasurelist *treasure); |
|
|
95 | }; |
|
|
96 | |
|
|
97 | // pure base class for default animation loader |
|
|
98 | struct loader_animation : virtual loader_base { |
|
|
99 | animation *get_animation (const char *name); |
|
|
100 | void put_animation (animation *anim); |
|
|
101 | }; |
|
|
102 | |
|
|
103 | // future generic resource loader |
|
|
104 | // handles generic stuff valid in most files, such as |
|
|
105 | // animations, treasures, faces and so on |
|
|
106 | struct loader_generic |
|
|
107 | : virtual loader_base, |
|
|
108 | loader_object, loader_player, |
|
|
109 | loader_region, loader_face, |
|
|
110 | loader_treasure, loader_animation |
|
|
111 | { |
|
|
112 | const char *type () const = 0; |
|
|
113 | }; |
|
|
114 | |
|
|
115 | // the base class warns about and skips everything |
|
|
116 | archetype * |
|
|
117 | loader_base::get_arch (const char *name) |
|
|
118 | { |
|
|
119 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n", |
|
|
120 | filename, name, type ()); |
|
|
121 | |
|
|
122 | return new archetype; |
|
|
123 | } |
|
|
124 | |
|
|
125 | object * |
|
|
126 | loader_base::get_object (const char *name) |
|
|
127 | { |
|
|
128 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n", |
|
|
129 | filename, name, type ()); |
|
|
130 | |
|
|
131 | return object::create (); |
|
|
132 | } |
|
|
133 | |
|
|
134 | player * |
|
|
135 | loader_base::get_player () |
|
|
136 | { |
|
|
137 | LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n", |
|
|
138 | filename, type ()); |
|
|
139 | |
|
|
140 | return player::create (); |
|
|
141 | } |
|
|
142 | |
|
|
143 | region * |
|
|
144 | loader_base::get_region (const char *name) |
|
|
145 | { |
|
|
146 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n", |
|
|
147 | filename, name, type ()); |
|
|
148 | |
|
|
149 | return new region; |
|
|
150 | } |
|
|
151 | |
|
|
152 | facetile * |
|
|
153 | loader_base::get_face (const char *name) |
|
|
154 | { |
|
|
155 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n", |
|
|
156 | filename, name, type ()); |
|
|
157 | |
|
|
158 | return new facetile; |
|
|
159 | } |
|
|
160 | |
|
|
161 | treasurelist * |
|
|
162 | loader_base::get_treasure (const char *name, bool one) |
|
|
163 | { |
|
|
164 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n", |
|
|
165 | filename, name, type ()); |
|
|
166 | |
|
|
167 | return new treasurelist;//D |
|
|
168 | } |
|
|
169 | |
|
|
170 | animation * |
|
|
171 | loader_base::get_animation (const char *name) |
|
|
172 | { |
|
|
173 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n", |
|
|
174 | filename, name, type ()); |
|
|
175 | |
|
|
176 | return new animation; |
|
|
177 | } |
|
|
178 | |
|
|
179 | void |
|
|
180 | loader_base::put_arch (archetype *arch) |
|
|
181 | { |
|
|
182 | delete arch; |
|
|
183 | } |
|
|
184 | |
|
|
185 | void |
|
|
186 | loader_base::put_object (object *op) |
|
|
187 | { |
|
|
188 | op->destroy (); |
|
|
189 | } |
|
|
190 | |
|
|
191 | void |
|
|
192 | loader_base::put_player (player *pl) |
|
|
193 | { |
|
|
194 | delete pl; |
|
|
195 | } |
|
|
196 | |
|
|
197 | void |
|
|
198 | loader_base::put_region (region *region) |
|
|
199 | { |
|
|
200 | delete region; |
|
|
201 | } |
|
|
202 | |
|
|
203 | void |
|
|
204 | loader_base::put_face (facetile *face) |
|
|
205 | { |
|
|
206 | delete face; |
|
|
207 | } |
|
|
208 | |
|
|
209 | void |
|
|
210 | loader_base::put_treasure (treasurelist *treasure) |
|
|
211 | { |
|
|
212 | delete treasure; |
|
|
213 | } |
|
|
214 | |
|
|
215 | void |
|
|
216 | loader_base::put_animation (animation *anim) |
|
|
217 | { |
|
|
218 | delete anim; |
|
|
219 | } |
32 | |
220 | |
33 | /* Maps the MOVE_* values to names */ |
221 | /* Maps the MOVE_* values to names */ |
34 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
222 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
35 | |
223 | |
36 | /* This table is only necessary to convert objects that existed before the |
224 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
263 | static void |
451 | static void |
264 | check_loaded_object (object *op) |
452 | check_loaded_object (object *op) |
265 | { |
453 | { |
266 | int ip; |
454 | int ip; |
267 | |
455 | |
268 | /* We do some specialized handling to handle legacy cases of name_pl. |
456 | /* 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 - |
457 | * 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 |
458 | * 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 |
459 | * 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 |
460 | * 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. |
461 | * 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 |
462 | * Otherwise, what happens is that the the plural name will lose |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
463 | * information (appear as just 'hearts' and not 'goblins heart') |
… | |
… | |
320 | { |
508 | { |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
509 | 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; |
510 | op->gen_sp_armour = op->last_heal; |
323 | op->last_heal = 0; |
511 | op->last_heal = 0; |
324 | } |
512 | } |
325 | if (editor) |
513 | |
326 | ip = 0; |
|
|
327 | else |
|
|
328 | ip = calc_item_power (op, 0); |
514 | ip = calc_item_power (op, 0); |
329 | /* Legacy objects from before item power was in the game */ |
515 | /* Legacy objects from before item power was in the game */ |
330 | if (!op->item_power && ip) |
516 | if (!op->item_power && ip) |
331 | { |
517 | { |
332 | if (ip > 3) |
518 | if (ip > 3) |
333 | { |
519 | { |
… | |
… | |
375 | } |
561 | } |
376 | |
562 | |
377 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
563 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
378 | { |
564 | { |
379 | if (op->stats.hp > op->stats.maxhp) |
565 | if (op->stats.hp > op->stats.maxhp) |
|
|
566 | { |
380 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
567 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
568 | op->stats.maxhp = op->stats.hp; |
|
|
569 | } |
381 | |
570 | |
382 | /* The archs just need to be updated for this */ |
571 | /* The archs just need to be updated for this */ |
383 | if (op->move_type == 0) |
572 | if (op->move_type == 0) |
384 | op->move_type = MOVE_WALK; |
573 | op->move_type = MOVE_WALK; |
385 | } |
574 | } |
… | |
… | |
631 | if (!str) |
820 | if (!str) |
632 | { |
821 | { |
633 | op->animation_id = 0; |
822 | op->animation_id = 0; |
634 | CLEAR_FLAG (op, FLAG_ANIMATE); |
823 | CLEAR_FLAG (op, FLAG_ANIMATE); |
635 | } |
824 | } |
636 | else |
|
|
637 | { |
|
|
638 | op->animation_id = find_animation (str); |
825 | else if ((op->animation_id = find_animation (str))) |
639 | SET_FLAG (op, FLAG_ANIMATE); |
826 | SET_FLAG (op, FLAG_ANIMATE); |
640 | } |
|
|
641 | } |
827 | } |
642 | |
828 | |
643 | break; |
829 | break; |
644 | |
830 | |
645 | case KW_last_heal: thawer.get (op->last_heal); break; |
831 | case KW_last_heal: thawer.get (op->last_heal); break; |
… | |
… | |
652 | thawer.get (op->speed); |
838 | thawer.get (op->speed); |
653 | |
839 | |
654 | //TODO: maybe do in check_object |
840 | //TODO: maybe do in check_object |
655 | // removed check for style maps |
841 | // removed check for style maps |
656 | if (op->speed < 0) |
842 | if (op->speed < 0) |
657 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
843 | op->speed_left = op->speed_left - rndm (); |
658 | |
844 | |
659 | break; |
845 | break; |
660 | |
846 | |
661 | case KW_slow_move: |
847 | case KW_slow_move: |
662 | op->move_slow |= MOVE_WALK; |
848 | op->move_slow |= MOVE_WALK; |
… | |
… | |
816 | CLEAR_FLAG (op, FLAG_WIZCAST); |
1002 | CLEAR_FLAG (op, FLAG_WIZCAST); |
817 | } |
1003 | } |
818 | break; |
1004 | break; |
819 | |
1005 | |
820 | case KW_friendly: |
1006 | case KW_friendly: |
821 | GET_FLAG (op, FLAG_FRIENDLY); |
1007 | if (thawer.get_sint32 ()) |
822 | //TODO: move to check_object or so |
1008 | if (op->type != PLAYER) |
823 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
824 | add_friendly_object (op); |
1009 | add_friendly_object (op); |
|
|
1010 | |
825 | break; |
1011 | break; |
826 | |
1012 | |
827 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
1013 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
828 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
1014 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
829 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
1015 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
830 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
1016 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
1017 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
831 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
1018 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
832 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
1019 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
833 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
1020 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
834 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
1021 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
835 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
1022 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
… | |
… | |
906 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
1093 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
907 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
1094 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
908 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
1095 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
909 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
1096 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
910 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
1097 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
1098 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
911 | |
1099 | |
912 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1100 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
913 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1101 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
914 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
1102 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
915 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
1103 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
… | |
… | |
989 | case KW_msg: |
1177 | case KW_msg: |
990 | thawer.get_ml (KW_endmsg, op->msg); |
1178 | thawer.get_ml (KW_endmsg, op->msg); |
991 | //TODO: allow longer messages |
1179 | //TODO: allow longer messages |
992 | if (strlen (op->msg) >= HUGE_BUF) |
1180 | if (strlen (op->msg) >= HUGE_BUF) |
993 | { |
1181 | { |
994 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
1182 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
995 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1183 | op->msg = "ERROR, please report: string too long, winged.\n"; |
996 | } |
1184 | } |
997 | break; |
1185 | break; |
998 | |
1186 | |
999 | case KW_lore: |
1187 | case KW_lore: |
… | |
… | |
1001 | //TODO: allow longer messages |
1189 | //TODO: allow longer messages |
1002 | /* Just print a warning so we can be reasonably safe |
1190 | /* Just print a warning so we can be reasonably safe |
1003 | * about not overflowing the buffer. |
1191 | * about not overflowing the buffer. |
1004 | */ |
1192 | */ |
1005 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1193 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1006 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1194 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1007 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1195 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1008 | break; |
1196 | break; |
1009 | |
1197 | |
1010 | case KW_editable: |
1198 | case KW_editable: |
1011 | case KW_editor_folder: |
1199 | case KW_editor_folder: |
… | |
… | |
1057 | * |
1245 | * |
1058 | */ |
1246 | */ |
1059 | int |
1247 | int |
1060 | load_object (object_thawer &fp, object *op, int map_flags) |
1248 | load_object (object_thawer &fp, object *op, int map_flags) |
1061 | { |
1249 | { |
1062 | // cede every 500 objects loaded |
1250 | coroapi::cede_every (1000); // cede once in a while |
1063 | coroapi::cede_every (500); |
|
|
1064 | |
1251 | |
1065 | return parse_object (op, fp, map_flags); |
1252 | return parse_object (op, fp, map_flags); |
1066 | } |
1253 | } |
1067 | |
1254 | |
1068 | /* This takes a buffer, scans it for variables, and sets those variables |
1255 | /* This takes a buffer, scans it for variables, and sets those variables |
… | |
… | |
1267 | KW_berserk, |
1454 | KW_berserk, |
1268 | KW_neutral, |
1455 | KW_neutral, |
1269 | /* 100 */ |
1456 | /* 100 */ |
1270 | KW_no_attack, |
1457 | KW_no_attack, |
1271 | KW_no_damage, |
1458 | KW_no_damage, |
1272 | KW_NULL, |
1459 | KW_obj_original, |
1273 | KW_NULL, |
1460 | KW_NULL, |
1274 | KW_activate_on_push, |
1461 | KW_activate_on_push, |
1275 | KW_activate_on_release, |
1462 | KW_activate_on_release, |
1276 | KW_is_water, |
1463 | KW_is_water, |
1277 | KW_use_content_on_gen, |
1464 | KW_use_content_on_gen, |
1278 | KW_NULL, |
1465 | KW_NULL, |
1279 | KW_is_buildable, |
1466 | KW_is_buildable, |
1280 | /* 110 */ |
1467 | /* 110 */ |
|
|
1468 | KW_destroy_on_death, |
|
|
1469 | KW_NULL, |
1281 | }; |
1470 | }; |
1282 | |
1471 | |
1283 | int i; |
1472 | int i; |
1284 | |
1473 | |
1285 | /* This saves the key/value lists. We do it first so that any |
1474 | /* This saves the key/value lists. We do it first so that any |
1286 | * keys that match field names will be overwritten by the loader. |
1475 | * keys that match field names will be overwritten by the loader. |
1287 | */ |
1476 | */ |
1288 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1477 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1289 | { |
1478 | { |
1290 | /* Find the field in the opposing member. */ |
1479 | /* Find the field in the opposing member. */ |
1291 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1480 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1292 | |
1481 | |
1293 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1482 | /* If there's no partnering field, or it's got a different value, save our field. */ |
… | |
… | |
1440 | * the only place this is not set is when saving the player. |
1629 | * the only place this is not set is when saving the player. |
1441 | */ |
1630 | */ |
1442 | void |
1631 | void |
1443 | save_object (object_freezer &fp, object *op, int flag) |
1632 | save_object (object_freezer &fp, object *op, int flag) |
1444 | { |
1633 | { |
1445 | // cede every 500 objects saved |
|
|
1446 | coroapi::cede_every (500); |
|
|
1447 | |
|
|
1448 | /* Even if the object does have an owner, it would seem that we should |
1634 | /* Even if the object does have an owner, it would seem that we should |
1449 | * still save it. |
1635 | * still save it. |
1450 | */ |
1636 | */ |
1451 | if (op->owner) |
1637 | if (op->owner) |
1452 | return; |
1638 | return; |