ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.27 by root, Sat Dec 23 06:41:39 2006 UTC vs.
Revision 1.53 by root, Thu Feb 1 19:40:42 2007 UTC

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
35loader_base::~loader_base ()
36{
37}
38
39// the base class warns about and skips everything
40archetype *
41loader_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
49object *
50loader_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
58player *
59loader_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
67region *
68loader_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
76facetile *
77loader_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
85treasurelist *
86loader_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
94animation *
95loader_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
103void
104loader_base::put_arch (archetype *arch)
105{
106 delete arch;
107}
108
109void
110loader_base::put_object (object *op)
111{
112 op->destroy ();
113}
114
115void
116loader_base::put_player (player *pl)
117{
118 delete pl;
119}
120
121void
122loader_base::put_region (region *region)
123{
124 delete region;
125}
126
127void
128loader_base::put_face (facetile *face)
129{
130 delete face;
131}
132
133void
134loader_base::put_treasure (treasurelist *treasure)
135{
136 delete treasure;
137}
138
139void
140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
144
145/////////////////////////////////////////////////////////////////////////////
146
147bool 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
179bool 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 */
34static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 194static 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
… …
263static void 423static void
264check_loaded_object (object *op) 424check_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 }
… …
487 SET_FLAG (op, flag); \ 648 SET_FLAG (op, flag); \
488 else \ 649 else \
489 CLEAR_FLAG (op, flag) \ 650 CLEAR_FLAG (op, flag) \
490 651
491int 652int
492parse_object (object *op, object_thawer & thawer, int map_flags) 653parse_object (object *op, object_thawer &thawer, int map_flags)
493{ 654{
494 bool ismore = 0; 655 bool ismore = 0;
495 object *op_inv = op->inv; 656 object *op_inv = op->inv;
496 657
497 for (;;) 658 for (;;)
… …
502 { 663 {
503 case KW_Object: // uppercase alias 664 case KW_Object: // uppercase alias
504 case KW_object: 665 case KW_object:
505 thawer.get (op->name); 666 thawer.get (op->name);
506 667
507 if (op->arch != NULL) 668 if (op->arch)
508 op->arch->name = op->name; 669 op->arch->name = op->name;
509 670
510 break; 671 break;
511 672
512 case KW_uuid: 673 case KW_uuid:
… …
551 */ 712 */
552 archetype *arch = archetype::find (str); 713 archetype *arch = archetype::find (str);
553 714
554 object *tmp; 715 object *tmp;
555 716
556 if (arch != NULL) 717 if (arch)
557 tmp = arch_to_object (arch); 718 tmp = arch_to_object (arch);
558 else 719 else
559 { 720 {
560 tmp = object::create (); 721 tmp = object::create ();
561 /* record the name of the broken object */ 722 /* record the name of the broken object */
562 tmp->name = str; 723 tmp->name = str;
563 } 724 }
725
726 // decativate the object we, as we are still going
727 // to read the speed value. Objects should be activated
728 // when the map, object or player is completly loaded.
729 tmp->deactivate ();
564 730
565 parse_object (tmp, thawer, map_flags); 731 parse_object (tmp, thawer, map_flags);
566 732
567 if (tmp->arch) 733 if (tmp->arch)
568 { 734 {
… …
601 { 767 {
602 /* This is the actual archetype definition then */ 768 /* This is the actual archetype definition then */
603 op->arch = archetype::find (str); 769 op->arch = archetype::find (str);
604 770
605 if (op->arch) 771 if (op->arch)
772 {
606 op->arch->clone.copy_to (op); 773 op->arch->clone.copy_to (op);
774 // copy_to activates, this should be fixed properly
775 op->deactivate ();
776 }
607 else if (!arch_init) 777 else if (!arch_init)
608 /* record the name of the broken object */ 778 /* record the name of the broken object */
609 op->name = str; 779 op->name = str;
610 } 780 }
611 } 781 }
… …
622 if (!str) 792 if (!str)
623 { 793 {
624 op->animation_id = 0; 794 op->animation_id = 0;
625 CLEAR_FLAG (op, FLAG_ANIMATE); 795 CLEAR_FLAG (op, FLAG_ANIMATE);
626 } 796 }
627 else
628 {
629 op->animation_id = find_animation (str); 797 else if ((op->animation_id = find_animation (str)))
630 SET_FLAG (op, FLAG_ANIMATE); 798 SET_FLAG (op, FLAG_ANIMATE);
631 }
632 } 799 }
633 800
634 break; 801 break;
635 802
636 case KW_last_heal: thawer.get (op->last_heal); break; 803 case KW_last_heal: thawer.get (op->last_heal); break;
… …
641 808
642 case KW_speed: 809 case KW_speed:
643 thawer.get (op->speed); 810 thawer.get (op->speed);
644 811
645 //TODO: maybe do in check_object 812 //TODO: maybe do in check_object
646 if (!(map_flags & MAP_STYLE)) 813 // removed check for style maps
647 {
648 if (op->speed < 0) 814 if (op->speed < 0)
649 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 815 op->speed_left = op->speed_left - rndm ();
650
651 update_ob_speed (op);
652 }
653 816
654 break; 817 break;
655 818
656 case KW_slow_move: 819 case KW_slow_move:
657 op->move_slow |= MOVE_WALK; 820 op->move_slow |= MOVE_WALK;
… …
811 CLEAR_FLAG (op, FLAG_WIZCAST); 974 CLEAR_FLAG (op, FLAG_WIZCAST);
812 } 975 }
813 break; 976 break;
814 977
815 case KW_friendly: 978 case KW_friendly:
816 GET_FLAG (op, FLAG_FRIENDLY); 979 if (thawer.get_sint32 ())
817 //TODO: move to check_object or so 980 if (op->type != PLAYER)
818 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
819 add_friendly_object (op); 981 add_friendly_object (op);
982
820 break; 983 break;
821 984
822 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 985 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
823 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 986 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
824 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 987 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
825 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;
826 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 990 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
827 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;
828 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 992 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
829 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 993 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break;
830 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 994 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
… …
901 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1065 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
902 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1066 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
903 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1067 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
904 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1068 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
905 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;
906 1071
907 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1072 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
908 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1073 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1074 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
910 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1075 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
980 case KW_randomitems: 1145 case KW_randomitems:
981 op->randomitems = find_treasurelist (thawer.get_str ()); 1146 op->randomitems = find_treasurelist (thawer.get_str ());
982 break; 1147 break;
983 1148
984 case KW_msg: 1149 case KW_msg:
985 {
986 thawer.get_ml (KW_endmsg, op->msg); 1150 thawer.get_ml (KW_endmsg, op->msg);
987 //TODO: allow longer messages 1151 //TODO: allow longer messages
988 if (strlen (op->msg) >= HUGE_BUF) 1152 if (strlen (op->msg) >= HUGE_BUF)
989 { 1153 {
990 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);
991 op->msg = "ERROR, please report: string too long, winged.\n"; 1155 op->msg = "ERROR, please report: string too long, winged.\n";
992 } 1156 }
993 }
994 break; 1157 break;
995 1158
996 case KW_lore: 1159 case KW_lore:
997 {
998 shstr msgbuf;
999
1000 thawer.get_ml (KW_endlore, op->lore); 1160 thawer.get_ml (KW_endlore, op->lore);
1001 //TODO: allow longer messages 1161 //TODO: allow longer messages
1002 /* Just print a warning so we can be reasonably safe 1162 /* Just print a warning so we can be reasonably safe
1003 * about not overflowing the buffer. 1163 * about not overflowing the buffer.
1004 */ 1164 */
1005 if (strlen (op->lore) > (HUGE_BUF / 2)) 1165 if (strlen (op->lore) > (HUGE_BUF / 2))
1006 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",
1007 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1167 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1008 }
1009 break; 1168 break;
1010 1169
1011 case KW_editable: 1170 case KW_editable:
1012 case KW_editor_folder: 1171 case KW_editor_folder:
1013 break; 1172 break;
… …
1030 1189
1031 case KW_EOF: 1190 case KW_EOF:
1032 return LL_EOF; 1191 return LL_EOF;
1033 1192
1034 case KW_ERROR: 1193 case KW_ERROR:
1035 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1194 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1036 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1195 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1037
1038 //TODO: skip line, ugly, factor parsing better
1039 if (thawer.last_value)
1040 thawer.line = thawer.last_value;
1041
1042 thawer.line += strlen (thawer.line) + 1;
1043
1044 break; 1196 break;
1045 1197
1046 default: 1198 default:
1047 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;
1048 break; 1201 break;
1049 } 1202 }
1050 } 1203 }
1051} 1204}
1052 1205
… …
1062 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1215 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1063 * be reset. 1216 * be reset.
1064 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1217 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1065 * 1218 *
1066 */ 1219 */
1067
1068int 1220int
1069load_object (object_thawer & fp, object *op, int map_flags) 1221load_object (object_thawer &fp, object *op, int map_flags)
1070{ 1222{
1223 coroapi::cede_every (1000); // cede once in a while
1224
1071 return parse_object (op, fp, map_flags); 1225 return parse_object (op, fp, map_flags);
1072} 1226}
1073
1074 1227
1075/* 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
1076 * as appropriate in op. 1229 * as appropriate in op.
1077 * 1230 *
1078 * This function appears to be used in only 2 places - in crossedit to 1231 * This function appears to be used in only 2 places - in crossedit to
… …
1274 KW_berserk, 1427 KW_berserk,
1275 KW_neutral, 1428 KW_neutral,
1276 /* 100 */ 1429 /* 100 */
1277 KW_no_attack, 1430 KW_no_attack,
1278 KW_no_damage, 1431 KW_no_damage,
1279 KW_NULL, 1432 KW_obj_original,
1280 KW_NULL, 1433 KW_NULL,
1281 KW_activate_on_push, 1434 KW_activate_on_push,
1282 KW_activate_on_release, 1435 KW_activate_on_release,
1283 KW_is_water, 1436 KW_is_water,
1284 KW_use_content_on_gen, 1437 KW_use_content_on_gen,
1285 KW_NULL, 1438 KW_NULL,
1286 KW_is_buildable, 1439 KW_is_buildable,
1287 /* 110 */ 1440 /* 110 */
1441 KW_destroy_on_death,
1442 KW_NULL,
1288 }; 1443 };
1289 1444
1290 int i; 1445 int i;
1291 1446
1292 /* 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
1293 * keys that match field names will be overwritten by the loader. 1448 * keys that match field names will be overwritten by the loader.
1294 */ 1449 */
1295 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)
1296 { 1451 {
1297 /* Find the field in the opposing member. */ 1452 /* Find the field in the opposing member. */
1298 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);
1299 1454
1300 /* 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. */
… …
1443 1598
1444/* 1599/*
1445 * Dumps all variables in an object to a file. 1600 * Dumps all variables in an object to a file.
1446 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1601 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1447 * the only place this is not set is when saving the player. 1602 * the only place this is not set is when saving the player.
1448 * If bit 1 of flag is set, don't remove the object after save. As of now,
1449 * all of the callers are setting this.
1450 */ 1603 */
1451
1452void 1604void
1453save_object (object_freezer & fp, object *op, int flag) 1605save_object (object_freezer &fp, object *op, int flag)
1454{ 1606{
1455 archetype *at;
1456 object *tmp, *old;
1457
1458 /* Even if the object does have an owner, it would seem that we should 1607 /* Even if the object does have an owner, it would seem that we should
1459 * still save it. 1608 * still save it.
1460 */ 1609 */
1461 if (op->owner) 1610 if (op->owner)
1462 return; 1611 return;
1463 1612
1464 /* If it is unpaid and we don't want to save those, just return. */ 1613 /* If it is unpaid and we don't want to save those, just return. */
1465 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1614 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1466 return; 1615 return;
1467 1616
1468 if ((at = op->arch) == NULL) 1617 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1469 at = empty_archetype;
1470 1618
1471 fp.put (KW_arch, at->name); 1619 fp.put (KW_arch, at->name);
1472
1473 put (fp, op, &at->clone); 1620 put (fp, op, &at->clone);
1474 1621
1475 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1622 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1476 1623
1477 old = NULL;
1478
1479 if (flag & 2)
1480 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1624 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1481 save_object (fp, tmp, flag); 1625 save_object (fp, tmp, flag);
1482 else
1483 /* Slightly different logic because tmp/op will be removed by
1484 * the save_object we call. So we just keep looking at op->inv
1485 * until there is nothing left. In theory, the variable old
1486 * should not be needed, as recursive loops shouldn't happen.
1487 */
1488 while ((tmp = op->inv) != NULL)
1489 {
1490 if (old == tmp)
1491 {
1492 LOG (llevError, " Recursive loop in inventory\n");
1493 break;
1494 }
1495
1496 save_object (fp, tmp, flag);
1497 old = tmp;
1498 }
1499
1500 if (!(flag & 2))
1501 op->destroy ();
1502 1626
1503 fp.put (op); 1627 fp.put (op);
1504 fprintf (fp, "end\n"); 1628 fp.put (KW_end);
1505} 1629}
1506 1630

Diff Legend

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