… | |
… | |
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 | |
32 | |
33 | // resource loader pure base class |
33 | ///////////////////////////////////////////////////////////////////////////// |
34 | struct loader_base |
|
|
35 | { |
|
|
36 | const char *filename; |
|
|
37 | virtual const char *type () const = 0; |
|
|
38 | |
34 | |
39 | virtual archetype *get_arch (const char *name); |
35 | loader_base::~loader_base () |
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 | { |
36 | { |
112 | const char *type () const = 0; |
37 | } |
113 | }; |
|
|
114 | |
38 | |
115 | // the base class warns about and skips everything |
39 | // the base class warns about and skips everything |
116 | archetype * |
40 | archetype * |
117 | loader_base::get_arch (const char *name) |
41 | loader_base::get_arch (const char *name) |
118 | { |
42 | { |
119 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of type %s.\n", |
43 | LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n", |
120 | filename, name, type ()); |
44 | filename, name); |
121 | |
45 | |
122 | return new archetype; |
46 | return new archetype; |
123 | } |
47 | } |
124 | |
48 | |
125 | object * |
49 | object * |
126 | loader_base::get_object (const char *name) |
50 | loader_base::get_object (const char *name) |
127 | { |
51 | { |
128 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of type %s.\n", |
52 | LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n", |
129 | filename, name, type ()); |
53 | filename, name); |
130 | |
54 | |
131 | return object::create (); |
55 | return object::create (); |
132 | } |
56 | } |
133 | |
57 | |
134 | player * |
58 | player * |
135 | loader_base::get_player () |
59 | loader_base::get_player () |
136 | { |
60 | { |
137 | LOG (llevError, "%s: found player definition, which is not allowed in files of type %s.\n", |
61 | LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n", |
138 | filename, type ()); |
62 | filename); |
139 | |
63 | |
140 | return player::create (); |
64 | return player::create (); |
141 | } |
65 | } |
142 | |
66 | |
143 | region * |
67 | region * |
144 | loader_base::get_region (const char *name) |
68 | loader_base::get_region (const char *name) |
145 | { |
69 | { |
146 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of type %s.\n", |
70 | LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n", |
147 | filename, name, type ()); |
71 | filename, name); |
148 | |
72 | |
149 | return new region; |
73 | return new region; |
150 | } |
74 | } |
151 | |
75 | |
152 | facetile * |
76 | facetile * |
153 | loader_base::get_face (const char *name) |
77 | loader_base::get_face (const char *name) |
154 | { |
78 | { |
155 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of type %s.\n", |
79 | LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n", |
156 | filename, name, type ()); |
80 | filename, name); |
157 | |
81 | |
158 | return new facetile; |
82 | return new facetile; |
159 | } |
83 | } |
160 | |
84 | |
161 | treasurelist * |
85 | treasurelist * |
162 | loader_base::get_treasure (const char *name, bool one) |
86 | loader_base::get_treasure (const char *name, bool one) |
163 | { |
87 | { |
164 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of type %s.\n", |
88 | LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n", |
165 | filename, name, type ()); |
89 | filename, name); |
166 | |
90 | |
167 | return new treasurelist;//D |
91 | return new treasurelist;//D |
168 | } |
92 | } |
169 | |
93 | |
170 | animation * |
94 | animation * |
171 | loader_base::get_animation (const char *name) |
95 | loader_base::get_animation (const char *name) |
172 | { |
96 | { |
173 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of type %s.\n", |
97 | LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n", |
174 | filename, name, type ()); |
98 | filename, name); |
175 | |
99 | |
176 | return new animation; |
100 | return new animation; |
177 | } |
101 | } |
178 | |
102 | |
179 | void |
103 | void |
… | |
… | |
215 | void |
139 | void |
216 | loader_base::put_animation (animation *anim) |
140 | loader_base::put_animation (animation *anim) |
217 | { |
141 | { |
218 | delete anim; |
142 | delete anim; |
219 | } |
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 | ///////////////////////////////////////////////////////////////////////////// |
220 | |
192 | |
221 | /* Maps the MOVE_* values to names */ |
193 | /* Maps the MOVE_* values to names */ |
222 | 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 }; |
223 | |
195 | |
224 | /* 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 |
… | |
… | |
449 | * to check for objects to make sure there are no common errors. |
421 | * to check for objects to make sure there are no common errors. |
450 | */ |
422 | */ |
451 | static void |
423 | static void |
452 | check_loaded_object (object *op) |
424 | check_loaded_object (object *op) |
453 | { |
425 | { |
454 | int ip; |
|
|
455 | |
|
|
456 | /* We do some specialised handling to handle legacy cases of name_pl. |
426 | /* We do some specialised handling to handle legacy cases of name_pl. |
457 | * If the object doesn't have a name_pl, we just use the object name - |
427 | * If the object doesn't have a name_pl, we just use the object name - |
458 | * this isn't perfect (things won't be properly pluralised), but works to |
428 | * this isn't perfect (things won't be properly pluralised), but works to |
459 | * that degree (5 heart is still quite understandable). But the case we |
429 | * that degree (5 heart is still quite understandable). But the case we |
460 | * also have to catch is if this object is not using the normal name for |
430 | * also have to catch is if this object is not using the normal name for |
461 | * the object. In that case, we also want to use the loaded name. |
431 | * the object. In that case, we also want to use the loaded name. |
462 | * Otherwise, what happens is that the the plural name will lose |
432 | * Otherwise, what happens is that the the plural name will lose |
463 | * information (appear as just 'hearts' and not 'goblins heart') |
433 | * information (appear as just 'hearts' and not 'goblins heart') |
464 | */ |
434 | */ |
465 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
435 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
466 | op->name_pl = NULL; |
436 | op->name_pl = 0; |
467 | |
437 | |
468 | if (!op->name_pl) |
438 | if (!op->name_pl) |
469 | op->name_pl = op->name; |
439 | op->name_pl = op->name; |
470 | |
440 | |
471 | /* objects now have a materialname. try to patch it in */ |
441 | /* objects now have a materialname. try to patch it in */ |
… | |
… | |
474 | if (op->map != NULL) |
444 | if (op->map != NULL) |
475 | set_materialname (op, op->map->difficulty, NULL); |
445 | set_materialname (op, op->map->difficulty, NULL); |
476 | else |
446 | else |
477 | set_materialname (op, 5, NULL); |
447 | set_materialname (op, 5, NULL); |
478 | } |
448 | } |
|
|
449 | |
479 | /* only do these when program is first run - a bit |
450 | /* only do these when program is first run - a bit |
480 | * excessive to do this at every run - most of this is |
451 | * excessive to do this at every run - most of this is |
481 | * really just to catch any errors - program will still run, but |
452 | * really just to catch any errors - program will still run, but |
482 | * not in the ideal fashion. |
453 | * not in the ideal fashion. |
483 | */ |
454 | */ |
484 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
455 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
485 | { |
456 | { |
486 | if (!op->skill) |
457 | if (!op->skill) |
487 | { |
|
|
488 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
458 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
489 | } |
|
|
490 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
459 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
491 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
460 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
492 | { |
|
|
493 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
461 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
494 | } |
|
|
495 | } |
462 | } |
496 | |
463 | |
497 | /* We changed last_heal to gen_sp_armour, which is what it |
464 | /* We changed last_heal to gen_sp_armour, which is what it |
498 | * really does for many objects. Need to catch any in maps |
465 | * really does for many objects. Need to catch any in maps |
499 | * that may have an old value. |
466 | * that may have an old value. |
500 | */ |
467 | */ |
501 | if ((op->type == WEAPON) || |
468 | if (op->type == WEAPON |
502 | (op->type == ARMOUR) || (op->type == HELMET) || |
469 | || op->type == ARMOUR || op->type == HELMET |
503 | (op->type == SHIELD) || (op->type == RING) || |
470 | || op->type == SHIELD || op->type == RING |
504 | (op->type == BOOTS) || (op->type == GLOVES) || |
471 | || op->type == BOOTS || op->type == GLOVES |
505 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
472 | || op->type == AMULET || op->type == GIRDLE |
|
|
473 | || op->type == BRACERS || op->type == CLOAK) |
506 | { |
474 | { |
507 | if (op->last_heal) |
475 | if (op->last_heal) |
508 | { |
476 | { |
509 | 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 ()); |
510 | op->gen_sp_armour = op->last_heal; |
478 | op->gen_sp_armour = op->last_heal; |
511 | op->last_heal = 0; |
479 | op->last_heal = 0; |
512 | } |
480 | } |
513 | |
481 | |
514 | ip = calc_item_power (op, 0); |
482 | int ip = calc_item_power (op, 0); |
|
|
483 | |
515 | /* Legacy objects from before item power was in the game */ |
484 | /* Legacy objects from before item power was in the game */ |
516 | if (!op->item_power && ip) |
485 | if (!op->item_power && ip) |
517 | { |
486 | { |
518 | if (ip > 3) |
487 | if (ip > 3) |
519 | { |
|
|
520 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
488 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
521 | } |
489 | |
522 | op->item_power = ip; |
490 | op->item_power = ip; |
523 | } |
491 | } |
|
|
492 | |
524 | /* Check for possibly bogus values. Has to meet both these criteria - |
493 | /* Check for possibly bogus values. Has to meet both these criteria - |
525 | * something that has item_power 1 is probably just fine if our calculated |
494 | * something that has item_power 1 is probably just fine if our calculated |
526 | * value is 1 or 2 - these values are small enough that hard to be precise. |
495 | * value is 1 or 2 - these values are small enough that hard to be precise. |
527 | * similarly, it item_power is 0, the first check will always pass, |
496 | * similarly, it item_power is 0, the first check will always pass, |
528 | * but not the second one. |
497 | * but not the second one. |
529 | */ |
498 | */ |
530 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
499 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
531 | { |
|
|
532 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
500 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
533 | } |
|
|
534 | |
|
|
535 | } |
501 | } |
|
|
502 | |
536 | /* Old spellcasting object - need to load in the appropiate object */ |
503 | /* Old spellcasting object - need to load in the appropiate object */ |
537 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
504 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
538 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
505 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
539 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
506 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
540 | { |
507 | { |
541 | object *tmp; |
|
|
542 | |
|
|
543 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
508 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
544 | * in that spell was stored in sp. |
509 | * in that spell was stored in sp. |
545 | */ |
510 | */ |
546 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
511 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
547 | insert_ob_in_ob (tmp, op); |
512 | insert_ob_in_ob (tmp, op); |
548 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
513 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
549 | } |
514 | } |
|
|
515 | |
550 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
516 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
551 | |
|
|
552 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
517 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
553 | { |
518 | { |
554 | object *tmp; |
|
|
555 | |
|
|
556 | tmp = get_archetype_by_object_name (op->slaying); |
519 | object *tmp = get_archetype_by_object_name (op->slaying); |
557 | insert_ob_in_ob (tmp, op); |
520 | insert_ob_in_ob (tmp, op); |
558 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
521 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
559 | /* without this, value is all screwed up */ |
522 | /* without this, value is all screwed up */ |
560 | op->value = op->arch->clone.value * op->inv->value; |
523 | op->value = op->arch->clone.value * op->inv->value; |
561 | } |
524 | } |
… | |
… | |
597 | { |
560 | { |
598 | op->move_type = MOVE_ALL; |
561 | op->move_type = MOVE_ALL; |
599 | op->stats.maxhp = 0; |
562 | op->stats.maxhp = 0; |
600 | } |
563 | } |
601 | else |
564 | else |
602 | { |
|
|
603 | op->move_type = MOVE_WALK; |
565 | op->move_type = MOVE_WALK; |
604 | } |
|
|
605 | } |
566 | } |
606 | } |
567 | } |
607 | |
568 | |
608 | } |
569 | } |
609 | |
570 | |
… | |
… | |
746 | tmp = arch_to_object (arch); |
707 | tmp = arch_to_object (arch); |
747 | else |
708 | else |
748 | { |
709 | { |
749 | tmp = object::create (); |
710 | tmp = object::create (); |
750 | /* record the name of the broken object */ |
711 | /* record the name of the broken object */ |
|
|
712 | //TODO: but do not log??? |
751 | tmp->name = str; |
713 | tmp->name = str; |
752 | } |
714 | } |
753 | |
715 | |
754 | // decativate the object we, as we are still going |
716 | // decativate the object we, as we are still going |
755 | // to read the speed value. Objects should be activated |
717 | // to read the speed value. Objects should be activated |
… | |
… | |
813 | op->other_arch = archetype::find (thawer.get_str ()); |
775 | op->other_arch = archetype::find (thawer.get_str ()); |
814 | break; |
776 | break; |
815 | |
777 | |
816 | case KW_animation: |
778 | case KW_animation: |
817 | { |
779 | { |
|
|
780 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
781 | op->animation_id = 0; |
|
|
782 | |
818 | const char *str = thawer.get_str (); |
783 | const char *str = thawer.get_str (); |
819 | |
|
|
820 | if (!str) |
|
|
821 | { |
|
|
822 | op->animation_id = 0; |
|
|
823 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
824 | } |
|
|
825 | else if ((op->animation_id = find_animation (str))) |
784 | if (str && (op->animation_id = find_animation (str))) |
826 | SET_FLAG (op, FLAG_ANIMATE); |
785 | SET_FLAG (op, FLAG_ANIMATE); |
827 | } |
786 | } |
828 | |
|
|
829 | break; |
787 | break; |
830 | |
788 | |
831 | case KW_last_heal: thawer.get (op->last_heal); break; |
789 | case KW_last_heal: thawer.get (op->last_heal); break; |
832 | case KW_last_sp: thawer.get (op->last_sp); break; |
790 | case KW_last_sp: thawer.get (op->last_sp); break; |
833 | case KW_last_grace: thawer.get (op->last_grace); break; |
791 | case KW_last_grace: thawer.get (op->last_grace); break; |
… | |
… | |
898 | case KW_path_denied: thawer.get (op->path_denied); break; |
856 | case KW_path_denied: thawer.get (op->path_denied); break; |
899 | case KW_invisible: thawer.get (op->invisible); break; |
857 | case KW_invisible: thawer.get (op->invisible); break; |
900 | case KW_magic: thawer.get (op->magic); break; |
858 | case KW_magic: thawer.get (op->magic); break; |
901 | case KW_state: thawer.get (op->state); break; |
859 | case KW_state: thawer.get (op->state); break; |
902 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
860 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
903 | case KW_material: thawer.get (op->material); break; |
861 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
904 | case KW_materialname: thawer.get (op->materialname); break; |
862 | case KW_materialname: thawer.get (op->materialname); break; |
905 | |
863 | |
906 | /* These are the new values */ |
864 | /* These are the new values */ |
907 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
865 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
908 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
866 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
… | |
… | |
1170 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1128 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1171 | break; |
1129 | break; |
1172 | |
1130 | |
1173 | case KW_randomitems: |
1131 | case KW_randomitems: |
1174 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1132 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
1133 | //if (!op->randomitems) |
|
|
1134 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
1175 | break; |
1135 | break; |
1176 | |
1136 | |
1177 | case KW_msg: |
1137 | case KW_msg: |
1178 | thawer.get_ml (KW_endmsg, op->msg); |
1138 | thawer.get_ml (KW_endmsg, op->msg); |
1179 | //TODO: allow longer messages |
1139 | //TODO: allow longer messages |
… | |
… | |
1222 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1182 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1223 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1183 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1224 | break; |
1184 | break; |
1225 | |
1185 | |
1226 | default: |
1186 | default: |
1227 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1187 | if (!thawer.parse_error (kw, "object", op->name)) |
|
|
1188 | return false; |
1228 | break; |
1189 | break; |
1229 | } |
1190 | } |
1230 | } |
1191 | } |
1231 | } |
1192 | } |
1232 | |
1193 | |
… | |
… | |
1566 | f.put (resist_save[i], op->resist[i]); |
1527 | f.put (resist_save[i], op->resist[i]); |
1567 | |
1528 | |
1568 | CMP_OUT (path_attuned); |
1529 | CMP_OUT (path_attuned); |
1569 | CMP_OUT (path_repelled); |
1530 | CMP_OUT (path_repelled); |
1570 | CMP_OUT (path_denied); |
1531 | CMP_OUT (path_denied); |
1571 | CMP_OUT (material); |
1532 | CMP_OUT2 (material, materials);//TODO: nuke |
1572 | CMP_OUT (materialname); |
1533 | CMP_OUT (materialname); |
1573 | CMP_OUT (value); |
1534 | CMP_OUT (value); |
1574 | CMP_OUT (carrying); |
1535 | CMP_OUT (carrying); |
1575 | CMP_OUT (weight); |
1536 | CMP_OUT (weight); |
1576 | CMP_OUT (invisible); |
1537 | CMP_OUT (invisible); |