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 <newserver.h> |
|
|
32 | #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 | ///////////////////////////////////////////////////////////////////////////// |
33 | |
192 | |
34 | /* Maps the MOVE_* values to names */ |
193 | /* Maps the MOVE_* values to names */ |
35 | 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 }; |
36 | |
195 | |
37 | /* 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 |
… | |
… | |
264 | static void |
423 | static void |
265 | check_loaded_object (object *op) |
424 | check_loaded_object (object *op) |
266 | { |
425 | { |
267 | int ip; |
426 | int ip; |
268 | |
427 | |
269 | /* 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. |
270 | * 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 - |
271 | * 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 |
272 | * 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 |
273 | * 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 |
274 | * 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. |
275 | * Otherwise, what happens is that the the plural name will lose |
434 | * Otherwise, what happens is that the the plural name will lose |
276 | * information (appear as just 'hearts' and not 'goblins heart') |
435 | * information (appear as just 'hearts' and not 'goblins heart') |
… | |
… | |
280 | |
439 | |
281 | if (!op->name_pl) |
440 | if (!op->name_pl) |
282 | op->name_pl = op->name; |
441 | op->name_pl = op->name; |
283 | |
442 | |
284 | /* objects now have a materialname. try to patch it in */ |
443 | /* objects now have a materialname. try to patch it in */ |
285 | if (!(IS_WEAPON (op) && op->level > 0)) |
444 | if (!(op->is_weapon () && op->level > 0)) |
286 | { |
445 | { |
287 | if (op->map != NULL) |
446 | if (op->map != NULL) |
288 | set_materialname (op, op->map->difficulty, NULL); |
447 | set_materialname (op, op->map->difficulty, NULL); |
289 | else |
448 | else |
290 | set_materialname (op, 5, NULL); |
449 | set_materialname (op, 5, NULL); |
… | |
… | |
321 | { |
480 | { |
322 | 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 ()); |
323 | op->gen_sp_armour = op->last_heal; |
482 | op->gen_sp_armour = op->last_heal; |
324 | op->last_heal = 0; |
483 | op->last_heal = 0; |
325 | } |
484 | } |
326 | if (editor) |
485 | |
327 | ip = 0; |
|
|
328 | else |
|
|
329 | ip = calc_item_power (op, 0); |
486 | ip = calc_item_power (op, 0); |
330 | /* Legacy objects from before item power was in the game */ |
487 | /* Legacy objects from before item power was in the game */ |
331 | if (!op->item_power && ip) |
488 | if (!op->item_power && ip) |
332 | { |
489 | { |
333 | if (ip > 3) |
490 | if (ip > 3) |
334 | { |
491 | { |
… | |
… | |
376 | } |
533 | } |
377 | |
534 | |
378 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
535 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
379 | { |
536 | { |
380 | if (op->stats.hp > op->stats.maxhp) |
537 | if (op->stats.hp > op->stats.maxhp) |
|
|
538 | { |
381 | 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 | } |
382 | |
542 | |
383 | /* The archs just need to be updated for this */ |
543 | /* The archs just need to be updated for this */ |
384 | if (op->move_type == 0) |
544 | if (op->move_type == 0) |
385 | op->move_type = MOVE_WALK; |
545 | op->move_type = MOVE_WALK; |
386 | } |
546 | } |
… | |
… | |
488 | SET_FLAG (op, flag); \ |
648 | SET_FLAG (op, flag); \ |
489 | else \ |
649 | else \ |
490 | CLEAR_FLAG (op, flag) \ |
650 | CLEAR_FLAG (op, flag) \ |
491 | |
651 | |
492 | int |
652 | int |
493 | parse_object (object *op, object_thawer & thawer, int map_flags) |
653 | parse_object (object *op, object_thawer &thawer, int map_flags) |
494 | { |
654 | { |
495 | bool ismore = 0; |
655 | bool ismore = 0; |
496 | object *op_inv = op->inv; |
656 | object *op_inv = op->inv; |
497 | |
657 | |
498 | for (;;) |
658 | for (;;) |
… | |
… | |
503 | { |
663 | { |
504 | case KW_Object: // uppercase alias |
664 | case KW_Object: // uppercase alias |
505 | case KW_object: |
665 | case KW_object: |
506 | thawer.get (op->name); |
666 | thawer.get (op->name); |
507 | |
667 | |
508 | if (op->arch != NULL) |
668 | if (op->arch) |
509 | op->arch->name = op->name; |
669 | op->arch->name = op->name; |
510 | |
670 | |
511 | break; |
671 | break; |
512 | |
672 | |
513 | case KW_uuid: |
673 | case KW_uuid: |
… | |
… | |
552 | */ |
712 | */ |
553 | archetype *arch = archetype::find (str); |
713 | archetype *arch = archetype::find (str); |
554 | |
714 | |
555 | object *tmp; |
715 | object *tmp; |
556 | |
716 | |
557 | if (arch != NULL) |
717 | if (arch) |
558 | tmp = arch_to_object (arch); |
718 | tmp = arch_to_object (arch); |
559 | else |
719 | else |
560 | { |
720 | { |
561 | tmp = get_object (); |
721 | tmp = object::create (); |
562 | /* record the name of the broken object */ |
722 | /* record the name of the broken object */ |
563 | tmp->name = str; |
723 | tmp->name = str; |
564 | } |
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 (); |
565 | |
730 | |
566 | parse_object (tmp, thawer, map_flags); |
731 | parse_object (tmp, thawer, map_flags); |
567 | |
732 | |
568 | if (tmp->arch) |
733 | if (tmp->arch) |
569 | { |
734 | { |
… | |
… | |
593 | op_inv = tmp; |
758 | op_inv = tmp; |
594 | } |
759 | } |
595 | else |
760 | else |
596 | { |
761 | { |
597 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
762 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
598 | tmp->destroy (0); |
763 | tmp->destroy (); |
599 | } |
764 | } |
600 | } |
765 | } |
601 | else |
766 | else |
602 | { |
767 | { |
603 | /* This is the actual archetype definition then */ |
768 | /* This is the actual archetype definition then */ |
604 | op->arch = archetype::find (str); |
769 | op->arch = archetype::find (str); |
605 | |
770 | |
606 | if (op->arch != NULL) |
771 | if (op->arch) |
607 | copy_object (&op->arch->clone, op); |
772 | { |
|
|
773 | op->arch->clone.copy_to (op); |
|
|
774 | // copy_to activates, this should be fixed properly |
|
|
775 | op->deactivate (); |
|
|
776 | } |
608 | else if (!arch_init) |
777 | else if (!arch_init) |
609 | /* record the name of the broken object */ |
778 | /* record the name of the broken object */ |
610 | op->name = str; |
779 | op->name = str; |
611 | } |
780 | } |
612 | } |
781 | } |
… | |
… | |
623 | if (!str) |
792 | if (!str) |
624 | { |
793 | { |
625 | op->animation_id = 0; |
794 | op->animation_id = 0; |
626 | CLEAR_FLAG (op, FLAG_ANIMATE); |
795 | CLEAR_FLAG (op, FLAG_ANIMATE); |
627 | } |
796 | } |
628 | else |
|
|
629 | { |
|
|
630 | op->animation_id = find_animation (str); |
797 | else if ((op->animation_id = find_animation (str))) |
631 | SET_FLAG (op, FLAG_ANIMATE); |
798 | SET_FLAG (op, FLAG_ANIMATE); |
632 | } |
|
|
633 | } |
799 | } |
634 | |
800 | |
635 | break; |
801 | break; |
636 | |
802 | |
637 | case KW_last_heal: thawer.get (op->last_heal); break; |
803 | case KW_last_heal: thawer.get (op->last_heal); break; |
… | |
… | |
642 | |
808 | |
643 | case KW_speed: |
809 | case KW_speed: |
644 | thawer.get (op->speed); |
810 | thawer.get (op->speed); |
645 | |
811 | |
646 | //TODO: maybe do in check_object |
812 | //TODO: maybe do in check_object |
647 | if (!(map_flags & MAP_STYLE)) |
813 | // removed check for style maps |
648 | { |
|
|
649 | if (op->speed < 0) |
814 | if (op->speed < 0) |
650 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
815 | op->speed_left = op->speed_left - rndm (); |
651 | |
|
|
652 | update_ob_speed (op); |
|
|
653 | } |
|
|
654 | |
816 | |
655 | break; |
817 | break; |
656 | |
818 | |
657 | case KW_slow_move: |
819 | case KW_slow_move: |
658 | op->move_slow |= MOVE_WALK; |
820 | op->move_slow |= MOVE_WALK; |
… | |
… | |
812 | CLEAR_FLAG (op, FLAG_WIZCAST); |
974 | CLEAR_FLAG (op, FLAG_WIZCAST); |
813 | } |
975 | } |
814 | break; |
976 | break; |
815 | |
977 | |
816 | case KW_friendly: |
978 | case KW_friendly: |
817 | GET_FLAG (op, FLAG_FRIENDLY); |
979 | if (thawer.get_sint32 ()) |
818 | //TODO: move to check_object or so |
980 | if (op->type != PLAYER) |
819 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
820 | add_friendly_object (op); |
981 | add_friendly_object (op); |
|
|
982 | |
821 | break; |
983 | break; |
822 | |
984 | |
823 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
985 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
824 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
986 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
825 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
987 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
826 | 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; |
827 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
990 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
828 | 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; |
829 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
992 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
830 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
993 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
831 | case KW_treasure: GET_FLAG (op, FLAG_TREASURE); break; |
|
|
832 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
994 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
833 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
995 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
834 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
996 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
835 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
997 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
836 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
998 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
… | |
… | |
903 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
1065 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
904 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
1066 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
905 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
1067 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
906 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
1068 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
907 | 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; |
908 | |
1071 | |
909 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1072 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
910 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1073 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
911 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
1074 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
912 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
1075 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
… | |
… | |
982 | case KW_randomitems: |
1145 | case KW_randomitems: |
983 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1146 | op->randomitems = find_treasurelist (thawer.get_str ()); |
984 | break; |
1147 | break; |
985 | |
1148 | |
986 | case KW_msg: |
1149 | case KW_msg: |
987 | { |
|
|
988 | thawer.get_ml (KW_endmsg, op->msg); |
1150 | thawer.get_ml (KW_endmsg, op->msg); |
989 | //TODO: allow longer messages |
1151 | //TODO: allow longer messages |
990 | if (strlen (op->msg) >= HUGE_BUF) |
1152 | if (strlen (op->msg) >= HUGE_BUF) |
991 | { |
1153 | { |
992 | 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); |
993 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1155 | op->msg = "ERROR, please report: string too long, winged.\n"; |
994 | } |
1156 | } |
995 | } |
|
|
996 | break; |
1157 | break; |
997 | |
1158 | |
998 | case KW_lore: |
1159 | case KW_lore: |
999 | { |
|
|
1000 | shstr msgbuf; |
|
|
1001 | |
|
|
1002 | thawer.get_ml (KW_endlore, op->lore); |
1160 | thawer.get_ml (KW_endlore, op->lore); |
1003 | //TODO: allow longer messages |
1161 | //TODO: allow longer messages |
1004 | /* Just print a warning so we can be reasonably safe |
1162 | /* Just print a warning so we can be reasonably safe |
1005 | * about not overflowing the buffer. |
1163 | * about not overflowing the buffer. |
1006 | */ |
1164 | */ |
1007 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1165 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1008 | 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", |
1009 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1167 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1010 | } |
|
|
1011 | break; |
1168 | break; |
1012 | |
1169 | |
1013 | case KW_editable: |
1170 | case KW_editable: |
1014 | case KW_editor_folder: |
1171 | case KW_editor_folder: |
1015 | break; |
1172 | break; |
… | |
… | |
1032 | |
1189 | |
1033 | case KW_EOF: |
1190 | case KW_EOF: |
1034 | return LL_EOF; |
1191 | return LL_EOF; |
1035 | |
1192 | |
1036 | case KW_ERROR: |
1193 | case KW_ERROR: |
1037 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1194 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1038 | //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 |
1039 | |
|
|
1040 | //TODO: skip line, ugly, factor parsing better |
|
|
1041 | if (thawer.last_value) |
|
|
1042 | thawer.line = thawer.last_value; |
|
|
1043 | |
|
|
1044 | thawer.line += strlen (thawer.line) + 1; |
|
|
1045 | |
|
|
1046 | break; |
1196 | break; |
1047 | |
1197 | |
1048 | default: |
1198 | default: |
1049 | 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; |
1050 | break; |
1201 | break; |
1051 | } |
1202 | } |
1052 | } |
1203 | } |
1053 | } |
1204 | } |
1054 | |
1205 | |
… | |
… | |
1064 | * 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 |
1065 | * be reset. |
1216 | * be reset. |
1066 | * 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) |
1067 | * |
1218 | * |
1068 | */ |
1219 | */ |
1069 | |
|
|
1070 | int |
1220 | int |
1071 | load_object (object_thawer & fp, object *op, int map_flags) |
1221 | load_object (object_thawer &fp, object *op, int map_flags) |
1072 | { |
1222 | { |
|
|
1223 | coroapi::cede_every (1000); // cede once in a while |
|
|
1224 | |
1073 | return parse_object (op, fp, map_flags); |
1225 | return parse_object (op, fp, map_flags); |
1074 | } |
1226 | } |
1075 | |
|
|
1076 | |
1227 | |
1077 | /* 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 |
1078 | * as appropriate in op. |
1229 | * as appropriate in op. |
1079 | * |
1230 | * |
1080 | * 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 |
… | |
… | |
1183 | KW_monster, |
1334 | KW_monster, |
1184 | KW_friendly, |
1335 | KW_friendly, |
1185 | KW_generator, |
1336 | KW_generator, |
1186 | KW_is_thrown, |
1337 | KW_is_thrown, |
1187 | KW_auto_apply, |
1338 | KW_auto_apply, |
1188 | KW_treasure, |
1339 | KW_NULL, // was KW_treasure |
1189 | KW_player_sold, |
1340 | KW_player_sold, |
1190 | /* 20 */ |
1341 | /* 20 */ |
1191 | KW_see_invisible, |
1342 | KW_see_invisible, |
1192 | KW_can_roll, |
1343 | KW_can_roll, |
1193 | KW_overlay_floor, |
1344 | KW_overlay_floor, |
… | |
… | |
1276 | KW_berserk, |
1427 | KW_berserk, |
1277 | KW_neutral, |
1428 | KW_neutral, |
1278 | /* 100 */ |
1429 | /* 100 */ |
1279 | KW_no_attack, |
1430 | KW_no_attack, |
1280 | KW_no_damage, |
1431 | KW_no_damage, |
1281 | KW_NULL, |
1432 | KW_obj_original, |
1282 | KW_NULL, |
1433 | KW_NULL, |
1283 | KW_activate_on_push, |
1434 | KW_activate_on_push, |
1284 | KW_activate_on_release, |
1435 | KW_activate_on_release, |
1285 | KW_is_water, |
1436 | KW_is_water, |
1286 | KW_use_content_on_gen, |
1437 | KW_use_content_on_gen, |
1287 | KW_NULL, |
1438 | KW_NULL, |
1288 | KW_is_buildable, |
1439 | KW_is_buildable, |
1289 | /* 110 */ |
1440 | /* 110 */ |
|
|
1441 | KW_destroy_on_death, |
|
|
1442 | KW_NULL, |
1290 | }; |
1443 | }; |
1291 | |
1444 | |
1292 | int i; |
1445 | int i; |
1293 | |
1446 | |
1294 | /* 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 |
1295 | * keys that match field names will be overwritten by the loader. |
1448 | * keys that match field names will be overwritten by the loader. |
1296 | */ |
1449 | */ |
1297 | 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) |
1298 | { |
1451 | { |
1299 | /* Find the field in the opposing member. */ |
1452 | /* Find the field in the opposing member. */ |
1300 | 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); |
1301 | |
1454 | |
1302 | /* 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. */ |
1303 | if (!arch_field || my_field->value != arch_field->value) |
1456 | if (!arch_field || my_field->value != arch_field->value) |
1304 | f.put (my_field->key, my_field->value); |
1457 | f.put (my_field->key, my_field->value); |
1305 | } |
1458 | } |
1306 | |
1459 | |
1307 | /* We don't need to worry about the arch's extra fields - they |
1460 | /* We don't need to worry about the arch's extra fields - they |
1308 | * will get taken care of the copy_object function. |
1461 | * will get taken care of the copy_to method. |
1309 | */ |
1462 | */ |
1310 | |
1463 | |
1311 | { |
1464 | { |
1312 | char uids[64]; |
1465 | char uids[64]; |
1313 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
1466 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
… | |
… | |
1430 | CMP_OUT (move_on); |
1583 | CMP_OUT (move_on); |
1431 | CMP_OUT (move_off); |
1584 | CMP_OUT (move_off); |
1432 | CMP_OUT (move_slow); |
1585 | CMP_OUT (move_slow); |
1433 | CMP_OUT (move_slow_penalty); |
1586 | CMP_OUT (move_slow_penalty); |
1434 | |
1587 | |
1435 | if (!COMPARE_FLAGS (op, tmp)) |
1588 | if (op->flag != tmp->flag) |
1436 | for (i = 0; i <= NUM_FLAGS; i++) |
1589 | for (i = 0; i <= NUM_FLAGS; i++) |
1437 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1590 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1438 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1591 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1439 | |
1592 | |
1440 | /* Save body locations */ |
1593 | /* Save body locations */ |
1441 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1594 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1442 | if (op->body_info[i] != tmp->body_info[i]) |
1595 | if (op->body_info[i] != tmp->body_info[i]) |
1443 | f.put (body_locations[i].save_name, op->body_info[i]); |
1596 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1445 | |
1598 | |
1446 | /* |
1599 | /* |
1447 | * Dumps all variables in an object to a file. |
1600 | * Dumps all variables in an object to a file. |
1448 | * 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, |
1449 | * 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. |
1450 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
1451 | * all of the callers are setting this. |
|
|
1452 | */ |
1603 | */ |
1453 | |
|
|
1454 | void |
1604 | void |
1455 | save_object (object_freezer & fp, object *op, int flag) |
1605 | save_object (object_freezer &fp, object *op, int flag) |
1456 | { |
1606 | { |
1457 | archetype *at; |
|
|
1458 | object *tmp, *old; |
|
|
1459 | |
|
|
1460 | /* 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 |
1461 | * still save it. |
1608 | * still save it. |
1462 | */ |
1609 | */ |
1463 | if (op->owner) |
1610 | if (op->owner) |
1464 | return; |
1611 | return; |
1465 | |
1612 | |
1466 | /* 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. */ |
1467 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
1614 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
1468 | return; |
1615 | return; |
1469 | |
1616 | |
1470 | if ((at = op->arch) == NULL) |
1617 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1471 | at = empty_archetype; |
|
|
1472 | |
1618 | |
1473 | fp.put (KW_arch, at->name); |
1619 | fp.put (KW_arch, at->name); |
1474 | |
|
|
1475 | put (fp, op, &at->clone); |
1620 | put (fp, op, &at->clone); |
1476 | |
1621 | |
1477 | /* 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 */ |
1478 | |
1623 | |
1479 | old = NULL; |
|
|
1480 | |
|
|
1481 | if (flag & 2) |
|
|
1482 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1624 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1483 | save_object (fp, tmp, flag); |
1625 | save_object (fp, tmp, flag); |
1484 | else |
|
|
1485 | /* Slightly different logic because tmp/op will be removed by |
|
|
1486 | * the save_object we call. So we just keep looking at op->inv |
|
|
1487 | * until there is nothing left. In theory, the variable old |
|
|
1488 | * should not be needed, as recursive loops shouldn't happen. |
|
|
1489 | */ |
|
|
1490 | while ((tmp = op->inv) != NULL) |
|
|
1491 | { |
|
|
1492 | if (old == tmp) |
|
|
1493 | { |
|
|
1494 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
1495 | break; |
|
|
1496 | } |
|
|
1497 | |
|
|
1498 | save_object (fp, tmp, flag); |
|
|
1499 | old = tmp; |
|
|
1500 | } |
|
|
1501 | |
|
|
1502 | if (!(flag & 2)) |
|
|
1503 | { |
|
|
1504 | op->remove (); |
|
|
1505 | op->destroy (0); |
|
|
1506 | } |
|
|
1507 | |
1626 | |
1508 | fp.put (op); |
1627 | fp.put (op); |
1509 | fprintf (fp, "end\n"); |
1628 | fp.put (KW_end); |
1510 | } |
1629 | } |
1511 | |
1630 | |