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) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
5 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
6 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
7 | |
7 | * |
8 | 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 |
9 | 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 |
10 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
11 | (at your option) any later version. |
11 | * (at your option) any later version. |
12 | |
12 | * |
13 | 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, |
14 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | |
17 | * |
18 | 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 |
19 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
20 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
21 | |
21 | * |
22 | 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> |
23 | */ |
23 | */ |
24 | |
24 | |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
27 | variable. */ |
27 | variable. */ |
28 | |
28 | |
29 | |
|
|
30 | #include <global.h> |
29 | #include <global.h> |
31 | #include <loader.h> |
30 | #include <loader.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 |
… | |
… | |
262 | * 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. |
263 | */ |
422 | */ |
264 | static void |
423 | static void |
265 | check_loaded_object (object *op) |
424 | check_loaded_object (object *op) |
266 | { |
425 | { |
267 | int ip; |
|
|
268 | |
|
|
269 | /* 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. |
270 | * 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 - |
271 | * 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 |
272 | * 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 |
273 | * 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 |
274 | * 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. |
275 | * Otherwise, what happens is that the the plural name will lose |
432 | * Otherwise, what happens is that the the plural name will lose |
276 | * information (appear as just 'hearts' and not 'goblins heart') |
433 | * information (appear as just 'hearts' and not 'goblins heart') |
277 | */ |
434 | */ |
278 | 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) |
279 | op->name_pl = NULL; |
436 | op->name_pl = 0; |
280 | |
437 | |
281 | if (!op->name_pl) |
438 | if (!op->name_pl) |
282 | op->name_pl = op->name; |
439 | op->name_pl = op->name; |
283 | |
440 | |
284 | /* objects now have a materialname. try to patch it in */ |
441 | /* objects now have a materialname. try to patch it in */ |
… | |
… | |
287 | if (op->map != NULL) |
444 | if (op->map != NULL) |
288 | set_materialname (op, op->map->difficulty, NULL); |
445 | set_materialname (op, op->map->difficulty, NULL); |
289 | else |
446 | else |
290 | set_materialname (op, 5, NULL); |
447 | set_materialname (op, 5, NULL); |
291 | } |
448 | } |
|
|
449 | |
292 | /* only do these when program is first run - a bit |
450 | /* only do these when program is first run - a bit |
293 | * excessive to do this at every run - most of this is |
451 | * excessive to do this at every run - most of this is |
294 | * really just to catch any errors - program will still run, but |
452 | * really just to catch any errors - program will still run, but |
295 | * not in the ideal fashion. |
453 | * not in the ideal fashion. |
296 | */ |
454 | */ |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
455 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
298 | { |
456 | { |
299 | if (!op->skill) |
457 | if (!op->skill) |
300 | { |
|
|
301 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
458 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
302 | } |
|
|
303 | 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) || |
304 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
460 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
305 | { |
|
|
306 | 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); |
307 | } |
|
|
308 | } |
462 | } |
309 | |
463 | |
310 | /* 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 |
311 | * really does for many objects. Need to catch any in maps |
465 | * really does for many objects. Need to catch any in maps |
312 | * that may have an old value. |
466 | * that may have an old value. |
313 | */ |
467 | */ |
314 | if ((op->type == WEAPON) || |
468 | if (op->type == WEAPON |
315 | (op->type == ARMOUR) || (op->type == HELMET) || |
469 | || op->type == ARMOUR || op->type == HELMET |
316 | (op->type == SHIELD) || (op->type == RING) || |
470 | || op->type == SHIELD || op->type == RING |
317 | (op->type == BOOTS) || (op->type == GLOVES) || |
471 | || op->type == BOOTS || op->type == GLOVES |
318 | (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) |
319 | { |
474 | { |
320 | if (op->last_heal) |
475 | if (op->last_heal) |
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 | |
481 | |
327 | ip = calc_item_power (op, 0); |
482 | int ip = calc_item_power (op, 0); |
|
|
483 | |
328 | /* Legacy objects from before item power was in the game */ |
484 | /* Legacy objects from before item power was in the game */ |
329 | if (!op->item_power && ip) |
485 | if (!op->item_power && ip) |
330 | { |
486 | { |
331 | if (ip > 3) |
487 | if (ip > 3) |
332 | { |
|
|
333 | 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); |
334 | } |
489 | |
335 | op->item_power = ip; |
490 | op->item_power = ip; |
336 | } |
491 | } |
|
|
492 | |
337 | /* Check for possibly bogus values. Has to meet both these criteria - |
493 | /* Check for possibly bogus values. Has to meet both these criteria - |
338 | * 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 |
339 | * 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. |
340 | * 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, |
341 | * but not the second one. |
497 | * but not the second one. |
342 | */ |
498 | */ |
343 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
499 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
344 | { |
|
|
345 | 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); |
346 | } |
|
|
347 | |
|
|
348 | } |
501 | } |
|
|
502 | |
349 | /* Old spellcasting object - need to load in the appropiate object */ |
503 | /* Old spellcasting object - need to load in the appropiate object */ |
350 | 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 || |
351 | /* 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 */ |
352 | ((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) |
353 | { |
507 | { |
354 | object *tmp; |
|
|
355 | |
|
|
356 | /* 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' |
357 | * in that spell was stored in sp. |
509 | * in that spell was stored in sp. |
358 | */ |
510 | */ |
359 | 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]); |
360 | insert_ob_in_ob (tmp, op); |
512 | insert_ob_in_ob (tmp, op); |
361 | 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 */ |
362 | } |
514 | } |
|
|
515 | |
363 | /* 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 */ |
364 | |
|
|
365 | 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) |
366 | { |
518 | { |
367 | object *tmp; |
|
|
368 | |
|
|
369 | tmp = get_archetype_by_object_name (op->slaying); |
519 | object *tmp = get_archetype_by_object_name (op->slaying); |
370 | insert_ob_in_ob (tmp, op); |
520 | insert_ob_in_ob (tmp, op); |
371 | 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 */ |
372 | /* without this, value is all screwed up */ |
522 | /* without this, value is all screwed up */ |
373 | op->value = op->arch->clone.value * op->inv->value; |
523 | op->value = op->arch->clone.value * op->inv->value; |
374 | } |
524 | } |
375 | |
525 | |
376 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
526 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
377 | { |
527 | { |
378 | if (op->stats.hp > op->stats.maxhp) |
528 | if (op->stats.hp > op->stats.maxhp) |
|
|
529 | { |
379 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
530 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
531 | op->stats.maxhp = op->stats.hp; |
|
|
532 | } |
380 | |
533 | |
381 | /* The archs just need to be updated for this */ |
534 | /* The archs just need to be updated for this */ |
382 | if (op->move_type == 0) |
535 | if (op->move_type == 0) |
383 | op->move_type = MOVE_WALK; |
536 | op->move_type = MOVE_WALK; |
384 | } |
537 | } |
… | |
… | |
407 | { |
560 | { |
408 | op->move_type = MOVE_ALL; |
561 | op->move_type = MOVE_ALL; |
409 | op->stats.maxhp = 0; |
562 | op->stats.maxhp = 0; |
410 | } |
563 | } |
411 | else |
564 | else |
412 | { |
|
|
413 | op->move_type = MOVE_WALK; |
565 | op->move_type = MOVE_WALK; |
414 | } |
|
|
415 | } |
566 | } |
416 | } |
567 | } |
417 | |
568 | |
418 | } |
569 | } |
419 | |
570 | |
… | |
… | |
556 | tmp = arch_to_object (arch); |
707 | tmp = arch_to_object (arch); |
557 | else |
708 | else |
558 | { |
709 | { |
559 | tmp = object::create (); |
710 | tmp = object::create (); |
560 | /* record the name of the broken object */ |
711 | /* record the name of the broken object */ |
|
|
712 | //TODO: but do not log??? |
561 | tmp->name = str; |
713 | tmp->name = str; |
562 | } |
714 | } |
563 | |
715 | |
564 | // decativate the object we, as we are still going |
716 | // decativate the object we, as we are still going |
565 | // to read the speed value. Objects should be activated |
717 | // to read the speed value. Objects should be activated |
… | |
… | |
623 | op->other_arch = archetype::find (thawer.get_str ()); |
775 | op->other_arch = archetype::find (thawer.get_str ()); |
624 | break; |
776 | break; |
625 | |
777 | |
626 | case KW_animation: |
778 | case KW_animation: |
627 | { |
779 | { |
|
|
780 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
781 | op->animation_id = 0; |
|
|
782 | |
628 | const char *str = thawer.get_str (); |
783 | const char *str = thawer.get_str (); |
629 | |
|
|
630 | if (!str) |
|
|
631 | { |
|
|
632 | op->animation_id = 0; |
|
|
633 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
634 | } |
|
|
635 | else |
|
|
636 | { |
|
|
637 | op->animation_id = find_animation (str); |
784 | if (str && (op->animation_id = find_animation (str))) |
638 | SET_FLAG (op, FLAG_ANIMATE); |
785 | SET_FLAG (op, FLAG_ANIMATE); |
639 | } |
|
|
640 | } |
786 | } |
641 | |
|
|
642 | break; |
787 | break; |
643 | |
788 | |
644 | case KW_last_heal: thawer.get (op->last_heal); break; |
789 | case KW_last_heal: thawer.get (op->last_heal); break; |
645 | case KW_last_sp: thawer.get (op->last_sp); break; |
790 | case KW_last_sp: thawer.get (op->last_sp); break; |
646 | case KW_last_grace: thawer.get (op->last_grace); break; |
791 | case KW_last_grace: thawer.get (op->last_grace); break; |
… | |
… | |
651 | thawer.get (op->speed); |
796 | thawer.get (op->speed); |
652 | |
797 | |
653 | //TODO: maybe do in check_object |
798 | //TODO: maybe do in check_object |
654 | // removed check for style maps |
799 | // removed check for style maps |
655 | if (op->speed < 0) |
800 | if (op->speed < 0) |
656 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
801 | op->speed_left = op->speed_left - rndm (); |
657 | |
802 | |
658 | break; |
803 | break; |
659 | |
804 | |
660 | case KW_slow_move: |
805 | case KW_slow_move: |
661 | op->move_slow |= MOVE_WALK; |
806 | op->move_slow |= MOVE_WALK; |
… | |
… | |
711 | case KW_path_denied: thawer.get (op->path_denied); break; |
856 | case KW_path_denied: thawer.get (op->path_denied); break; |
712 | case KW_invisible: thawer.get (op->invisible); break; |
857 | case KW_invisible: thawer.get (op->invisible); break; |
713 | case KW_magic: thawer.get (op->magic); break; |
858 | case KW_magic: thawer.get (op->magic); break; |
714 | case KW_state: thawer.get (op->state); break; |
859 | case KW_state: thawer.get (op->state); break; |
715 | 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; |
716 | case KW_material: thawer.get (op->material); break; |
861 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
717 | case KW_materialname: thawer.get (op->materialname); break; |
862 | case KW_materialname: thawer.get (op->materialname); break; |
718 | |
863 | |
719 | /* These are the new values */ |
864 | /* These are the new values */ |
720 | 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; |
721 | 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; |
… | |
… | |
825 | |
970 | |
826 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
971 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
827 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
972 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
828 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
973 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
829 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
974 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
975 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
830 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
976 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
831 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
977 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
832 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
978 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
833 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
979 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
834 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
980 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
… | |
… | |
982 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1128 | add_button_link (op, op->map, thawer.get_sint32 ()); |
983 | break; |
1129 | break; |
984 | |
1130 | |
985 | case KW_randomitems: |
1131 | case KW_randomitems: |
986 | 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 ()); |
987 | break; |
1135 | break; |
988 | |
1136 | |
989 | case KW_msg: |
1137 | case KW_msg: |
990 | thawer.get_ml (KW_endmsg, op->msg); |
1138 | thawer.get_ml (KW_endmsg, op->msg); |
991 | //TODO: allow longer messages |
1139 | //TODO: allow longer messages |
… | |
… | |
1034 | 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); |
1035 | //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 |
1036 | break; |
1184 | break; |
1037 | |
1185 | |
1038 | default: |
1186 | default: |
1039 | 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; |
1040 | break; |
1189 | break; |
1041 | } |
1190 | } |
1042 | } |
1191 | } |
1043 | } |
1192 | } |
1044 | |
1193 | |
… | |
… | |
1266 | KW_berserk, |
1415 | KW_berserk, |
1267 | KW_neutral, |
1416 | KW_neutral, |
1268 | /* 100 */ |
1417 | /* 100 */ |
1269 | KW_no_attack, |
1418 | KW_no_attack, |
1270 | KW_no_damage, |
1419 | KW_no_damage, |
1271 | KW_NULL, |
1420 | KW_obj_original, |
1272 | KW_NULL, |
1421 | KW_NULL, |
1273 | KW_activate_on_push, |
1422 | KW_activate_on_push, |
1274 | KW_activate_on_release, |
1423 | KW_activate_on_release, |
1275 | KW_is_water, |
1424 | KW_is_water, |
1276 | KW_use_content_on_gen, |
1425 | KW_use_content_on_gen, |
1277 | KW_NULL, |
1426 | KW_NULL, |
1278 | KW_is_buildable, |
1427 | KW_is_buildable, |
1279 | /* 110 */ |
1428 | /* 110 */ |
1280 | KW_destroy_on_death, |
1429 | KW_destroy_on_death, |
|
|
1430 | KW_NULL, |
1281 | }; |
1431 | }; |
1282 | |
1432 | |
1283 | int i; |
1433 | int i; |
1284 | |
1434 | |
1285 | /* This saves the key/value lists. We do it first so that any |
1435 | /* This saves the key/value lists. We do it first so that any |
1286 | * keys that match field names will be overwritten by the loader. |
1436 | * keys that match field names will be overwritten by the loader. |
1287 | */ |
1437 | */ |
1288 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1438 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1289 | { |
1439 | { |
1290 | /* Find the field in the opposing member. */ |
1440 | /* Find the field in the opposing member. */ |
1291 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1441 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1292 | |
1442 | |
1293 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1443 | /* If there's no partnering field, or it's got a different value, save our field. */ |
… | |
… | |
1377 | f.put (resist_save[i], op->resist[i]); |
1527 | f.put (resist_save[i], op->resist[i]); |
1378 | |
1528 | |
1379 | CMP_OUT (path_attuned); |
1529 | CMP_OUT (path_attuned); |
1380 | CMP_OUT (path_repelled); |
1530 | CMP_OUT (path_repelled); |
1381 | CMP_OUT (path_denied); |
1531 | CMP_OUT (path_denied); |
1382 | CMP_OUT (material); |
1532 | CMP_OUT2 (material, materials);//TODO: nuke |
1383 | CMP_OUT (materialname); |
1533 | CMP_OUT (materialname); |
1384 | CMP_OUT (value); |
1534 | CMP_OUT (value); |
1385 | CMP_OUT (carrying); |
1535 | CMP_OUT (carrying); |
1386 | CMP_OUT (weight); |
1536 | CMP_OUT (weight); |
1387 | CMP_OUT (invisible); |
1537 | CMP_OUT (invisible); |