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.18 by root, Fri Sep 15 00:31:36 2006 UTC vs.
Revision 1.52 by root, Thu Feb 1 19:15:38 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 <newserver.h>
32#include <sproto.h> 31#include <sproto.h>
32
33/////////////////////////////////////////////////////////////////////////////
34
35// the base class warns about and skips everything
36archetype *
37loader_base::get_arch (const char *name)
38{
39 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
40 filename, name);
41
42 return new archetype;
43}
44
45object *
46loader_base::get_object (const char *name)
47{
48 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
49 filename, name);
50
51 return object::create ();
52}
53
54player *
55loader_base::get_player ()
56{
57 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
58 filename);
59
60 return player::create ();
61}
62
63region *
64loader_base::get_region (const char *name)
65{
66 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
67 filename, name);
68
69 return new region;
70}
71
72facetile *
73loader_base::get_face (const char *name)
74{
75 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
76 filename, name);
77
78 return new facetile;
79}
80
81treasurelist *
82loader_base::get_treasure (const char *name, bool one)
83{
84 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
85 filename, name);
86
87 return new treasurelist;//D
88}
89
90animation *
91loader_base::get_animation (const char *name)
92{
93 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
94 filename, name);
95
96 return new animation;
97}
98
99void
100loader_base::put_arch (archetype *arch)
101{
102 delete arch;
103}
104
105void
106loader_base::put_object (object *op)
107{
108 op->destroy ();
109}
110
111void
112loader_base::put_player (player *pl)
113{
114 delete pl;
115}
116
117void
118loader_base::put_region (region *region)
119{
120 delete region;
121}
122
123void
124loader_base::put_face (facetile *face)
125{
126 delete face;
127}
128
129void
130loader_base::put_treasure (treasurelist *treasure)
131{
132 delete treasure;
133}
134
135void
136loader_base::put_animation (animation *anim)
137{
138 delete anim;
139}
140
141/////////////////////////////////////////////////////////////////////////////
142
143bool loader_base::parse (object_thawer &thawer)
144{
145 for (;;)
146 {
147 keyword kw = thawer.get_kv ();
148
149 switch (kw)
150 {
151 case KW_region:
152 {
153 region *rgn = get_region (thawer.get_str ());
154
155 if (!parse_region (thawer, rgn))
156 {
157 delete rgn;
158 return false;
159 }
160
161 put_region (rgn);
162 }
163 break;
164
165 case KW_EOF:
166 return true;
167
168 default:
169 if (!thawer.parse_error (kw, "resource file"))
170 return false;
171 }
172 }
173}
174
175bool loader_base::load (const char *filename)
176{
177 this->filename = filename;
178
179 object_thawer fp (filename);
180
181 if (!fp)
182 return false;
183
184 return parse (fp);
185}
186
187/////////////////////////////////////////////////////////////////////////////
33 188
34/* Maps the MOVE_* values to names */ 189/* Maps the MOVE_* values to names */
35static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 190static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
36 191
37/* This table is only necessary to convert objects that existed before the 192/* This table is only necessary to convert objects that existed before the
… …
264static void 419static void
265check_loaded_object (object *op) 420check_loaded_object (object *op)
266{ 421{
267 int ip; 422 int ip;
268 423
269 /* We do some specialized handling to handle legacy cases of name_pl. 424 /* 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 - 425 * 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 426 * 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 427 * 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 428 * 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. 429 * 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 430 * Otherwise, what happens is that the the plural name will lose
276 * information (appear as just 'hearts' and not 'goblins heart') 431 * information (appear as just 'hearts' and not 'goblins heart')
… …
280 435
281 if (!op->name_pl) 436 if (!op->name_pl)
282 op->name_pl = op->name; 437 op->name_pl = op->name;
283 438
284 /* objects now have a materialname. try to patch it in */ 439 /* objects now have a materialname. try to patch it in */
285 if (!(IS_WEAPON (op) && op->level > 0)) 440 if (!(op->is_weapon () && op->level > 0))
286 { 441 {
287 if (op->map != NULL) 442 if (op->map != NULL)
288 set_materialname (op, op->map->difficulty, NULL); 443 set_materialname (op, op->map->difficulty, NULL);
289 else 444 else
290 set_materialname (op, 5, NULL); 445 set_materialname (op, 5, NULL);
… …
321 { 476 {
322 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 477 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; 478 op->gen_sp_armour = op->last_heal;
324 op->last_heal = 0; 479 op->last_heal = 0;
325 } 480 }
326 if (editor) 481
327 ip = 0;
328 else
329 ip = calc_item_power (op, 0); 482 ip = calc_item_power (op, 0);
330 /* Legacy objects from before item power was in the game */ 483 /* Legacy objects from before item power was in the game */
331 if (!op->item_power && ip) 484 if (!op->item_power && ip)
332 { 485 {
333 if (ip > 3) 486 if (ip > 3)
334 { 487 {
… …
376 } 529 }
377 530
378 if (QUERY_FLAG (op, FLAG_MONSTER)) 531 if (QUERY_FLAG (op, FLAG_MONSTER))
379 { 532 {
380 if (op->stats.hp > op->stats.maxhp) 533 if (op->stats.hp > op->stats.maxhp)
534 {
381 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); 535 LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp);
536 op->stats.maxhp = op->stats.hp;
537 }
382 538
383 /* The archs just need to be updated for this */ 539 /* The archs just need to be updated for this */
384 if (op->move_type == 0) 540 if (op->move_type == 0)
385 op->move_type = MOVE_WALK; 541 op->move_type = MOVE_WALK;
386 } 542 }
… …
488 SET_FLAG (op, flag); \ 644 SET_FLAG (op, flag); \
489 else \ 645 else \
490 CLEAR_FLAG (op, flag) \ 646 CLEAR_FLAG (op, flag) \
491 647
492int 648int
493parse_object (object *op, object_thawer & thawer, int map_flags) 649parse_object (object *op, object_thawer &thawer, int map_flags)
494{ 650{
495 bool ismore = 0; 651 bool ismore = 0;
496 object *op_inv = op->inv; 652 object *op_inv = op->inv;
497 653
498 for (;;) 654 for (;;)
… …
503 { 659 {
504 case KW_Object: // uppercase alias 660 case KW_Object: // uppercase alias
505 case KW_object: 661 case KW_object:
506 thawer.get (op->name); 662 thawer.get (op->name);
507 663
508 if (op->arch != NULL) 664 if (op->arch)
509 op->arch->name = op->name; 665 op->arch->name = op->name;
510 666
511 break; 667 break;
512 668
513 case KW_uuid: 669 case KW_uuid:
… …
552 */ 708 */
553 archetype *arch = archetype::find (str); 709 archetype *arch = archetype::find (str);
554 710
555 object *tmp; 711 object *tmp;
556 712
557 if (arch != NULL) 713 if (arch)
558 tmp = arch_to_object (arch); 714 tmp = arch_to_object (arch);
559 else 715 else
560 { 716 {
561 tmp = get_object (); 717 tmp = object::create ();
562 /* record the name of the broken object */ 718 /* record the name of the broken object */
563 tmp->name = str; 719 tmp->name = str;
564 } 720 }
721
722 // decativate the object we, as we are still going
723 // to read the speed value. Objects should be activated
724 // when the map, object or player is completly loaded.
725 tmp->deactivate ();
565 726
566 parse_object (tmp, thawer, map_flags); 727 parse_object (tmp, thawer, map_flags);
567 728
568 if (tmp->arch) 729 if (tmp->arch)
569 { 730 {
… …
593 op_inv = tmp; 754 op_inv = tmp;
594 } 755 }
595 else 756 else
596 { 757 {
597 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 758 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)");
598 free_object (tmp); 759 tmp->destroy ();
599 } 760 }
600 } 761 }
601 else 762 else
602 { 763 {
603 /* This is the actual archetype definition then */ 764 /* This is the actual archetype definition then */
604 op->arch = archetype::find (str); 765 op->arch = archetype::find (str);
605 766
606 if (op->arch != NULL) 767 if (op->arch)
607 copy_object (&op->arch->clone, op); 768 {
769 op->arch->clone.copy_to (op);
770 // copy_to activates, this should be fixed properly
771 op->deactivate ();
772 }
608 else if (!arch_init) 773 else if (!arch_init)
609 /* record the name of the broken object */ 774 /* record the name of the broken object */
610 op->name = str; 775 op->name = str;
611 } 776 }
612 } 777 }
… …
623 if (!str) 788 if (!str)
624 { 789 {
625 op->animation_id = 0; 790 op->animation_id = 0;
626 CLEAR_FLAG (op, FLAG_ANIMATE); 791 CLEAR_FLAG (op, FLAG_ANIMATE);
627 } 792 }
628 else
629 {
630 op->animation_id = find_animation (str); 793 else if ((op->animation_id = find_animation (str)))
631 SET_FLAG (op, FLAG_ANIMATE); 794 SET_FLAG (op, FLAG_ANIMATE);
632 }
633 } 795 }
634 796
635 break; 797 break;
636 798
637 case KW_last_heal: thawer.get (op->last_heal); break; 799 case KW_last_heal: thawer.get (op->last_heal); break;
… …
642 804
643 case KW_speed: 805 case KW_speed:
644 thawer.get (op->speed); 806 thawer.get (op->speed);
645 807
646 //TODO: maybe do in check_object 808 //TODO: maybe do in check_object
647 if (!(map_flags & MAP_STYLE)) 809 // removed check for style maps
648 {
649 if (op->speed < 0) 810 if (op->speed < 0)
650 op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; 811 op->speed_left = op->speed_left - rndm ();
651
652 update_ob_speed (op);
653 }
654 812
655 break; 813 break;
656 814
657 case KW_slow_move: 815 case KW_slow_move:
658 op->move_slow |= MOVE_WALK; 816 op->move_slow |= MOVE_WALK;
… …
812 CLEAR_FLAG (op, FLAG_WIZCAST); 970 CLEAR_FLAG (op, FLAG_WIZCAST);
813 } 971 }
814 break; 972 break;
815 973
816 case KW_friendly: 974 case KW_friendly:
817 GET_FLAG (op, FLAG_FRIENDLY); 975 if (thawer.get_sint32 ())
818 //TODO: move to check_object or so 976 if (op->type != PLAYER)
819 if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY))
820 add_friendly_object (op); 977 add_friendly_object (op);
978
821 break; 979 break;
822 980
823 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 981 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break;
824 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 982 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break;
825 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 983 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break;
826 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 984 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break;
985 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break;
827 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 986 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break;
828 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 987 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; 988 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break;
830 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 989 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; 990 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break;
833 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 991 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break;
834 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 992 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break;
835 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 993 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; 994 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break;
… …
864 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 1022 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break;
865 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 1023 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break;
866 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 1024 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break;
867 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 1025 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break;
868 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 1026 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break;
1027 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break;
869 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 1028 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break;
870 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 1029 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break;
871 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 1030 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break;
872 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 1031 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break;
873 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 1032 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break;
… …
902 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 1061 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break;
903 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 1062 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break;
904 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 1063 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break;
905 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 1064 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break;
906 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 1065 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break;
1066 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break;
907 1067
908 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1068 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 1069 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 1070 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 1071 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break;
… …
981 case KW_randomitems: 1141 case KW_randomitems:
982 op->randomitems = find_treasurelist (thawer.get_str ()); 1142 op->randomitems = find_treasurelist (thawer.get_str ());
983 break; 1143 break;
984 1144
985 case KW_msg: 1145 case KW_msg:
986 {
987 thawer.get_ml (KW_endmsg, op->msg); 1146 thawer.get_ml (KW_endmsg, op->msg);
988 //TODO: allow longer messages 1147 //TODO: allow longer messages
989 if (strlen (op->msg) >= HUGE_BUF) 1148 if (strlen (op->msg) >= HUGE_BUF)
990 { 1149 {
991 LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 1150 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg);
992 op->msg = "ERROR, please report: string too long, winged.\n"; 1151 op->msg = "ERROR, please report: string too long, winged.\n";
993 } 1152 }
994 }
995 break; 1153 break;
996 1154
997 case KW_lore: 1155 case KW_lore:
998 {
999 shstr msgbuf;
1000
1001 thawer.get_ml (KW_endlore, op->lore); 1156 thawer.get_ml (KW_endlore, op->lore);
1002 //TODO: allow longer messages 1157 //TODO: allow longer messages
1003 /* Just print a warning so we can be reasonably safe 1158 /* Just print a warning so we can be reasonably safe
1004 * about not overflowing the buffer. 1159 * about not overflowing the buffer.
1005 */ 1160 */
1006 if (strlen (op->lore) > (HUGE_BUF / 2)) 1161 if (strlen (op->lore) > (HUGE_BUF / 2))
1007 LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 1162 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1008 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 1163 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore);
1009 }
1010 break; 1164 break;
1011 1165
1012 case KW_editable: 1166 case KW_editable:
1013 case KW_editor_folder: 1167 case KW_editor_folder:
1014 break; 1168 break;
… …
1031 1185
1032 case KW_EOF: 1186 case KW_EOF:
1033 return LL_EOF; 1187 return LL_EOF;
1034 1188
1035 case KW_ERROR: 1189 case KW_ERROR:
1036 set_ob_key_value (op, thawer.line, thawer.last_value, true); 1190 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true);
1037 //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D 1191 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D
1038
1039 //TODO: skip line, ugly, factor parsing better
1040 if (thawer.last_value)
1041 thawer.line = thawer.last_value;
1042
1043 thawer.line += strlen (thawer.line) + 1;
1044
1045 break; 1192 break;
1046 1193
1047 default: 1194 default:
1048 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 1195 if (!thawer.parse_error (kw, "object", op->name))
1196 return false;
1049 break; 1197 break;
1050 } 1198 }
1051 } 1199 }
1052} 1200}
1053 1201
… …
1063 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should 1211 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1064 * be reset. 1212 * be reset.
1065 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) 1213 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1066 * 1214 *
1067 */ 1215 */
1068
1069int 1216int
1070load_object (object_thawer & fp, object *op, int map_flags) 1217load_object (object_thawer &fp, object *op, int map_flags)
1071{ 1218{
1219 coroapi::cede_every (1000); // cede once in a while
1220
1072 return parse_object (op, fp, map_flags); 1221 return parse_object (op, fp, map_flags);
1073} 1222}
1074
1075 1223
1076/* This takes a buffer, scans it for variables, and sets those variables 1224/* This takes a buffer, scans it for variables, and sets those variables
1077 * as appropriate in op. 1225 * as appropriate in op.
1078 * 1226 *
1079 * This function appears to be used in only 2 places - in crossedit to 1227 * This function appears to be used in only 2 places - in crossedit to
1080 * override values and in c_wiz to mutate values. 1228 * override values and in c_wiz to mutate values.
1081 */ 1229 */
1082int 1230int
1083set_variable (object *op, char *buf) 1231set_variable (object *op, char *buf)
1084{ 1232{
1085 return 0;
1086#if 0
1087 int retval;
1088 object_thawer thawer (0); 1233 object_thawer thawer (buf, (AV *)0);
1089 1234
1090 strcpy (msgbuf, "");
1091 strcpy (lorebuf, "");
1092 retval = parse_object (op, thawer, 0); 1235 return parse_object (op, thawer, 0);
1093 yy_switch_to_buffer (yycurbuf);
1094 yy_delete_buffer (yybufstate);
1095 yy_pop_state ();
1096 return retval;
1097#endif
1098} 1236}
1099
1100/* This array equates the FLAG_ values with the V_ values. Use -1 to
1101 * put gaps in the array that should not be processed.
1102 * The order matches the order of the define values in 'define.h'.
1103 */
1104
1105/* This is a list of pointers that correspond to the FLAG_.. values.
1106 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1107 * the 15'th element of this array should match that name.
1108 * If an entry is NULL, that is a flag not to loaded/saved.
1109 */
1110static const char *const flag_names[NUM_FLAGS + 1] = {
1111 "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid",
1112 "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */
1113 "is_animated", NULL /* slow_move */ ,
1114 NULL /* flying */ , "monster", "friendly", "generator",
1115 "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */
1116 "see_invisible", "can_roll", "overlay_floor",
1117 "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ ,
1118 NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */
1119 "changing", "splitting", "hitback", "startequip",
1120 "blocksview", "undead", "scared", "unaggressive",
1121 "reflect_missile", "reflect_spell", /* 40 */
1122 "no_magic", "no_fix_player", "is_lightable", "tear_down",
1123 "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ ,
1124 "pick_up", "unique", "no_drop", /* 50 */
1125 NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range",
1126 "can_use_bow", "can_use_armour", "can_use_weapon",
1127 "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */
1128 "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep",
1129 "stand_still", "random_move", "only_attack", "confused", /* 70 */
1130 "stealth", NULL, NULL, "cursed", "damned",
1131 "see_anywhere", "known_magical", "known_cursed",
1132 "can_use_skill", "been_applied", /* 80 */
1133 "has_ready_scroll", "can_use_rod", NULL,
1134 "can_use_horn", "make_invisible", "inv_locked", "is_wooded",
1135 "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */
1136 "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron",
1137 "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */
1138 "no_attack", "no_damage", NULL, NULL, "activate_on_push",
1139 "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */
1140 NULL
1141};
1142
1143 1237
1144/* 1238/*
1145 * Initialises the array of variable-names. Needed before any 1239 * Initialises the array of variable-names. Needed before any
1146 * objects can be loaded. Called by init_library(). 1240 * objects can be loaded. Called by init_library().
1147 */ 1241 */
… …
1204 1298
1205// compare *op against *tmp and output differences 1299// compare *op against *tmp and output differences
1206void 1300void
1207put (object_freezer &f, object *op, object *tmp) 1301put (object_freezer &f, object *op, object *tmp)
1208{ 1302{
1303 static const keyword resist_save[NROFATTACKS] = {
1304# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1305# include "attackinc.h"
1306# undef def
1307 };
1308
1309 /* This is a list of keywords that correspond to the FLAG_.. values.
1310 * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then
1311 * the 15'th element of this array should match that name.
1312 * If an entry is NULL, that is a flag not to loaded/saved.
1313 */
1314 static const keyword flag_names [NUM_FLAGS] = {
1315 KW_alive,
1316 KW_wiz,
1317 KW_NULL,
1318 KW_NULL,
1319 KW_was_wiz,
1320 KW_applied,
1321 KW_unpaid,
1322 KW_can_use_shield,
1323 KW_no_pick,
1324 KW_NULL, // walk_on
1325 KW_NULL, // no_pass
1326 /* 10 */
1327 KW_is_animated,
1328 KW_NULL, // slow_move
1329 KW_NULL, // flying
1330 KW_monster,
1331 KW_friendly,
1332 KW_generator,
1333 KW_is_thrown,
1334 KW_auto_apply,
1335 KW_NULL, // was KW_treasure
1336 KW_player_sold,
1337 /* 20 */
1338 KW_see_invisible,
1339 KW_can_roll,
1340 KW_overlay_floor,
1341 KW_is_turnable,
1342 KW_NULL, // walk_off
1343 KW_NULL, // fly_on
1344 KW_NULL, // fly_off
1345 KW_is_used_up,
1346 KW_identified,
1347 KW_reflecting,
1348 /* 30 */
1349 KW_changing,
1350 KW_splitting,
1351 KW_hitback,
1352 KW_startequip,
1353 KW_blocksview,
1354 KW_undead,
1355 KW_scared,
1356 KW_unaggressive,
1357 KW_reflect_missile,
1358 KW_reflect_spell,
1359 /* 40 */
1360 KW_no_magic,
1361 KW_no_fix_player,
1362 KW_is_lightable,
1363 KW_tear_down,
1364 KW_run_away,
1365 KW_NULL, // pass_thru
1366 KW_NULL, // an_pass_thru
1367 KW_pick_up,
1368 KW_unique,
1369 KW_no_drop,
1370 /* 50 */
1371 KW_NULL, // wizcast
1372 KW_can_cast_spell,
1373 KW_can_use_scroll,
1374 KW_can_use_range,
1375 KW_can_use_bow,
1376 KW_can_use_armour,
1377 KW_can_use_weapon,
1378 KW_can_use_ring,
1379 KW_has_ready_range,
1380 KW_has_ready_bow,
1381 /* 60 */
1382 KW_xrays,
1383 KW_NULL,
1384 KW_is_floor,
1385 KW_lifesave,
1386 KW_no_strength,
1387 KW_sleep,
1388 KW_stand_still,
1389 KW_random_move,
1390 KW_only_attack,
1391 KW_confused,
1392 /* 70 */
1393 KW_stealth,
1394 KW_NULL,
1395 KW_NULL,
1396 KW_cursed,
1397 KW_damned,
1398 KW_see_anywhere,
1399 KW_known_magical,
1400 KW_known_cursed,
1401 KW_can_use_skill,
1402 KW_been_applied,
1403 /* 80 */
1404 KW_has_ready_scroll,
1405 KW_can_use_rod,
1406 KW_NULL,
1407 KW_can_use_horn,
1408 KW_make_invisible,
1409 KW_inv_locked,
1410 KW_is_wooded,
1411 KW_is_hilly,
1412 KW_has_ready_skill,
1413 KW_has_ready_weapon,
1414 /* 90 */
1415 KW_no_skill_ident,
1416 KW_is_blind,
1417 KW_can_see_in_dark,
1418 KW_is_cauldron,
1419 KW_NULL,
1420 KW_no_steal,
1421 KW_one_hit,
1422 KW_NULL,
1423 KW_berserk,
1424 KW_neutral,
1425 /* 100 */
1426 KW_no_attack,
1427 KW_no_damage,
1428 KW_obj_original,
1429 KW_NULL,
1430 KW_activate_on_push,
1431 KW_activate_on_release,
1432 KW_is_water,
1433 KW_use_content_on_gen,
1434 KW_NULL,
1435 KW_is_buildable,
1436 /* 110 */
1437 KW_destroy_on_death,
1438 KW_NULL,
1439 };
1440
1209 int i; 1441 int i;
1210 1442
1211 /* This saves the key/value lists. We do it first so that any 1443 /* This saves the key/value lists. We do it first so that any
1212 * keys that match field names will be overwritten by the loader. 1444 * keys that match field names will be overwritten by the loader.
1213 */ 1445 */
1214 for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) 1446 for (key_value *my_field = op->key_values; my_field; my_field = my_field->next)
1215 { 1447 {
1216 /* Find the field in the opposing member. */ 1448 /* Find the field in the opposing member. */
1217 key_value *arch_field = get_ob_key_link (tmp, my_field->key); 1449 key_value *arch_field = get_ob_key_link (tmp, my_field->key);
1218 1450
1219 /* If there's no partnering field, or it's got a different value, save our field. */ 1451 /* If there's no partnering field, or it's got a different value, save our field. */
1220 if (arch_field == NULL || my_field->value != arch_field->value) 1452 if (!arch_field || my_field->value != arch_field->value)
1221 f.put (my_field->key, my_field->value); 1453 f.put (my_field->key, my_field->value);
1222 } 1454 }
1223 1455
1224 /* We don't need to worry about the arch's extra fields - they 1456 /* We don't need to worry about the arch's extra fields - they
1225 * will get taken care of the copy_object function. 1457 * will get taken care of the copy_to method.
1226 */ 1458 */
1227 1459
1228 { 1460 {
1229 char uids[64]; 1461 char uids[64];
1230 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); 1462 snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq);
… …
1246 if (op->lore != tmp->lore) 1478 if (op->lore != tmp->lore)
1247 f.put (KW_lore, KW_endlore, op->lore); 1479 f.put (KW_lore, KW_endlore, op->lore);
1248 1480
1249 CMP_OUT (other_arch); 1481 CMP_OUT (other_arch);
1250 CMP_OUT (face); 1482 CMP_OUT (face);
1251
1252 if (!op->face || !op->face->name)
1253 printf ("ERRFACE<%s,%s, face %p,%p, fname%s>\n", &tmp->name, &op->name, tmp->face, op->face, op->face ? &op->face->name : "<noface>"); //D
1254 1483
1255 if (op->animation_id != tmp->animation_id) 1484 if (op->animation_id != tmp->animation_id)
1256 if (op->animation_id) 1485 if (op->animation_id)
1257 { 1486 {
1258 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1487 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1350 CMP_OUT (move_on); 1579 CMP_OUT (move_on);
1351 CMP_OUT (move_off); 1580 CMP_OUT (move_off);
1352 CMP_OUT (move_slow); 1581 CMP_OUT (move_slow);
1353 CMP_OUT (move_slow_penalty); 1582 CMP_OUT (move_slow_penalty);
1354 1583
1355 if (!COMPARE_FLAGS (op, tmp)) 1584 if (op->flag != tmp->flag)
1356 for (i = 0; i <= NUM_FLAGS; i++) 1585 for (i = 0; i <= NUM_FLAGS; i++)
1357 if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) 1586 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1358 f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); 1587 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1359 1588
1360 /* Save body locations */ 1589 /* Save body locations */
1361 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1590 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1362 if (op->body_info[i] != tmp->body_info[i]) 1591 if (op->body_info[i] != tmp->body_info[i])
1363 f.put (body_locations[i].save_name, op->body_info[i]); 1592 f.put (body_locations[i].save_name, op->body_info[i]);
… …
1365 1594
1366/* 1595/*
1367 * Dumps all variables in an object to a file. 1596 * Dumps all variables in an object to a file.
1368 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1597 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1369 * the only place this is not set is when saving the player. 1598 * the only place this is not set is when saving the player.
1370 * If bit 1 of flag is set, don't remove the object after save. As of now,
1371 * all of the callers are setting this.
1372 */ 1599 */
1373
1374void 1600void
1375save_object (object_freezer & fp, object *op, int flag) 1601save_object (object_freezer &fp, object *op, int flag)
1376{ 1602{
1377 archetype *at;
1378 object *tmp, *old;
1379
1380 /* Even if the object does have an owner, it would seem that we should 1603 /* Even if the object does have an owner, it would seem that we should
1381 * still save it. 1604 * still save it.
1382 */ 1605 */
1383 if (op->owner) 1606 if (op->owner)
1384 return; 1607 return;
1385 1608
1386 /* If it is unpaid and we don't want to save those, just return. */ 1609 /* If it is unpaid and we don't want to save those, just return. */
1387 if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) 1610 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1388 return; 1611 return;
1389 1612
1390 if ((at = op->arch) == NULL) 1613 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype;
1391 at = empty_archetype;
1392 1614
1393 fp.put (KW_arch, at->name); 1615 fp.put (KW_arch, at->name);
1394
1395 put (fp, op, &at->clone); 1616 put (fp, op, &at->clone);
1396 1617
1397 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ 1618 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1398 1619
1399 old = NULL;
1400
1401 if (flag & 2)
1402 for (tmp = op->inv; tmp != NULL; tmp = tmp->below) 1620 for (object *tmp = op->inv; tmp; tmp = tmp->below)
1403 save_object (fp, tmp, flag); 1621 save_object (fp, tmp, flag);
1404 else
1405 /* Slightly different logic because tmp/op will be removed by
1406 * the save_object we call. So we just keep looking at op->inv
1407 * until there is nothing left. In theory, the variable old
1408 * should not be needed, as recursive loops shouldn't happen.
1409 */
1410 while ((tmp = op->inv) != NULL)
1411 {
1412 if (old == tmp)
1413 {
1414 LOG (llevError, " Recursive loop in inventory\n");
1415 break;
1416 }
1417
1418 save_object (fp, tmp, flag);
1419 old = tmp;
1420 }
1421
1422 if (!(flag & 2))
1423 {
1424 remove_ob (op);
1425 free_object (op);
1426 }
1427 1622
1428 fp.put (op); 1623 fp.put (op);
1429 fprintf (fp, "end\n"); 1624 fp.put (KW_end);
1430} 1625}
1431 1626

Diff Legend

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