1 | /* |
1 | /* |
2 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
3 | |
3 | * |
|
|
4 | * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team |
4 | Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | * Copyright (C) 2002 Mark Wedel & Crossfire Development Team |
5 | Copyright (C) 1992 Frank Tore Johansen |
6 | * Copyright (C) 1992 Frank Tore Johansen |
6 | |
7 | * |
7 | This program is free software; you can redistribute it and/or modify |
8 | * This program is free software; you can redistribute it and/or modify |
8 | it under the terms of the GNU General Public License as published by |
9 | * it under the terms of the GNU General Public License as published by |
9 | the Free Software Foundation; either version 2 of the License, or |
10 | * the Free Software Foundation; either version 2 of the License, or |
10 | (at your option) any later version. |
11 | * (at your option) any later version. |
11 | |
12 | * |
12 | This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
13 | but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
16 | |
17 | * |
17 | You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the GNU General Public License |
18 | along with this program; if not, write to the Free Software |
19 | * along with this program; if not, write to the Free Software |
19 | Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. |
20 | |
21 | * |
21 | The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | * The authors can be reached via e-mail at <crossfire@schmorp.de> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | /* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. |
25 | sub/add_weight will transcend the environment updating the carrying |
26 | sub/add_weight will transcend the environment updating the carrying |
26 | variable. */ |
27 | variable. */ |
27 | |
28 | |
28 | |
|
|
29 | #include <global.h> |
29 | #include <global.h> |
30 | #include <loader.h> |
30 | #include <loader.h> |
31 | #include <sproto.h> |
31 | #include <sproto.h> |
|
|
32 | |
|
|
33 | ///////////////////////////////////////////////////////////////////////////// |
32 | |
34 | |
33 | /* Maps the MOVE_* values to names */ |
35 | /* Maps the MOVE_* values to names */ |
34 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
36 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
35 | |
37 | |
36 | /* This table is only necessary to convert objects that existed before the |
38 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
261 | * to check for objects to make sure there are no common errors. |
263 | * to check for objects to make sure there are no common errors. |
262 | */ |
264 | */ |
263 | static void |
265 | static void |
264 | check_loaded_object (object *op) |
266 | check_loaded_object (object *op) |
265 | { |
267 | { |
266 | int ip; |
|
|
267 | |
|
|
268 | /* We do some specialized handling to handle legacy cases of name_pl. |
268 | /* We do some specialised handling to handle legacy cases of name_pl. |
269 | * If the object doesn't have a name_pl, we just use the object name - |
269 | * If the object doesn't have a name_pl, we just use the object name - |
270 | * this isn't perfect (things won't be properly pluralized), but works to |
270 | * this isn't perfect (things won't be properly pluralised), but works to |
271 | * that degree (5 heart is still quite understandable). But the case we |
271 | * that degree (5 heart is still quite understandable). But the case we |
272 | * also have to catch is if this object is not using the normal name for |
272 | * also have to catch is if this object is not using the normal name for |
273 | * the object. In that case, we also want to use the loaded name. |
273 | * the object. In that case, we also want to use the loaded name. |
274 | * Otherwise, what happens is that the the plural name will lose |
274 | * Otherwise, what happens is that the the plural name will lose |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
275 | * information (appear as just 'hearts' and not 'goblins heart') |
276 | */ |
276 | */ |
277 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
277 | if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) |
278 | op->name_pl = NULL; |
278 | op->name_pl = 0; |
279 | |
279 | |
280 | if (!op->name_pl) |
280 | if (!op->name_pl) |
281 | op->name_pl = op->name; |
281 | op->name_pl = op->name; |
282 | |
282 | |
283 | /* objects now have a materialname. try to patch it in */ |
283 | /* objects now have a materialname. try to patch it in */ |
… | |
… | |
286 | if (op->map != NULL) |
286 | if (op->map != NULL) |
287 | set_materialname (op, op->map->difficulty, NULL); |
287 | set_materialname (op, op->map->difficulty, NULL); |
288 | else |
288 | else |
289 | set_materialname (op, 5, NULL); |
289 | set_materialname (op, 5, NULL); |
290 | } |
290 | } |
|
|
291 | |
291 | /* only do these when program is first run - a bit |
292 | /* only do these when program is first run - a bit |
292 | * excessive to do this at every run - most of this is |
293 | * excessive to do this at every run - most of this is |
293 | * really just to catch any errors - program will still run, but |
294 | * really just to catch any errors - program will still run, but |
294 | * not in the ideal fashion. |
295 | * not in the ideal fashion. |
295 | */ |
296 | */ |
296 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
297 | if ((op->type == WEAPON || op->type == BOW) && arch_init) |
297 | { |
298 | { |
298 | if (!op->skill) |
299 | if (!op->skill) |
299 | { |
|
|
300 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
300 | LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); |
301 | } |
|
|
302 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
301 | else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || |
303 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
302 | (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) |
304 | { |
|
|
305 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
303 | LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); |
306 | } |
|
|
307 | } |
304 | } |
308 | |
305 | |
309 | /* We changed last_heal to gen_sp_armour, which is what it |
306 | /* We changed last_heal to gen_sp_armour, which is what it |
310 | * really does for many objects. Need to catch any in maps |
307 | * really does for many objects. Need to catch any in maps |
311 | * that may have an old value. |
308 | * that may have an old value. |
312 | */ |
309 | */ |
313 | if ((op->type == WEAPON) || |
310 | if (op->type == WEAPON |
314 | (op->type == ARMOUR) || (op->type == HELMET) || |
311 | || op->type == ARMOUR || op->type == HELMET |
315 | (op->type == SHIELD) || (op->type == RING) || |
312 | || op->type == SHIELD || op->type == RING |
316 | (op->type == BOOTS) || (op->type == GLOVES) || |
313 | || op->type == BOOTS || op->type == GLOVES |
317 | (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) |
314 | || op->type == AMULET || op->type == GIRDLE |
|
|
315 | || op->type == BRACERS || op->type == CLOAK) |
318 | { |
316 | { |
319 | if (op->last_heal) |
317 | if (op->last_heal) |
320 | { |
318 | { |
321 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
319 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
322 | op->gen_sp_armour = op->last_heal; |
320 | op->gen_sp_armour = op->last_heal; |
323 | op->last_heal = 0; |
321 | op->last_heal = 0; |
324 | } |
322 | } |
325 | if (editor) |
323 | |
326 | ip = 0; |
|
|
327 | else |
|
|
328 | ip = calc_item_power (op, 0); |
324 | int ip = calc_item_power (op, 0); |
|
|
325 | |
329 | /* Legacy objects from before item power was in the game */ |
326 | /* Legacy objects from before item power was in the game */ |
330 | if (!op->item_power && ip) |
327 | if (!op->item_power && ip) |
331 | { |
328 | { |
332 | if (ip > 3) |
329 | if (ip > 3) |
333 | { |
|
|
334 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
330 | LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); |
335 | } |
331 | |
336 | op->item_power = ip; |
332 | op->item_power = ip; |
337 | } |
333 | } |
|
|
334 | |
338 | /* Check for possibly bogus values. Has to meet both these criteria - |
335 | /* Check for possibly bogus values. Has to meet both these criteria - |
339 | * something that has item_power 1 is probably just fine if our calculated |
336 | * something that has item_power 1 is probably just fine if our calculated |
340 | * value is 1 or 2 - these values are small enough that hard to be precise. |
337 | * value is 1 or 2 - these values are small enough that hard to be precise. |
341 | * similarly, it item_power is 0, the first check will always pass, |
338 | * similarly, it item_power is 0, the first check will always pass, |
342 | * but not the second one. |
339 | * but not the second one. |
343 | */ |
340 | */ |
344 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
341 | if (ip > 2 * op->item_power && ip > (op->item_power + 3)) |
345 | { |
|
|
346 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
342 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); |
347 | } |
|
|
348 | |
|
|
349 | } |
343 | } |
|
|
344 | |
350 | /* Old spellcasting object - need to load in the appropiate object */ |
345 | /* Old spellcasting object - need to load in the appropiate object */ |
351 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
346 | if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || |
352 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
347 | /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ |
353 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
348 | ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) |
354 | { |
349 | { |
355 | object *tmp; |
|
|
356 | |
|
|
357 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
350 | /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' |
358 | * in that spell was stored in sp. |
351 | * in that spell was stored in sp. |
359 | */ |
352 | */ |
360 | tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
353 | object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); |
361 | insert_ob_in_ob (tmp, op); |
354 | insert_ob_in_ob (tmp, op); |
362 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
355 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
363 | } |
356 | } |
|
|
357 | |
364 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
358 | /* spellbooks & runes use slaying. But not to arch name, but to spell name */ |
365 | |
|
|
366 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
359 | if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) |
367 | { |
360 | { |
368 | object *tmp; |
|
|
369 | |
|
|
370 | tmp = get_archetype_by_object_name (op->slaying); |
361 | object *tmp = get_archetype_by_object_name (op->slaying); |
371 | insert_ob_in_ob (tmp, op); |
362 | insert_ob_in_ob (tmp, op); |
372 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
363 | op->randomitems = NULL; /* So another spell isn't created for this object */ |
373 | /* without this, value is all screwed up */ |
364 | /* without this, value is all screwed up */ |
374 | op->value = op->arch->clone.value * op->inv->value; |
365 | op->value = op->arch->clone.value * op->inv->value; |
375 | } |
366 | } |
376 | |
367 | |
377 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
368 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
378 | { |
369 | { |
379 | if (op->stats.hp > op->stats.maxhp) |
370 | if (op->stats.hp > op->stats.maxhp) |
|
|
371 | { |
380 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
372 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
373 | op->stats.maxhp = op->stats.hp; |
|
|
374 | } |
381 | |
375 | |
382 | /* The archs just need to be updated for this */ |
376 | /* The archs just need to be updated for this */ |
383 | if (op->move_type == 0) |
377 | if (op->move_type == 0) |
384 | op->move_type = MOVE_WALK; |
378 | op->move_type = MOVE_WALK; |
385 | } |
379 | } |
… | |
… | |
408 | { |
402 | { |
409 | op->move_type = MOVE_ALL; |
403 | op->move_type = MOVE_ALL; |
410 | op->stats.maxhp = 0; |
404 | op->stats.maxhp = 0; |
411 | } |
405 | } |
412 | else |
406 | else |
413 | { |
|
|
414 | op->move_type = MOVE_WALK; |
407 | op->move_type = MOVE_WALK; |
415 | } |
|
|
416 | } |
408 | } |
417 | } |
409 | } |
418 | |
410 | |
419 | } |
411 | } |
420 | |
412 | |
… | |
… | |
494 | bool ismore = 0; |
486 | bool ismore = 0; |
495 | object *op_inv = op->inv; |
487 | object *op_inv = op->inv; |
496 | |
488 | |
497 | for (;;) |
489 | for (;;) |
498 | { |
490 | { |
499 | keyword kw = thawer.get_kv (); |
491 | switch (thawer.get_kv ()) |
500 | |
|
|
501 | switch (kw) |
|
|
502 | { |
492 | { |
503 | case KW_Object: // uppercase alias |
493 | case KW_Object: // uppercase alias |
504 | case KW_object: |
494 | case KW_object: |
505 | thawer.get (op->name); |
495 | thawer.get (op->name); |
506 | |
496 | |
… | |
… | |
540 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
530 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
541 | |
531 | |
542 | case KW_arch: |
532 | case KW_arch: |
543 | { |
533 | { |
544 | const char *str = thawer.get_str (); |
534 | const char *str = thawer.get_str (); |
545 | fprintf (stderr, "arch %s\n", str);//D |
|
|
546 | |
535 | |
547 | if (op->arch) |
536 | if (op->arch) |
548 | { |
537 | { |
549 | /* If op->arch has been set, then this new object |
538 | /* If op->arch has been set, then this new object |
550 | * must be part of the inventory. So process |
539 | * must be part of the inventory. So process |
… | |
… | |
558 | tmp = arch_to_object (arch); |
547 | tmp = arch_to_object (arch); |
559 | else |
548 | else |
560 | { |
549 | { |
561 | tmp = object::create (); |
550 | tmp = object::create (); |
562 | /* record the name of the broken object */ |
551 | /* record the name of the broken object */ |
|
|
552 | //TODO: but do not log??? |
563 | tmp->name = str; |
553 | tmp->name = str; |
564 | } |
554 | } |
565 | |
555 | |
566 | // decativate the object we, as we are still going |
556 | // decativate the object we, as we are still going |
567 | // to read the speed value. Objects should be activated |
557 | // to read the speed value. Objects should be activated |
… | |
… | |
625 | op->other_arch = archetype::find (thawer.get_str ()); |
615 | op->other_arch = archetype::find (thawer.get_str ()); |
626 | break; |
616 | break; |
627 | |
617 | |
628 | case KW_animation: |
618 | case KW_animation: |
629 | { |
619 | { |
|
|
620 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
621 | op->animation_id = 0; |
|
|
622 | |
630 | const char *str = thawer.get_str (); |
623 | const char *str = thawer.get_str (); |
631 | |
|
|
632 | if (!str) |
|
|
633 | { |
|
|
634 | op->animation_id = 0; |
|
|
635 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
636 | } |
|
|
637 | else |
|
|
638 | { |
|
|
639 | op->animation_id = find_animation (str); |
624 | if (str && (op->animation_id = find_animation (str))) |
640 | SET_FLAG (op, FLAG_ANIMATE); |
625 | SET_FLAG (op, FLAG_ANIMATE); |
641 | } |
|
|
642 | } |
626 | } |
643 | |
|
|
644 | break; |
627 | break; |
645 | |
628 | |
646 | case KW_last_heal: thawer.get (op->last_heal); break; |
629 | case KW_last_heal: thawer.get (op->last_heal); break; |
647 | case KW_last_sp: thawer.get (op->last_sp); break; |
630 | case KW_last_sp: thawer.get (op->last_sp); break; |
648 | case KW_last_grace: thawer.get (op->last_grace); break; |
631 | case KW_last_grace: thawer.get (op->last_grace); break; |
… | |
… | |
653 | thawer.get (op->speed); |
636 | thawer.get (op->speed); |
654 | |
637 | |
655 | //TODO: maybe do in check_object |
638 | //TODO: maybe do in check_object |
656 | // removed check for style maps |
639 | // removed check for style maps |
657 | if (op->speed < 0) |
640 | if (op->speed < 0) |
658 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
641 | op->speed_left = op->speed_left - rndm (); |
659 | |
642 | |
660 | break; |
643 | break; |
661 | |
644 | |
662 | case KW_slow_move: |
645 | case KW_slow_move: |
663 | op->move_slow |= MOVE_WALK; |
646 | op->move_slow |= MOVE_WALK; |
… | |
… | |
713 | case KW_path_denied: thawer.get (op->path_denied); break; |
696 | case KW_path_denied: thawer.get (op->path_denied); break; |
714 | case KW_invisible: thawer.get (op->invisible); break; |
697 | case KW_invisible: thawer.get (op->invisible); break; |
715 | case KW_magic: thawer.get (op->magic); break; |
698 | case KW_magic: thawer.get (op->magic); break; |
716 | case KW_state: thawer.get (op->state); break; |
699 | case KW_state: thawer.get (op->state); break; |
717 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
700 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
718 | case KW_material: thawer.get (op->material); break; |
701 | case KW_material: thawer.get (op->materials); break; //TODO: nuke |
719 | case KW_materialname: thawer.get (op->materialname); break; |
702 | case KW_materialname: thawer.get (op->materialname); break; |
720 | |
703 | |
721 | /* These are the new values */ |
704 | /* These are the new values */ |
722 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
705 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
723 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
706 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
… | |
… | |
817 | CLEAR_FLAG (op, FLAG_WIZCAST); |
800 | CLEAR_FLAG (op, FLAG_WIZCAST); |
818 | } |
801 | } |
819 | break; |
802 | break; |
820 | |
803 | |
821 | case KW_friendly: |
804 | case KW_friendly: |
822 | GET_FLAG (op, FLAG_FRIENDLY); |
805 | if (thawer.get_sint32 ()) |
823 | //TODO: move to check_object or so |
806 | if (op->type != PLAYER) |
824 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
|
|
825 | add_friendly_object (op); |
807 | add_friendly_object (op); |
|
|
808 | |
826 | break; |
809 | break; |
827 | |
810 | |
828 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
811 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
829 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
812 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
830 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
813 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
831 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
814 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
|
|
815 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
832 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
816 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
833 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
817 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
834 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
818 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
835 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
819 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
836 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
820 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
… | |
… | |
907 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
891 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
908 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
892 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
909 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
893 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
910 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
894 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
911 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
895 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
|
|
896 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
912 | |
897 | |
913 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
898 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
914 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
899 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
915 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
900 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
916 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
901 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
… | |
… | |
983 | add_button_link (op, op->map, thawer.get_sint32 ()); |
968 | add_button_link (op, op->map, thawer.get_sint32 ()); |
984 | break; |
969 | break; |
985 | |
970 | |
986 | case KW_randomitems: |
971 | case KW_randomitems: |
987 | op->randomitems = find_treasurelist (thawer.get_str ()); |
972 | op->randomitems = find_treasurelist (thawer.get_str ()); |
|
|
973 | //if (!op->randomitems) |
|
|
974 | // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); |
988 | break; |
975 | break; |
989 | |
976 | |
990 | case KW_msg: |
977 | case KW_msg: |
991 | thawer.get_ml (KW_endmsg, op->msg); |
978 | thawer.get_ml (KW_endmsg, op->msg); |
992 | //TODO: allow longer messages |
979 | //TODO: allow longer messages |
993 | if (strlen (op->msg) >= HUGE_BUF) |
980 | if (strlen (op->msg) >= HUGE_BUF) |
994 | { |
981 | { |
995 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
982 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
996 | op->msg = "ERROR, please report: string too long, winged.\n"; |
983 | op->msg = "ERROR, please report: string too long, winged.\n"; |
997 | } |
984 | } |
998 | break; |
985 | break; |
999 | |
986 | |
1000 | case KW_lore: |
987 | case KW_lore: |
… | |
… | |
1002 | //TODO: allow longer messages |
989 | //TODO: allow longer messages |
1003 | /* Just print a warning so we can be reasonably safe |
990 | /* Just print a warning so we can be reasonably safe |
1004 | * about not overflowing the buffer. |
991 | * about not overflowing the buffer. |
1005 | */ |
992 | */ |
1006 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
993 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1007 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
994 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1008 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
995 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1009 | break; |
996 | break; |
1010 | |
997 | |
1011 | case KW_editable: |
998 | case KW_editable: |
1012 | case KW_editor_folder: |
999 | case KW_editor_folder: |
… | |
… | |
1030 | |
1017 | |
1031 | case KW_EOF: |
1018 | case KW_EOF: |
1032 | return LL_EOF; |
1019 | return LL_EOF; |
1033 | |
1020 | |
1034 | case KW_ERROR: |
1021 | case KW_ERROR: |
1035 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1022 | set_ob_key_value (op, thawer.kw_str, thawer.value, true); |
1036 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1023 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D |
1037 | break; |
1024 | break; |
1038 | |
1025 | |
1039 | default: |
1026 | default: |
1040 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1027 | if (!thawer.parse_error ("object", op->name)) |
|
|
1028 | return false; |
1041 | break; |
1029 | break; |
1042 | } |
1030 | } |
1043 | } |
1031 | } |
1044 | } |
1032 | } |
1045 | |
1033 | |
… | |
… | |
1058 | * |
1046 | * |
1059 | */ |
1047 | */ |
1060 | int |
1048 | int |
1061 | load_object (object_thawer &fp, object *op, int map_flags) |
1049 | load_object (object_thawer &fp, object *op, int map_flags) |
1062 | { |
1050 | { |
1063 | // cede every 500 objects loaded |
1051 | coroapi::cede_every (1000); // cede once in a while |
1064 | { |
|
|
1065 | static int cede_counter = 0; |
|
|
1066 | |
|
|
1067 | if (++cede_counter >= 500) |
|
|
1068 | { |
|
|
1069 | cede_counter = 0; |
|
|
1070 | if (coroapi::nready ()) |
|
|
1071 | coroapi::cede (); |
|
|
1072 | } |
|
|
1073 | } |
|
|
1074 | |
1052 | |
1075 | return parse_object (op, fp, map_flags); |
1053 | return parse_object (op, fp, map_flags); |
1076 | } |
1054 | } |
1077 | |
1055 | |
1078 | /* This takes a buffer, scans it for variables, and sets those variables |
1056 | /* This takes a buffer, scans it for variables, and sets those variables |
… | |
… | |
1277 | KW_berserk, |
1255 | KW_berserk, |
1278 | KW_neutral, |
1256 | KW_neutral, |
1279 | /* 100 */ |
1257 | /* 100 */ |
1280 | KW_no_attack, |
1258 | KW_no_attack, |
1281 | KW_no_damage, |
1259 | KW_no_damage, |
1282 | KW_NULL, |
1260 | KW_obj_original, |
1283 | KW_NULL, |
1261 | KW_NULL, |
1284 | KW_activate_on_push, |
1262 | KW_activate_on_push, |
1285 | KW_activate_on_release, |
1263 | KW_activate_on_release, |
1286 | KW_is_water, |
1264 | KW_is_water, |
1287 | KW_use_content_on_gen, |
1265 | KW_use_content_on_gen, |
1288 | KW_NULL, |
1266 | KW_NULL, |
1289 | KW_is_buildable, |
1267 | KW_is_buildable, |
1290 | /* 110 */ |
1268 | /* 110 */ |
|
|
1269 | KW_destroy_on_death, |
|
|
1270 | KW_NULL, |
1291 | }; |
1271 | }; |
1292 | |
1272 | |
1293 | int i; |
1273 | int i; |
1294 | |
1274 | |
1295 | /* This saves the key/value lists. We do it first so that any |
1275 | /* This saves the key/value lists. We do it first so that any |
1296 | * keys that match field names will be overwritten by the loader. |
1276 | * keys that match field names will be overwritten by the loader. |
1297 | */ |
1277 | */ |
1298 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1278 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1299 | { |
1279 | { |
1300 | /* Find the field in the opposing member. */ |
1280 | /* Find the field in the opposing member. */ |
1301 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1281 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1302 | |
1282 | |
1303 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1283 | /* If there's no partnering field, or it's got a different value, save our field. */ |
… | |
… | |
1387 | f.put (resist_save[i], op->resist[i]); |
1367 | f.put (resist_save[i], op->resist[i]); |
1388 | |
1368 | |
1389 | CMP_OUT (path_attuned); |
1369 | CMP_OUT (path_attuned); |
1390 | CMP_OUT (path_repelled); |
1370 | CMP_OUT (path_repelled); |
1391 | CMP_OUT (path_denied); |
1371 | CMP_OUT (path_denied); |
1392 | CMP_OUT (material); |
1372 | CMP_OUT2 (material, materials);//TODO: nuke |
1393 | CMP_OUT (materialname); |
1373 | CMP_OUT (materialname); |
1394 | CMP_OUT (value); |
1374 | CMP_OUT (value); |
1395 | CMP_OUT (carrying); |
1375 | CMP_OUT (carrying); |
1396 | CMP_OUT (weight); |
1376 | CMP_OUT (weight); |
1397 | CMP_OUT (invisible); |
1377 | CMP_OUT (invisible); |
… | |
… | |
1474 | |
1454 | |
1475 | fp.put (op); |
1455 | fp.put (op); |
1476 | fp.put (KW_end); |
1456 | fp.put (KW_end); |
1477 | } |
1457 | } |
1478 | |
1458 | |
|
|
1459 | ///////////////////////////////////////////////////////////////////////////// |
|
|
1460 | |
|
|
1461 | bool load_resource_file (const char *filename) |
|
|
1462 | { |
|
|
1463 | object_thawer f (filename); |
|
|
1464 | |
|
|
1465 | f.next_kv (); |
|
|
1466 | |
|
|
1467 | for (;;) |
|
|
1468 | { |
|
|
1469 | switch (f.kw) |
|
|
1470 | { |
|
|
1471 | case KW_region: |
|
|
1472 | if (!region::load (f)) |
|
|
1473 | return false; |
|
|
1474 | break; |
|
|
1475 | |
|
|
1476 | case KW_EOF: |
|
|
1477 | return true; |
|
|
1478 | |
|
|
1479 | default: |
|
|
1480 | if (!f.parse_error ("resource file")) |
|
|
1481 | return false; |
|
|
1482 | } |
|
|
1483 | |
|
|
1484 | f.next_kv (); |
|
|
1485 | } |
|
|
1486 | } |
|
|
1487 | |