1 | |
|
|
2 | /* |
1 | /* |
3 | CrossFire, A Multiplayer game for X-windows |
2 | * CrossFire, A Multiplayer game for X-windows |
4 | |
3 | * |
|
|
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-devel@real-time.com |
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 | |
29 | |
30 | #include <global.h> |
30 | #include <global.h> |
31 | #include <loader.h> |
31 | #include <loader.h> |
32 | #include <newserver.h> |
|
|
33 | #include <sproto.h> |
32 | #include <sproto.h> |
|
|
33 | |
|
|
34 | // future resource loader base class |
|
|
35 | struct loader_base |
|
|
36 | { |
|
|
37 | virtual archetype *get_arch (const char *name); |
|
|
38 | virtual void put_arch (archetype *arch); |
|
|
39 | |
|
|
40 | virtual object *get_object (const char *name); |
|
|
41 | virtual void put_object (object *op); |
|
|
42 | |
|
|
43 | virtual player *get_player (); |
|
|
44 | virtual void put_player (player *pl); |
|
|
45 | |
|
|
46 | virtual region *get_region (); |
|
|
47 | virtual void put_region (region *region); |
|
|
48 | |
|
|
49 | virtual facetile *get_face (const char *name); |
|
|
50 | virtual void put_face (facetile *face); |
|
|
51 | |
|
|
52 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
53 | virtual void put_treasure (treasurelist *treasure); |
|
|
54 | |
|
|
55 | virtual animation *get_animation (const char *name); |
|
|
56 | virtual void put_animation (animation *anim); |
|
|
57 | }; |
|
|
58 | |
|
|
59 | // future generic resource loader |
|
|
60 | // handles generic stuff valid in most files, such as |
|
|
61 | // animations, treasures, faces and so on |
|
|
62 | struct loader_generic : loader_base |
|
|
63 | { |
|
|
64 | virtual region *get_region (); |
|
|
65 | virtual void put_region (region *region); |
|
|
66 | |
|
|
67 | virtual facetile *get_face (const char *name); |
|
|
68 | virtual void put_face (facetile *face); |
|
|
69 | |
|
|
70 | virtual treasurelist *get_treasure (const char *name, bool one = false); |
|
|
71 | virtual void put_treasure (treasurelist *treasure); |
|
|
72 | |
|
|
73 | virtual animation *get_animation (const char *name); |
|
|
74 | virtual void put_animation (animation *anim); |
|
|
75 | }; |
34 | |
76 | |
35 | /* Maps the MOVE_* values to names */ |
77 | /* Maps the MOVE_* values to names */ |
36 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
78 | static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; |
37 | |
79 | |
38 | /* This table is only necessary to convert objects that existed before the |
80 | /* This table is only necessary to convert objects that existed before the |
… | |
… | |
265 | static void |
307 | static void |
266 | check_loaded_object (object *op) |
308 | check_loaded_object (object *op) |
267 | { |
309 | { |
268 | int ip; |
310 | int ip; |
269 | |
311 | |
270 | /* We do some specialized handling to handle legacy cases of name_pl. |
312 | /* We do some specialised handling to handle legacy cases of name_pl. |
271 | * If the object doesn't have a name_pl, we just use the object name - |
313 | * If the object doesn't have a name_pl, we just use the object name - |
272 | * this isn't perfect (things won't be properly pluralized), but works to |
314 | * this isn't perfect (things won't be properly pluralised), but works to |
273 | * that degree (5 heart is still quite understandable). But the case we |
315 | * that degree (5 heart is still quite understandable). But the case we |
274 | * also have to catch is if this object is not using the normal name for |
316 | * also have to catch is if this object is not using the normal name for |
275 | * the object. In that case, we also want to use the loaded name. |
317 | * the object. In that case, we also want to use the loaded name. |
276 | * Otherwise, what happens is that the the plural name will lose |
318 | * Otherwise, what happens is that the the plural name will lose |
277 | * information (appear as just 'hearts' and not 'goblins heart') |
319 | * information (appear as just 'hearts' and not 'goblins heart') |
… | |
… | |
281 | |
323 | |
282 | if (!op->name_pl) |
324 | if (!op->name_pl) |
283 | op->name_pl = op->name; |
325 | op->name_pl = op->name; |
284 | |
326 | |
285 | /* objects now have a materialname. try to patch it in */ |
327 | /* objects now have a materialname. try to patch it in */ |
286 | if (!(IS_WEAPON (op) && op->level > 0)) |
328 | if (!(op->is_weapon () && op->level > 0)) |
287 | { |
329 | { |
288 | if (op->map != NULL) |
330 | if (op->map != NULL) |
289 | set_materialname (op, op->map->difficulty, NULL); |
331 | set_materialname (op, op->map->difficulty, NULL); |
290 | else |
332 | else |
291 | set_materialname (op, 5, NULL); |
333 | set_materialname (op, 5, NULL); |
… | |
… | |
322 | { |
364 | { |
323 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
365 | LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); |
324 | op->gen_sp_armour = op->last_heal; |
366 | op->gen_sp_armour = op->last_heal; |
325 | op->last_heal = 0; |
367 | op->last_heal = 0; |
326 | } |
368 | } |
327 | if (editor) |
369 | |
328 | ip = 0; |
|
|
329 | else |
|
|
330 | ip = calc_item_power (op, 0); |
370 | ip = calc_item_power (op, 0); |
331 | /* Legacy objects from before item power was in the game */ |
371 | /* Legacy objects from before item power was in the game */ |
332 | if (!op->item_power && ip) |
372 | if (!op->item_power && ip) |
333 | { |
373 | { |
334 | if (ip > 3) |
374 | if (ip > 3) |
335 | { |
375 | { |
… | |
… | |
377 | } |
417 | } |
378 | |
418 | |
379 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
419 | if (QUERY_FLAG (op, FLAG_MONSTER)) |
380 | { |
420 | { |
381 | if (op->stats.hp > op->stats.maxhp) |
421 | if (op->stats.hp > op->stats.maxhp) |
|
|
422 | { |
382 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
423 | LOG (llevDebug, "Monster %s has hp set higher than maxhp (%d>%d)\n", op->debug_desc (), op->stats.hp, op->stats.maxhp); |
|
|
424 | op->stats.maxhp = op->stats.hp; |
|
|
425 | } |
383 | |
426 | |
384 | /* The archs just need to be updated for this */ |
427 | /* The archs just need to be updated for this */ |
385 | if (op->move_type == 0) |
428 | if (op->move_type == 0) |
386 | op->move_type = MOVE_WALK; |
429 | op->move_type = MOVE_WALK; |
387 | } |
430 | } |
… | |
… | |
489 | SET_FLAG (op, flag); \ |
532 | SET_FLAG (op, flag); \ |
490 | else \ |
533 | else \ |
491 | CLEAR_FLAG (op, flag) \ |
534 | CLEAR_FLAG (op, flag) \ |
492 | |
535 | |
493 | int |
536 | int |
494 | parse_object (object *op, object_thawer & thawer, int map_flags) |
537 | parse_object (object *op, object_thawer &thawer, int map_flags) |
495 | { |
538 | { |
496 | bool ismore = 0; |
539 | bool ismore = 0; |
497 | object *op_inv = op->inv; |
540 | object *op_inv = op->inv; |
498 | |
541 | |
499 | for (;;) |
542 | for (;;) |
500 | { |
543 | { |
501 | keyword kw = thawer.get_kv (); |
544 | keyword kw = thawer.get_kv (); |
502 | |
545 | |
503 | switch (kw) |
546 | switch (kw) |
504 | { |
547 | { |
505 | case KW_Object: // uppercase alias |
548 | case KW_Object: // uppercase alias |
506 | case KW_object: |
549 | case KW_object: |
507 | thawer.get (op->name); |
550 | thawer.get (op->name); |
508 | |
551 | |
509 | if (op->arch != NULL) |
552 | if (op->arch) |
510 | op->arch->name = op->name; |
553 | op->arch->name = op->name; |
511 | |
554 | |
512 | break; |
555 | break; |
513 | |
556 | |
514 | case KW_oid: |
557 | case KW_uuid: |
515 | thawer.get (op, thawer.get_sint32 ()); |
558 | if (const char *s = thawer.get_str ()) |
516 | break; |
|
|
517 | |
|
|
518 | case KW_name: |
|
|
519 | thawer.get (op->name); |
|
|
520 | break; |
|
|
521 | case KW_name_pl: |
|
|
522 | thawer.get (op->name_pl); |
|
|
523 | break; |
|
|
524 | case KW_title: |
|
|
525 | thawer.get (op->title); |
|
|
526 | break; |
|
|
527 | case KW_custom_name: |
|
|
528 | thawer.get (op->custom_name); |
|
|
529 | break; |
|
|
530 | case KW_attach: |
|
|
531 | thawer.get_ornull (op->attach); |
|
|
532 | break; |
|
|
533 | case KW_skill: |
|
|
534 | thawer.get_ornull (op->skill); |
|
|
535 | break; |
|
|
536 | case KW_race: |
|
|
537 | thawer.get_ornull (op->race); |
|
|
538 | break; |
|
|
539 | case KW_slaying: |
|
|
540 | thawer.get_ornull (op->slaying); |
|
|
541 | break; |
|
|
542 | |
|
|
543 | case KW_arch: |
|
|
544 | { |
559 | { |
545 | const char *str = thawer.get_str (); |
560 | unsigned int version; |
|
|
561 | unsigned long long seq; |
546 | |
562 | |
547 | if (op->arch) |
563 | if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) |
548 | { |
564 | { |
549 | /* If op->arch has been set, then this new object |
565 | op->uuid.seq = seq; |
550 | * must be part of the inventory. So process |
|
|
551 | * appropriately. |
|
|
552 | */ |
|
|
553 | archetype *arch = find_archetype (str); |
|
|
554 | |
|
|
555 | object *tmp; |
|
|
556 | |
|
|
557 | if (arch != NULL) |
|
|
558 | tmp = arch_to_object (arch); |
|
|
559 | else |
566 | break; |
560 | { |
|
|
561 | tmp = get_object (); |
|
|
562 | /* record the name of the broken object */ |
|
|
563 | tmp->name = str; |
|
|
564 | } |
|
|
565 | |
|
|
566 | parse_object (tmp, thawer, map_flags); |
|
|
567 | |
|
|
568 | if (tmp->arch) |
|
|
569 | { |
|
|
570 | // was: insert_ob_in_ob (tmp, op); |
|
|
571 | // but manually adding it can improve map loading times a lot |
|
|
572 | // also, appending instead of prepending keeps the |
|
|
573 | // save ordering the same between repeated load/saves. |
|
|
574 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
575 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
|
|
576 | |
|
|
577 | if (!op_inv) |
|
|
578 | { |
|
|
579 | op->inv = tmp; |
|
|
580 | tmp->above = 0; |
|
|
581 | } |
|
|
582 | else |
|
|
583 | { |
|
|
584 | while (op_inv->below) |
|
|
585 | op_inv = op_inv->below; |
|
|
586 | |
|
|
587 | op_inv->below = tmp; |
|
|
588 | tmp->above = op_inv; |
|
|
589 | } |
|
|
590 | |
|
|
591 | tmp->below = 0; |
|
|
592 | tmp->env = op; |
|
|
593 | op_inv = tmp; |
|
|
594 | } |
|
|
595 | else |
|
|
596 | { |
|
|
597 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
|
|
598 | free_object (tmp); |
|
|
599 | } |
|
|
600 | } |
|
|
601 | else |
|
|
602 | { |
|
|
603 | /* This is the actual archetype definition then */ |
|
|
604 | op->arch = find_archetype (str); |
|
|
605 | |
|
|
606 | if (op->arch != NULL) |
|
|
607 | copy_object (&op->arch->clone, op); |
|
|
608 | else if (!arch_init) |
|
|
609 | /* record the name of the broken object */ |
|
|
610 | op->name = str; |
|
|
611 | } |
567 | } |
612 | } |
568 | } |
|
|
569 | |
|
|
570 | op->uuid = gen_uuid (); |
613 | break; |
571 | break; |
614 | |
572 | |
615 | case KW_other_arch: |
573 | case KW_oid: |
616 | op->other_arch = find_archetype (thawer.get_str ()); |
574 | thawer.get (op, thawer.get_sint32 ()); |
617 | break; |
575 | break; |
618 | |
576 | |
|
|
577 | case KW_name: thawer.get (op->name); break; |
|
|
578 | case KW_name_pl: thawer.get (op->name_pl); break; |
|
|
579 | case KW_title: thawer.get (op->title); break; |
|
|
580 | case KW_custom_name: thawer.get (op->custom_name); break; |
|
|
581 | |
|
|
582 | case KW_attach: thawer.get_ornull (op->attach); break; |
|
|
583 | case KW_skill: thawer.get_ornull (op->skill); break; |
|
|
584 | case KW_race: thawer.get_ornull (op->race); break; |
|
|
585 | case KW_slaying: thawer.get_ornull (op->slaying); break; |
|
|
586 | |
619 | case KW_animation: |
587 | case KW_arch: |
620 | { |
588 | { |
621 | const char *str = thawer.get_str (); |
589 | const char *str = thawer.get_str (); |
622 | |
590 | |
623 | if (!str) |
591 | if (op->arch) |
624 | { |
|
|
625 | op->animation_id = 0; |
|
|
626 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
627 | } |
|
|
628 | else |
|
|
629 | { |
|
|
630 | op->animation_id = find_animation (str); |
|
|
631 | SET_FLAG (op, FLAG_ANIMATE); |
|
|
632 | } |
|
|
633 | } |
|
|
634 | |
|
|
635 | break; |
|
|
636 | |
|
|
637 | case KW_last_heal: |
|
|
638 | thawer.get (op->last_heal); |
|
|
639 | break; |
|
|
640 | case KW_last_sp: |
|
|
641 | thawer.get (op->last_sp); |
|
|
642 | break; |
|
|
643 | case KW_last_grace: |
|
|
644 | thawer.get (op->last_grace); |
|
|
645 | break; |
|
|
646 | case KW_last_eat: |
|
|
647 | thawer.get (op->last_eat); |
|
|
648 | break; |
|
|
649 | case KW_speed_left: |
|
|
650 | thawer.get (op->speed_left); |
|
|
651 | break; |
|
|
652 | |
|
|
653 | case KW_speed: |
|
|
654 | thawer.get (op->speed); |
|
|
655 | |
|
|
656 | //TODO: maybe do in check_object |
|
|
657 | if (!(map_flags & MAP_STYLE)) |
|
|
658 | { |
592 | { |
659 | if (op->speed < 0) |
593 | /* If op->arch has been set, then this new object |
660 | op->speed_left = op->speed_left - RANDOM () % 100 / 100.0; |
594 | * must be part of the inventory. So process |
661 | |
595 | * appropriately. |
662 | update_ob_speed (op); |
|
|
663 | } |
596 | */ |
|
|
597 | archetype *arch = archetype::find (str); |
664 | |
598 | |
665 | break; |
599 | object *tmp; |
666 | |
600 | |
667 | case KW_slow_move: |
601 | if (arch) |
668 | op->move_slow |= MOVE_WALK; |
602 | tmp = arch_to_object (arch); |
669 | thawer.get (op->move_slow_penalty); |
|
|
670 | break; |
|
|
671 | |
|
|
672 | case KW_face: |
|
|
673 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
|
|
674 | break; |
|
|
675 | |
|
|
676 | case KW_x: |
|
|
677 | thawer.get (op->x); |
|
|
678 | break; |
|
|
679 | case KW_y: |
|
|
680 | thawer.get (op->y); |
|
|
681 | break; |
|
|
682 | case KW_Str: // uppercase alias |
|
|
683 | case KW_str: |
|
|
684 | thawer.get (op->stats.Str); |
|
|
685 | break; |
|
|
686 | case KW_Dex: // uppercase alias |
|
|
687 | case KW_dex: |
|
|
688 | thawer.get (op->stats.Dex); |
|
|
689 | break; |
|
|
690 | case KW_Con: // uppercase alias |
|
|
691 | case KW_con: |
|
|
692 | thawer.get (op->stats.Con); |
|
|
693 | break; |
|
|
694 | case KW_Wis: // uppercase alias |
|
|
695 | case KW_wis: |
|
|
696 | thawer.get (op->stats.Wis); |
|
|
697 | break; |
|
|
698 | case KW_Cha: // uppercase alias |
|
|
699 | case KW_cha: |
|
|
700 | thawer.get (op->stats.Cha); |
|
|
701 | break; |
|
|
702 | case KW_Int: // uppercase alias |
|
|
703 | case KW_int: |
|
|
704 | thawer.get (op->stats.Int); |
|
|
705 | break; |
|
|
706 | case KW_Pow: // uppercase alias |
|
|
707 | case KW_pow: |
|
|
708 | thawer.get (op->stats.Pow); |
|
|
709 | break; |
|
|
710 | case KW_hp: |
|
|
711 | thawer.get (op->stats.hp); |
|
|
712 | break; |
|
|
713 | case KW_maxhp: |
|
|
714 | thawer.get (op->stats.maxhp); |
|
|
715 | break; |
|
|
716 | case KW_sp: |
|
|
717 | thawer.get (op->stats.sp); |
|
|
718 | break; |
|
|
719 | case KW_maxsp: |
|
|
720 | thawer.get (op->stats.maxsp); |
|
|
721 | break; |
|
|
722 | case KW_grace: |
|
|
723 | thawer.get (op->stats.grace); |
|
|
724 | break; |
|
|
725 | case KW_maxgrace: |
|
|
726 | thawer.get (op->stats.maxgrace); |
|
|
727 | break; |
|
|
728 | |
|
|
729 | case KW_exp: |
|
|
730 | thawer.get (op->stats.exp); |
|
|
731 | break; |
|
|
732 | case KW_perm_exp: |
|
|
733 | thawer.get (op->perm_exp); |
|
|
734 | break; |
|
|
735 | case KW_food: |
|
|
736 | thawer.get (op->stats.food); |
|
|
737 | break; |
|
|
738 | case KW_dam: |
|
|
739 | thawer.get (op->stats.dam); |
|
|
740 | break; |
|
|
741 | case KW_wc: |
|
|
742 | thawer.get (op->stats.wc); |
|
|
743 | break; |
|
|
744 | case KW_ac: |
|
|
745 | thawer.get (op->stats.ac); |
|
|
746 | break; |
|
|
747 | case KW_nrof: |
|
|
748 | thawer.get (op->nrof); |
|
|
749 | break; |
|
|
750 | case KW_level: |
|
|
751 | thawer.get (op->level); |
|
|
752 | break; |
|
|
753 | case KW_direction: |
|
|
754 | thawer.get (op->direction); |
|
|
755 | break; |
|
|
756 | case KW_type: |
|
|
757 | thawer.get (op->type); |
|
|
758 | break; |
|
|
759 | case KW_subtype: |
|
|
760 | thawer.get (op->subtype); |
|
|
761 | break; |
|
|
762 | case KW_value: |
|
|
763 | thawer.get (op->value); |
|
|
764 | break; |
|
|
765 | case KW_weight: |
|
|
766 | thawer.get (op->weight); |
|
|
767 | break; |
|
|
768 | case KW_carrying: |
|
|
769 | thawer.get (op->carrying); |
|
|
770 | break; |
|
|
771 | case KW_attacktype: |
|
|
772 | thawer.get (op->attacktype); |
|
|
773 | break; |
|
|
774 | case KW_path_attuned: |
|
|
775 | thawer.get (op->path_attuned); |
|
|
776 | break; |
|
|
777 | case KW_path_repelled: |
|
|
778 | thawer.get (op->path_repelled); |
|
|
779 | break; |
|
|
780 | case KW_path_denied: |
|
|
781 | thawer.get (op->path_denied); |
|
|
782 | break; |
|
|
783 | case KW_invisible: |
|
|
784 | thawer.get (op->invisible); |
|
|
785 | break; |
|
|
786 | case KW_magic: |
|
|
787 | thawer.get (op->magic); |
|
|
788 | break; |
|
|
789 | case KW_state: |
|
|
790 | thawer.get (op->state); |
|
|
791 | break; |
|
|
792 | case KW_move_slow_penalty: |
|
|
793 | thawer.get (op->move_slow_penalty); |
|
|
794 | break; |
|
|
795 | case KW_material: |
|
|
796 | thawer.get (op->material); |
|
|
797 | break; |
|
|
798 | case KW_materialname: |
|
|
799 | thawer.get (op->materialname); |
|
|
800 | break; |
|
|
801 | |
|
|
802 | /* These are the new values */ |
|
|
803 | case KW_move_block: |
|
|
804 | set_move (op->move_block, thawer.get_str ()); |
|
|
805 | break; |
|
|
806 | case KW_move_allow: |
|
|
807 | set_move (op->move_allow, thawer.get_str ()); |
|
|
808 | break; |
|
|
809 | case KW_move_type: |
|
|
810 | set_move (op->move_type, thawer.get_str ()); |
|
|
811 | break; |
|
|
812 | case KW_move_on: |
|
|
813 | set_move (op->move_on, thawer.get_str ()); |
|
|
814 | break; |
|
|
815 | case KW_move_off: |
|
|
816 | set_move (op->move_off, thawer.get_str ()); |
|
|
817 | break; |
|
|
818 | case KW_move_slow: |
|
|
819 | set_move (op->move_slow, thawer.get_str ()); |
|
|
820 | break; |
|
|
821 | |
|
|
822 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
823 | case KW_no_pass: |
|
|
824 | { |
|
|
825 | if (thawer.get_sint32 ()) |
|
|
826 | op->move_block = MOVE_ALL; |
|
|
827 | else |
603 | else |
828 | op->move_block = 0; |
|
|
829 | } |
|
|
830 | |
|
|
831 | break; |
|
|
832 | |
|
|
833 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
834 | case KW_walk_on: |
|
|
835 | { |
604 | { |
836 | if (thawer.get_sint32 ()) |
605 | tmp = object::create (); |
837 | op->move_on |= MOVE_WALK; |
606 | /* record the name of the broken object */ |
|
|
607 | tmp->name = str; |
|
|
608 | } |
|
|
609 | |
|
|
610 | // decativate the object we, as we are still going |
|
|
611 | // to read the speed value. Objects should be activated |
|
|
612 | // when the map, object or player is completly loaded. |
|
|
613 | tmp->deactivate (); |
|
|
614 | |
|
|
615 | parse_object (tmp, thawer, map_flags); |
|
|
616 | |
|
|
617 | if (tmp->arch) |
|
|
618 | { |
|
|
619 | // was: insert_ob_in_ob (tmp, op); |
|
|
620 | // but manually adding it can improve map loading times a lot |
|
|
621 | // also, appending instead of prepending keeps the |
|
|
622 | // save ordering the same between repeated load/saves. |
|
|
623 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
|
|
624 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
|
|
625 | |
|
|
626 | if (!op_inv) |
|
|
627 | { |
|
|
628 | op->inv = tmp; |
|
|
629 | tmp->above = 0; |
|
|
630 | } |
|
|
631 | else |
|
|
632 | { |
|
|
633 | while (op_inv->below) |
|
|
634 | op_inv = op_inv->below; |
|
|
635 | |
|
|
636 | op_inv->below = tmp; |
|
|
637 | tmp->above = op_inv; |
|
|
638 | } |
|
|
639 | |
|
|
640 | tmp->below = 0; |
|
|
641 | tmp->env = op; |
|
|
642 | op_inv = tmp; |
|
|
643 | } |
838 | else |
644 | else |
839 | op->move_on &= ~MOVE_WALK; |
|
|
840 | } |
|
|
841 | |
|
|
842 | break; |
|
|
843 | |
|
|
844 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
845 | case KW_walk_off: |
|
|
846 | { |
|
|
847 | if (thawer.get_sint32 ()) |
|
|
848 | op->move_off |= MOVE_WALK; |
|
|
849 | else |
|
|
850 | op->move_off &= ~MOVE_WALK; |
|
|
851 | } |
|
|
852 | break; |
|
|
853 | |
|
|
854 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
855 | case KW_fly_on: |
|
|
856 | { |
|
|
857 | if (thawer.get_sint32 ()) |
|
|
858 | op->move_on |= MOVE_FLY_LOW; |
|
|
859 | else |
|
|
860 | op->move_on &= ~MOVE_FLY_LOW; |
|
|
861 | } |
|
|
862 | break; |
|
|
863 | |
|
|
864 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
865 | case KW_fly_off: |
|
|
866 | { |
|
|
867 | if (thawer.get_sint32 ()) |
|
|
868 | op->move_off |= MOVE_FLY_LOW; |
|
|
869 | else |
|
|
870 | op->move_off &= ~MOVE_FLY_LOW; |
|
|
871 | } |
|
|
872 | break; |
|
|
873 | |
|
|
874 | //TODO: remove these after convertign archetypes |
|
|
875 | case KW_can_use_wand: |
|
|
876 | GET_FLAG (op, FLAG_USE_RANGE); |
|
|
877 | break; |
|
|
878 | |
|
|
879 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
880 | case KW_flying: |
|
|
881 | { |
|
|
882 | if (thawer.get_sint32 ()) |
|
|
883 | op->move_type |= MOVE_FLY_LOW; |
|
|
884 | else |
|
|
885 | op->move_type &= ~MOVE_FLY_LOW; |
|
|
886 | } |
|
|
887 | break; |
|
|
888 | |
|
|
889 | |
|
|
890 | case KW_identified: |
|
|
891 | GET_FLAG (op, FLAG_IDENTIFIED); |
|
|
892 | //TODO: move to check_object or so |
|
|
893 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
|
|
894 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
|
|
895 | |
|
|
896 | break; |
|
|
897 | |
|
|
898 | case KW_wiz: |
|
|
899 | GET_FLAG (op, FLAG_WIZ); |
|
|
900 | //TODO: move to check_object |
|
|
901 | if (QUERY_FLAG (op, FLAG_WIZ)) |
|
|
902 | { |
645 | { |
903 | SET_FLAG (op, FLAG_WAS_WIZ); |
646 | LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); |
904 | SET_FLAG (op, FLAG_WIZPASS); |
647 | tmp->destroy (); |
905 | SET_FLAG (op, FLAG_WIZCAST); |
648 | } |
906 | } |
649 | } |
907 | else |
650 | else |
908 | { |
651 | { |
909 | CLEAR_FLAG (op, FLAG_WIZPASS); |
652 | /* This is the actual archetype definition then */ |
910 | CLEAR_FLAG (op, FLAG_WIZCAST); |
653 | op->arch = archetype::find (str); |
|
|
654 | |
|
|
655 | if (op->arch) |
|
|
656 | { |
|
|
657 | op->arch->clone.copy_to (op); |
|
|
658 | // copy_to activates, this should be fixed properly |
|
|
659 | op->deactivate (); |
|
|
660 | } |
|
|
661 | else if (!arch_init) |
|
|
662 | /* record the name of the broken object */ |
|
|
663 | op->name = str; |
911 | } |
664 | } |
|
|
665 | } |
912 | break; |
666 | break; |
913 | |
667 | |
|
|
668 | case KW_other_arch: |
|
|
669 | op->other_arch = archetype::find (thawer.get_str ()); |
|
|
670 | break; |
|
|
671 | |
|
|
672 | case KW_animation: |
|
|
673 | { |
|
|
674 | const char *str = thawer.get_str (); |
|
|
675 | |
|
|
676 | if (!str) |
|
|
677 | { |
|
|
678 | op->animation_id = 0; |
|
|
679 | CLEAR_FLAG (op, FLAG_ANIMATE); |
|
|
680 | } |
|
|
681 | else if ((op->animation_id = find_animation (str))) |
|
|
682 | SET_FLAG (op, FLAG_ANIMATE); |
|
|
683 | } |
|
|
684 | |
|
|
685 | break; |
|
|
686 | |
|
|
687 | case KW_last_heal: thawer.get (op->last_heal); break; |
|
|
688 | case KW_last_sp: thawer.get (op->last_sp); break; |
|
|
689 | case KW_last_grace: thawer.get (op->last_grace); break; |
|
|
690 | case KW_last_eat: thawer.get (op->last_eat); break; |
|
|
691 | case KW_speed_left: thawer.get (op->speed_left); break; |
|
|
692 | |
|
|
693 | case KW_speed: |
|
|
694 | thawer.get (op->speed); |
|
|
695 | |
|
|
696 | //TODO: maybe do in check_object |
|
|
697 | // removed check for style maps |
|
|
698 | if (op->speed < 0) |
|
|
699 | op->speed_left = op->speed_left - rndm (); |
|
|
700 | |
|
|
701 | break; |
|
|
702 | |
|
|
703 | case KW_slow_move: |
|
|
704 | op->move_slow |= MOVE_WALK; |
|
|
705 | thawer.get (op->move_slow_penalty); |
|
|
706 | break; |
|
|
707 | |
|
|
708 | case KW_face: |
|
|
709 | op->face = &new_faces[FindFace (thawer.get_str (), 0)]; |
|
|
710 | break; |
|
|
711 | |
|
|
712 | case KW_x: thawer.get (op->x); break; |
|
|
713 | case KW_y: thawer.get (op->y); break; |
|
|
714 | |
|
|
715 | case KW_Str: // uppercase alias |
|
|
716 | case KW_str: thawer.get (op->stats.Str); break; |
|
|
717 | case KW_Dex: // uppercase alias |
|
|
718 | case KW_dex: thawer.get (op->stats.Dex); break; |
|
|
719 | case KW_Con: // uppercase alias |
|
|
720 | case KW_con: thawer.get (op->stats.Con); break; |
|
|
721 | case KW_Wis: // uppercase alias |
|
|
722 | case KW_wis: thawer.get (op->stats.Wis); break; |
|
|
723 | case KW_Cha: // uppercase alias |
|
|
724 | case KW_cha: thawer.get (op->stats.Cha); break; |
|
|
725 | case KW_Int: // uppercase alias |
|
|
726 | case KW_int: thawer.get (op->stats.Int); break; |
|
|
727 | case KW_Pow: // uppercase alias |
|
|
728 | case KW_pow: thawer.get (op->stats.Pow); break; |
|
|
729 | |
|
|
730 | case KW_hp: thawer.get (op->stats.hp); break; |
|
|
731 | case KW_maxhp: thawer.get (op->stats.maxhp); break; |
|
|
732 | case KW_sp: thawer.get (op->stats.sp); break; |
|
|
733 | case KW_maxsp: thawer.get (op->stats.maxsp); break; |
|
|
734 | case KW_grace: thawer.get (op->stats.grace); break; |
|
|
735 | case KW_maxgrace: thawer.get (op->stats.maxgrace); break; |
|
|
736 | |
|
|
737 | case KW_exp: thawer.get (op->stats.exp); break; |
|
|
738 | case KW_perm_exp: thawer.get (op->perm_exp); break; |
|
|
739 | case KW_food: thawer.get (op->stats.food); break; |
|
|
740 | case KW_dam: thawer.get (op->stats.dam); break; |
|
|
741 | case KW_wc: thawer.get (op->stats.wc); break; |
|
|
742 | case KW_ac: thawer.get (op->stats.ac); break; |
|
|
743 | case KW_nrof: thawer.get (op->nrof); break; |
|
|
744 | case KW_level: thawer.get (op->level); break; |
|
|
745 | case KW_direction: thawer.get (op->direction); break; |
|
|
746 | case KW_type: thawer.get (op->type); break; |
|
|
747 | case KW_subtype: thawer.get (op->subtype); break; |
|
|
748 | case KW_value: thawer.get (op->value); break; |
|
|
749 | case KW_weight: thawer.get (op->weight); break; |
|
|
750 | case KW_carrying: thawer.get (op->carrying); break; |
|
|
751 | case KW_attacktype: thawer.get (op->attacktype); break; |
|
|
752 | case KW_path_attuned: thawer.get (op->path_attuned); break; |
|
|
753 | case KW_path_repelled: thawer.get (op->path_repelled); break; |
|
|
754 | case KW_path_denied: thawer.get (op->path_denied); break; |
|
|
755 | case KW_invisible: thawer.get (op->invisible); break; |
|
|
756 | case KW_magic: thawer.get (op->magic); break; |
|
|
757 | case KW_state: thawer.get (op->state); break; |
|
|
758 | case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; |
|
|
759 | case KW_material: thawer.get (op->material); break; |
|
|
760 | case KW_materialname: thawer.get (op->materialname); break; |
|
|
761 | |
|
|
762 | /* These are the new values */ |
|
|
763 | case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; |
|
|
764 | case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; |
|
|
765 | case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; |
|
|
766 | case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; |
|
|
767 | case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; |
|
|
768 | case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; |
|
|
769 | |
|
|
770 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
771 | case KW_no_pass: |
|
|
772 | { |
|
|
773 | if (thawer.get_sint32 ()) |
|
|
774 | op->move_block = MOVE_ALL; |
|
|
775 | else |
|
|
776 | op->move_block = 0; |
|
|
777 | } |
|
|
778 | |
|
|
779 | break; |
|
|
780 | |
|
|
781 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
782 | case KW_walk_on: |
|
|
783 | { |
|
|
784 | if (thawer.get_sint32 ()) |
|
|
785 | op->move_on |= MOVE_WALK; |
|
|
786 | else |
|
|
787 | op->move_on &= ~MOVE_WALK; |
|
|
788 | } |
|
|
789 | |
|
|
790 | break; |
|
|
791 | |
|
|
792 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
793 | case KW_walk_off: |
|
|
794 | { |
|
|
795 | if (thawer.get_sint32 ()) |
|
|
796 | op->move_off |= MOVE_WALK; |
|
|
797 | else |
|
|
798 | op->move_off &= ~MOVE_WALK; |
|
|
799 | } |
|
|
800 | break; |
|
|
801 | |
|
|
802 | /* These are all legacy - any new objects should use the move_ .. values */ |
914 | case KW_friendly: |
803 | case KW_fly_on: |
|
|
804 | { |
|
|
805 | if (thawer.get_sint32 ()) |
|
|
806 | op->move_on |= MOVE_FLY_LOW; |
|
|
807 | else |
|
|
808 | op->move_on &= ~MOVE_FLY_LOW; |
|
|
809 | } |
|
|
810 | break; |
|
|
811 | |
|
|
812 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
813 | case KW_fly_off: |
|
|
814 | { |
|
|
815 | if (thawer.get_sint32 ()) |
|
|
816 | op->move_off |= MOVE_FLY_LOW; |
|
|
817 | else |
|
|
818 | op->move_off &= ~MOVE_FLY_LOW; |
|
|
819 | } |
|
|
820 | break; |
|
|
821 | |
|
|
822 | //TODO: remove these after converting archetypes |
|
|
823 | case KW_can_use_wand: |
|
|
824 | GET_FLAG (op, FLAG_USE_RANGE); |
|
|
825 | break; |
|
|
826 | |
|
|
827 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
828 | case KW_flying: |
|
|
829 | { |
|
|
830 | if (thawer.get_sint32 ()) |
|
|
831 | op->move_type |= MOVE_FLY_LOW; |
|
|
832 | else |
|
|
833 | op->move_type &= ~MOVE_FLY_LOW; |
|
|
834 | } |
|
|
835 | break; |
|
|
836 | |
|
|
837 | |
|
|
838 | case KW_identified: |
915 | GET_FLAG (op, FLAG_FRIENDLY); |
839 | GET_FLAG (op, FLAG_IDENTIFIED); |
916 | //TODO: move to check_object or so |
840 | //TODO: move to check_object or so |
917 | if (op->type != PLAYER && QUERY_FLAG (op, FLAG_FRIENDLY)) |
841 | if (QUERY_FLAG (op, FLAG_IDENTIFIED)) |
|
|
842 | CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); |
|
|
843 | |
|
|
844 | break; |
|
|
845 | |
|
|
846 | case KW_wiz: |
|
|
847 | GET_FLAG (op, FLAG_WIZ); |
|
|
848 | //TODO: move to check_object |
|
|
849 | if (QUERY_FLAG (op, FLAG_WIZ)) |
|
|
850 | { |
|
|
851 | SET_FLAG (op, FLAG_WAS_WIZ); |
|
|
852 | SET_FLAG (op, FLAG_WIZPASS); |
|
|
853 | SET_FLAG (op, FLAG_WIZCAST); |
|
|
854 | } |
|
|
855 | else |
|
|
856 | { |
|
|
857 | CLEAR_FLAG (op, FLAG_WIZPASS); |
|
|
858 | CLEAR_FLAG (op, FLAG_WIZCAST); |
|
|
859 | } |
|
|
860 | break; |
|
|
861 | |
|
|
862 | case KW_friendly: |
|
|
863 | if (thawer.get_sint32 ()) |
|
|
864 | if (op->type != PLAYER) |
918 | add_friendly_object (op); |
865 | add_friendly_object (op); |
|
|
866 | |
919 | break; |
867 | break; |
920 | |
868 | |
921 | case KW_monster: |
869 | case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; |
922 | GET_FLAG (op, FLAG_MONSTER); |
870 | case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; |
923 | break; |
871 | case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; |
924 | case KW_neutral: |
872 | case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; |
925 | GET_FLAG (op, FLAG_NEUTRAL); |
873 | case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; |
926 | break; |
874 | case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; |
927 | case KW_no_attack: |
875 | case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; |
928 | GET_FLAG (op, FLAG_NO_ATTACK); |
876 | case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; |
929 | break; |
877 | case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; |
930 | case KW_no_damage: |
878 | case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; |
931 | GET_FLAG (op, FLAG_NO_DAMAGE); |
879 | case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; |
932 | break; |
880 | case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; |
933 | case KW_generator: |
881 | case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; |
934 | GET_FLAG (op, FLAG_GENERATOR); |
882 | case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; |
935 | break; |
883 | case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; |
936 | case KW_use_content_on_gen: |
884 | case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; |
937 | GET_FLAG (op, FLAG_CONTENT_ON_GEN); |
885 | case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; |
938 | break; |
886 | case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; |
939 | case KW_is_thrown: |
887 | case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; |
940 | GET_FLAG (op, FLAG_IS_THROWN); |
888 | case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; |
941 | break; |
889 | case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; |
942 | case KW_auto_apply: |
890 | case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; |
943 | GET_FLAG (op, FLAG_AUTO_APPLY); |
891 | case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; |
944 | break; |
892 | case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; |
945 | case KW_treasure: |
893 | case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; |
946 | GET_FLAG (op, FLAG_TREASURE); |
894 | case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; |
947 | break; |
895 | case KW_scared: GET_FLAG (op, FLAG_SCARED); break; |
948 | case KW_see_invisible: |
896 | case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; |
949 | GET_FLAG (op, FLAG_SEE_INVISIBLE); |
897 | case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; |
950 | break; |
898 | case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; |
951 | case KW_can_roll: |
899 | case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; |
952 | GET_FLAG (op, FLAG_CAN_ROLL); |
900 | case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; |
953 | break; |
901 | case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
954 | case KW_overlay_floor: |
902 | case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; |
955 | GET_FLAG (op, FLAG_OVERLAY_FLOOR); |
903 | case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; |
956 | break; |
904 | case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; |
957 | case KW_is_turnable: |
905 | case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; |
958 | GET_FLAG (op, FLAG_IS_TURNABLE); |
906 | case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; |
959 | break; |
907 | case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; |
960 | case KW_is_used_up: |
908 | case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; |
961 | GET_FLAG (op, FLAG_IS_USED_UP); |
909 | case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; |
962 | break; |
910 | case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; |
963 | case KW_alive: |
911 | case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; |
964 | GET_FLAG (op, FLAG_ALIVE); |
912 | case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; |
965 | break; |
913 | case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; |
966 | case KW_applied: |
914 | case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; |
967 | GET_FLAG (op, FLAG_APPLIED); |
915 | case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; |
968 | break; |
916 | case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; |
969 | case KW_unpaid: |
917 | case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; |
970 | GET_FLAG (op, FLAG_UNPAID); |
918 | case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; |
971 | break; |
919 | case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; |
972 | case KW_is_animated: |
920 | case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; |
973 | GET_FLAG (op, FLAG_ANIMATE); |
921 | case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; |
974 | break; |
922 | case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; |
975 | case KW_no_pick: |
923 | case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; |
976 | GET_FLAG (op, FLAG_NO_PICK); |
|
|
977 | break; |
|
|
978 | case KW_reflecting: |
|
|
979 | GET_FLAG (op, FLAG_REFLECTING); |
|
|
980 | break; |
|
|
981 | case KW_changing: |
|
|
982 | GET_FLAG (op, FLAG_CHANGING); |
|
|
983 | break; |
|
|
984 | case KW_splitting: |
|
|
985 | GET_FLAG (op, FLAG_SPLITTING); |
|
|
986 | break; |
|
|
987 | case KW_hitback: |
|
|
988 | GET_FLAG (op, FLAG_HITBACK); |
|
|
989 | break; |
|
|
990 | case KW_startequip: |
|
|
991 | GET_FLAG (op, FLAG_STARTEQUIP); |
|
|
992 | break; |
|
|
993 | case KW_blocksview: |
|
|
994 | GET_FLAG (op, FLAG_BLOCKSVIEW); |
|
|
995 | break; |
|
|
996 | case KW_undead: |
|
|
997 | GET_FLAG (op, FLAG_UNDEAD); |
|
|
998 | break; |
|
|
999 | case KW_scared: |
|
|
1000 | GET_FLAG (op, FLAG_SCARED); |
|
|
1001 | break; |
|
|
1002 | case KW_unaggressive: |
|
|
1003 | GET_FLAG (op, FLAG_UNAGGRESSIVE); |
|
|
1004 | break; |
|
|
1005 | case KW_reflect_missile: |
|
|
1006 | GET_FLAG (op, FLAG_REFL_MISSILE); |
|
|
1007 | break; |
|
|
1008 | case KW_reflect_spell: |
|
|
1009 | GET_FLAG (op, FLAG_REFL_SPELL); |
|
|
1010 | break; |
|
|
1011 | case KW_no_magic: |
|
|
1012 | GET_FLAG (op, FLAG_NO_MAGIC); |
|
|
1013 | break; |
|
|
1014 | case KW_no_drop: |
|
|
1015 | GET_FLAG (op, FLAG_NO_DROP); |
|
|
1016 | break; |
|
|
1017 | case KW_random_movement: |
|
|
1018 | GET_FLAG (op, FLAG_RANDOM_MOVE); |
|
|
1019 | break; |
|
|
1020 | case KW_was_wiz: |
|
|
1021 | GET_FLAG (op, FLAG_WAS_WIZ); |
|
|
1022 | break; |
|
|
1023 | case KW_no_fix_player: |
|
|
1024 | GET_FLAG (op, FLAG_NO_FIX_PLAYER); |
|
|
1025 | break; |
|
|
1026 | case KW_is_lightable: |
|
|
1027 | GET_FLAG (op, FLAG_IS_LIGHTABLE); |
|
|
1028 | break; |
|
|
1029 | case KW_tear_down: |
|
|
1030 | GET_FLAG (op, FLAG_TEAR_DOWN); |
|
|
1031 | break; |
|
|
1032 | case KW_can_use_shield: |
|
|
1033 | GET_FLAG (op, FLAG_USE_SHIELD); |
|
|
1034 | break; |
|
|
1035 | case KW_can_cast_spell: |
|
|
1036 | GET_FLAG (op, FLAG_CAST_SPELL); |
|
|
1037 | break; |
|
|
1038 | case KW_can_use_scroll: |
|
|
1039 | GET_FLAG (op, FLAG_USE_SCROLL); |
|
|
1040 | break; |
|
|
1041 | case KW_can_use_range: |
|
|
1042 | GET_FLAG (op, FLAG_USE_RANGE); |
|
|
1043 | break; |
|
|
1044 | case KW_can_use_bow: |
|
|
1045 | GET_FLAG (op, FLAG_USE_BOW); |
|
|
1046 | break; |
|
|
1047 | case KW_can_use_armour: |
|
|
1048 | GET_FLAG (op, FLAG_USE_ARMOUR); |
|
|
1049 | break; |
|
|
1050 | case KW_can_use_weapon: |
|
|
1051 | GET_FLAG (op, FLAG_USE_WEAPON); |
|
|
1052 | break; |
|
|
1053 | case KW_can_use_ring: |
|
|
1054 | GET_FLAG (op, FLAG_USE_RING); |
|
|
1055 | break; |
|
|
1056 | case KW_has_ready_bow: |
|
|
1057 | GET_FLAG (op, FLAG_READY_BOW); |
|
|
1058 | break; |
|
|
1059 | case KW_xrays: |
|
|
1060 | GET_FLAG (op, FLAG_XRAYS); |
|
|
1061 | break; |
|
|
1062 | case KW_is_floor: |
|
|
1063 | GET_FLAG (op, FLAG_IS_FLOOR); |
|
|
1064 | break; |
|
|
1065 | case KW_lifesave: |
|
|
1066 | GET_FLAG (op, FLAG_LIFESAVE); |
|
|
1067 | break; |
|
|
1068 | case KW_no_strength: |
|
|
1069 | GET_FLAG (op, FLAG_NO_STRENGTH); |
|
|
1070 | break; |
|
|
1071 | case KW_sleep: |
|
|
1072 | GET_FLAG (op, FLAG_SLEEP); |
|
|
1073 | break; |
|
|
1074 | case KW_stand_still: |
|
|
1075 | GET_FLAG (op, FLAG_STAND_STILL); |
|
|
1076 | break; |
|
|
1077 | case KW_random_move: |
|
|
1078 | GET_FLAG (op, FLAG_RANDOM_MOVE); |
|
|
1079 | break; |
|
|
1080 | case KW_only_attack: |
|
|
1081 | GET_FLAG (op, FLAG_ONLY_ATTACK); |
|
|
1082 | break; |
|
|
1083 | case KW_activate_on_push: |
|
|
1084 | GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); |
924 | case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; |
1085 | break; |
925 | case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; |
1086 | case KW_activate_on_release: |
926 | case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; |
1087 | GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); |
927 | case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; |
1088 | break; |
928 | case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; |
1089 | case KW_confused: |
929 | case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; |
1090 | GET_FLAG (op, FLAG_CONFUSED); |
930 | case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; |
1091 | break; |
931 | case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; |
1092 | case KW_stealth: |
932 | case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; |
1093 | GET_FLAG (op, FLAG_STEALTH); |
933 | case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; |
1094 | break; |
934 | case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; |
1095 | case KW_cursed: |
935 | case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; |
1096 | GET_FLAG (op, FLAG_CURSED); |
936 | case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; |
1097 | break; |
937 | case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; |
1098 | case KW_damned: |
938 | case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; |
1099 | GET_FLAG (op, FLAG_DAMNED); |
939 | case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; |
1100 | break; |
940 | case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; |
1101 | case KW_see_anywhere: |
941 | case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; |
1102 | GET_FLAG (op, FLAG_SEE_ANYWHERE); |
942 | case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; |
1103 | break; |
943 | case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; |
1104 | case KW_known_magical: |
944 | case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; |
1105 | GET_FLAG (op, FLAG_KNOWN_MAGICAL); |
945 | case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; |
1106 | break; |
946 | case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; |
1107 | case KW_known_cursed: |
947 | case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; |
1108 | GET_FLAG (op, FLAG_KNOWN_CURSED); |
948 | case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; |
1109 | break; |
949 | case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; |
1110 | case KW_can_use_skill: |
950 | case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; |
1111 | GET_FLAG (op, FLAG_CAN_USE_SKILL); |
951 | case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; |
1112 | break; |
952 | case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; |
1113 | case KW_been_applied: |
953 | case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; |
1114 | GET_FLAG (op, FLAG_BEEN_APPLIED); |
954 | case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; |
1115 | break; |
|
|
1116 | case KW_has_ready_scroll: |
|
|
1117 | GET_FLAG (op, FLAG_READY_SCROLL); |
|
|
1118 | break; |
|
|
1119 | case KW_can_use_rod: |
|
|
1120 | GET_FLAG (op, FLAG_USE_ROD); |
|
|
1121 | break; |
|
|
1122 | case KW_can_use_horn: |
|
|
1123 | GET_FLAG (op, FLAG_USE_HORN); |
|
|
1124 | break; |
|
|
1125 | case KW_unique: |
|
|
1126 | GET_FLAG (op, FLAG_UNIQUE); |
|
|
1127 | break; |
|
|
1128 | case KW_make_invisible: |
|
|
1129 | GET_FLAG (op, FLAG_MAKE_INVIS); |
|
|
1130 | break; |
|
|
1131 | case KW_inv_locked: |
|
|
1132 | GET_FLAG (op, FLAG_INV_LOCKED); |
|
|
1133 | break; |
|
|
1134 | case KW_is_wooded: |
|
|
1135 | GET_FLAG (op, FLAG_IS_WOODED); |
|
|
1136 | break; |
|
|
1137 | case KW_is_hilly: |
|
|
1138 | GET_FLAG (op, FLAG_IS_HILLY); |
|
|
1139 | break; |
|
|
1140 | case KW_is_water: |
|
|
1141 | GET_FLAG (op, FLAG_IS_WATER); |
|
|
1142 | break; |
|
|
1143 | case KW_has_ready_skill: |
|
|
1144 | GET_FLAG (op, FLAG_READY_SKILL); |
|
|
1145 | break; |
|
|
1146 | case KW_has_ready_weapon: |
|
|
1147 | GET_FLAG (op, FLAG_READY_WEAPON); |
|
|
1148 | break; |
|
|
1149 | case KW_no_skill_ident: |
|
|
1150 | GET_FLAG (op, FLAG_NO_SKILL_IDENT); |
|
|
1151 | break; |
|
|
1152 | case KW_is_blind: |
|
|
1153 | GET_FLAG (op, FLAG_BLIND); |
|
|
1154 | break; |
|
|
1155 | case KW_can_see_in_dark: |
|
|
1156 | GET_FLAG (op, FLAG_SEE_IN_DARK); |
|
|
1157 | break; |
|
|
1158 | case KW_is_cauldron: |
|
|
1159 | GET_FLAG (op, FLAG_IS_CAULDRON); |
|
|
1160 | break; |
|
|
1161 | case KW_no_steal: |
|
|
1162 | GET_FLAG (op, FLAG_NO_STEAL); |
|
|
1163 | break; |
|
|
1164 | case KW_one_hit: |
|
|
1165 | GET_FLAG (op, FLAG_ONE_HIT); |
|
|
1166 | break; |
|
|
1167 | case KW_berserk: |
|
|
1168 | GET_FLAG (op, FLAG_BERSERK); |
|
|
1169 | break; |
|
|
1170 | case KW_is_buildable: |
|
|
1171 | GET_FLAG (op, FLAG_IS_BUILDABLE); |
|
|
1172 | break; |
|
|
1173 | |
955 | |
1174 | case KW_armour: |
|
|
1175 | thawer.get (op->resist[ATNR_PHYSICAL]); |
956 | case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1176 | break; |
|
|
1177 | case KW_resist_physical: |
|
|
1178 | thawer.get (op->resist[ATNR_PHYSICAL]); |
957 | case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; |
1179 | break; |
|
|
1180 | case KW_resist_magic: |
|
|
1181 | thawer.get (op->resist[ATNR_MAGIC]); |
958 | case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; |
1182 | break; |
959 | case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; |
1183 | case KW_resist_fire: |
|
|
1184 | thawer.get (op->resist[ATNR_FIRE]); |
|
|
1185 | break; |
|
|
1186 | case KW_resist_electricity: |
|
|
1187 | thawer.get (op->resist[ATNR_ELECTRICITY]); |
960 | case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; |
1188 | break; |
961 | case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; |
1189 | case KW_resist_cold: |
|
|
1190 | thawer.get (op->resist[ATNR_COLD]); |
|
|
1191 | break; |
|
|
1192 | case KW_resist_confusion: |
|
|
1193 | thawer.get (op->resist[ATNR_CONFUSION]); |
962 | case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; |
1194 | break; |
963 | case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; |
1195 | case KW_resist_acid: |
|
|
1196 | thawer.get (op->resist[ATNR_ACID]); |
|
|
1197 | break; |
|
|
1198 | case KW_resist_drain: |
|
|
1199 | thawer.get (op->resist[ATNR_DRAIN]); |
964 | case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; |
1200 | break; |
|
|
1201 | case KW_resist_weaponmagic: |
|
|
1202 | thawer.get (op->resist[ATNR_WEAPONMAGIC]); |
965 | case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; |
1203 | break; |
|
|
1204 | case KW_resist_ghosthit: |
|
|
1205 | thawer.get (op->resist[ATNR_GHOSTHIT]); |
966 | case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; |
1206 | break; |
|
|
1207 | case KW_resist_poison: |
|
|
1208 | thawer.get (op->resist[ATNR_POISON]); |
967 | case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; |
1209 | break; |
968 | case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; |
1210 | case KW_resist_slow: |
|
|
1211 | thawer.get (op->resist[ATNR_SLOW]); |
|
|
1212 | break; |
|
|
1213 | case KW_resist_paralyze: |
|
|
1214 | thawer.get (op->resist[ATNR_PARALYZE]); |
969 | case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; |
1215 | break; |
|
|
1216 | case KW_resist_turn_undead: |
|
|
1217 | thawer.get (op->resist[ATNR_TURN_UNDEAD]); |
970 | case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; |
1218 | break; |
971 | case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; |
1219 | case KW_resist_fear: |
972 | case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; |
1220 | thawer.get (op->resist[ATNR_FEAR]); |
|
|
1221 | break; |
|
|
1222 | case KW_resist_cancellation: |
|
|
1223 | thawer.get (op->resist[ATNR_CANCELLATION]); |
|
|
1224 | break; |
|
|
1225 | case KW_resist_deplete: |
|
|
1226 | thawer.get (op->resist[ATNR_DEPLETE]); |
973 | case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; |
1227 | break; |
|
|
1228 | case KW_resist_death: |
|
|
1229 | thawer.get (op->resist[ATNR_DEATH]); |
974 | case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; |
1230 | break; |
|
|
1231 | case KW_resist_chaos: |
|
|
1232 | thawer.get (op->resist[ATNR_CHAOS]); |
975 | case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; |
1233 | break; |
976 | case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; |
1234 | case KW_resist_counterspell: |
|
|
1235 | thawer.get (op->resist[ATNR_COUNTERSPELL]); |
|
|
1236 | break; |
|
|
1237 | case KW_resist_godpower: |
|
|
1238 | thawer.get (op->resist[ATNR_GODPOWER]); |
977 | case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; |
1239 | break; |
|
|
1240 | case KW_resist_holyword: |
|
|
1241 | thawer.get (op->resist[ATNR_HOLYWORD]); |
978 | case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; |
1242 | break; |
|
|
1243 | case KW_resist_blind: |
|
|
1244 | thawer.get (op->resist[ATNR_BLIND]); |
979 | case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; |
1245 | break; |
|
|
1246 | case KW_resist_internal: |
|
|
1247 | thawer.get (op->resist[ATNR_INTERNAL]); |
980 | case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; |
1248 | break; |
981 | case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; |
1249 | case KW_resist_life_stealing: |
|
|
1250 | thawer.get (op->resist[ATNR_LIFE_STEALING]); |
|
|
1251 | break; |
|
|
1252 | case KW_resist_disease: |
|
|
1253 | thawer.get (op->resist[ATNR_DISEASE]); |
982 | case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; |
1254 | break; |
|
|
1255 | |
983 | |
1256 | case KW_luck: |
984 | case KW_luck: thawer.get (op->stats.luck); break; |
1257 | thawer.get (op->stats.luck); |
985 | case KW_run_away: thawer.get (op->run_away); break; |
1258 | break; |
986 | case KW_pick_up: thawer.get (op->pick_up); break; |
1259 | case KW_run_away: |
987 | case KW_item_power: thawer.get (op->item_power); break; |
1260 | thawer.get (op->run_away); |
988 | case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; |
1261 | break; |
989 | case KW_anim_speed: thawer.get (op->anim_speed); break; |
1262 | case KW_pick_up: |
990 | case KW_container: thawer.get (op->weight_limit); break; |
1263 | thawer.get (op->pick_up); |
991 | case KW_will_apply: thawer.get (op->will_apply); break; |
1264 | break; |
992 | case KW_attack_movement: thawer.get (op->attack_movement); break; |
1265 | case KW_item_power: |
993 | case KW_move_state: thawer.get (op->move_status); break; |
1266 | thawer.get (op->item_power); |
994 | case KW_expmul: thawer.get (op->expmul); break; |
1267 | break; |
995 | case KW_glow_radius: thawer.get (op->glow_radius); break; |
1268 | case KW_gen_sp_armour: |
996 | case KW_weapontype: thawer.get (op->weapontype); break; |
1269 | thawer.get (op->gen_sp_armour); |
997 | case KW_tooltype: thawer.get (op->tooltype); break; |
1270 | break; |
998 | case KW_casting_time: thawer.get (op->casting_time); break; |
1271 | case KW_anim_speed: |
999 | case KW_elevation: thawer.get (op->elevation); break; |
1272 | thawer.get (op->anim_speed); |
1000 | case KW_smoothlevel: thawer.get (op->smoothlevel); break; |
1273 | break; |
1001 | case KW_client_type: thawer.get (op->client_type); break; |
1274 | case KW_container: |
1002 | case KW_duration: thawer.get (op->duration); break; |
1275 | thawer.get (op->weight_limit); |
1003 | case KW_range: thawer.get (op->range); break; |
1276 | break; |
1004 | case KW_range_modifier: thawer.get (op->range_modifier); break; |
1277 | case KW_will_apply: |
1005 | case KW_dam_modifier: thawer.get (op->dam_modifier); break; |
1278 | thawer.get (op->will_apply); |
1006 | case KW_duration_modifier: thawer.get (op->duration_modifier); break; |
1279 | break; |
|
|
1280 | case KW_attack_movement: |
|
|
1281 | thawer.get (op->attack_movement); |
|
|
1282 | break; |
|
|
1283 | case KW_move_state: |
|
|
1284 | thawer.get (op->move_status); |
|
|
1285 | break; |
|
|
1286 | case KW_expmul: |
|
|
1287 | thawer.get (op->expmul); |
|
|
1288 | break; |
|
|
1289 | case KW_glow_radius: |
|
|
1290 | thawer.get (op->glow_radius); |
|
|
1291 | break; |
|
|
1292 | case KW_weapontype: |
|
|
1293 | thawer.get (op->weapontype); |
|
|
1294 | break; |
|
|
1295 | case KW_tooltype: |
|
|
1296 | thawer.get (op->tooltype); |
|
|
1297 | break; |
|
|
1298 | case KW_casting_time: |
|
|
1299 | thawer.get (op->casting_time); |
|
|
1300 | break; |
|
|
1301 | case KW_elevation: |
|
|
1302 | thawer.get (op->elevation); |
|
|
1303 | break; |
|
|
1304 | case KW_smoothlevel: |
|
|
1305 | thawer.get (op->smoothlevel); |
|
|
1306 | break; |
|
|
1307 | case KW_client_type: |
|
|
1308 | thawer.get (op->client_type); |
|
|
1309 | break; |
|
|
1310 | case KW_duration: |
|
|
1311 | thawer.get (op->duration); |
|
|
1312 | break; |
|
|
1313 | case KW_range: |
|
|
1314 | thawer.get (op->range); |
|
|
1315 | break; |
|
|
1316 | case KW_range_modifier: |
|
|
1317 | thawer.get (op->range_modifier); |
|
|
1318 | break; |
|
|
1319 | case KW_dam_modifier: |
|
|
1320 | thawer.get (op->dam_modifier); |
|
|
1321 | break; |
|
|
1322 | case KW_duration_modifier: |
|
|
1323 | thawer.get (op->duration_modifier); |
|
|
1324 | break; |
|
|
1325 | |
1007 | |
1326 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
1008 | //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess |
1327 | //TODO: parse from other include files |
1009 | //TODO: parse from other include files |
1328 | case KW_body_range: |
1010 | case KW_body_range: thawer.get (op->body_info[0]); break; |
1329 | thawer.get (op->body_info[0]); |
1011 | case KW_body_arm: thawer.get (op->body_info[1]); break; |
1330 | break; |
1012 | case KW_body_torso: thawer.get (op->body_info[2]); break; |
1331 | case KW_body_arm: |
1013 | case KW_body_head: thawer.get (op->body_info[3]); break; |
1332 | thawer.get (op->body_info[1]); |
1014 | case KW_body_neck: thawer.get (op->body_info[4]); break; |
1333 | break; |
1015 | case KW_body_skill: thawer.get (op->body_info[5]); break; |
1334 | case KW_body_torso: |
1016 | case KW_body_finger: thawer.get (op->body_info[6]); break; |
1335 | thawer.get (op->body_info[2]); |
1017 | case KW_body_shoulder: thawer.get (op->body_info[7]); break; |
1336 | break; |
1018 | case KW_body_foot: thawer.get (op->body_info[8]); break; |
1337 | case KW_body_head: |
1019 | case KW_body_hand: thawer.get (op->body_info[9]); break; |
1338 | thawer.get (op->body_info[3]); |
1020 | case KW_body_wrist: thawer.get (op->body_info[10]); break; |
1339 | break; |
1021 | case KW_body_waist: thawer.get (op->body_info[11]); break; |
1340 | case KW_body_neck: |
|
|
1341 | thawer.get (op->body_info[4]); |
|
|
1342 | break; |
|
|
1343 | case KW_body_skill: |
|
|
1344 | thawer.get (op->body_info[5]); |
|
|
1345 | break; |
|
|
1346 | case KW_body_finger: |
|
|
1347 | thawer.get (op->body_info[6]); |
|
|
1348 | break; |
|
|
1349 | case KW_body_shoulder: |
|
|
1350 | thawer.get (op->body_info[7]); |
|
|
1351 | break; |
|
|
1352 | case KW_body_foot: |
|
|
1353 | thawer.get (op->body_info[8]); |
|
|
1354 | break; |
|
|
1355 | case KW_body_hand: |
|
|
1356 | thawer.get (op->body_info[9]); |
|
|
1357 | break; |
|
|
1358 | case KW_body_wrist: |
|
|
1359 | thawer.get (op->body_info[10]); |
|
|
1360 | break; |
|
|
1361 | case KW_body_waist: |
|
|
1362 | thawer.get (op->body_info[11]); |
|
|
1363 | break; |
|
|
1364 | case KW_can_apply: |
1022 | case KW_can_apply: |
1365 | break; |
1023 | break; |
1366 | |
1024 | |
1367 | case KW_connected: |
1025 | case KW_connected: |
1368 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1026 | add_button_link (op, op->map, thawer.get_sint32 ()); |
1369 | break; |
1027 | break; |
1370 | |
1028 | |
1371 | case KW_randomitems: |
1029 | case KW_randomitems: |
1372 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1030 | op->randomitems = find_treasurelist (thawer.get_str ()); |
1373 | break; |
1031 | break; |
1374 | |
1032 | |
1375 | case KW_msg: |
1033 | case KW_msg: |
|
|
1034 | thawer.get_ml (KW_endmsg, op->msg); |
|
|
1035 | //TODO: allow longer messages |
|
|
1036 | if (strlen (op->msg) >= HUGE_BUF) |
1376 | { |
1037 | { |
1377 | thawer.get_ml (KW_endmsg, op->msg); |
|
|
1378 | //TODO: allow longer messages |
|
|
1379 | if (strlen (op->msg) >= HUGE_BUF) |
|
|
1380 | { |
|
|
1381 | LOG (llevDebug, "\n\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
1038 | LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); |
1382 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1039 | op->msg = "ERROR, please report: string too long, winged.\n"; |
1383 | } |
|
|
1384 | } |
1040 | } |
1385 | break; |
1041 | break; |
1386 | |
1042 | |
1387 | case KW_lore: |
1043 | case KW_lore: |
1388 | { |
|
|
1389 | shstr msgbuf; |
|
|
1390 | |
|
|
1391 | thawer.get_ml (KW_endlore, op->lore); |
1044 | thawer.get_ml (KW_endlore, op->lore); |
1392 | //TODO: allow longer messages |
1045 | //TODO: allow longer messages |
1393 | /* Just print a warning so we can be reasonably safe |
1046 | /* Just print a warning so we can be reasonably safe |
1394 | * about not overflowing the buffer. |
1047 | * about not overflowing the buffer. |
1395 | */ |
1048 | */ |
1396 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1049 | if (strlen (op->lore) > (HUGE_BUF / 2)) |
1397 | LOG (llevDebug, "\n\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1050 | LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", |
1398 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1051 | HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); |
1399 | } |
|
|
1400 | break; |
1052 | break; |
1401 | |
1053 | |
1402 | case KW_editable: |
1054 | case KW_editable: |
1403 | case KW_editor_folder: |
1055 | case KW_editor_folder: |
1404 | break; |
1056 | break; |
1405 | |
1057 | |
1406 | case KW_More: // uppercase alias |
1058 | case KW_More: // uppercase alias |
1407 | case KW_more: |
1059 | case KW_more: |
1408 | /* We need to record that this is a multipart object, |
1060 | /* We need to record that this is a multipart object, |
1409 | * so the calling function can glue things back together |
1061 | * so the calling function can glue things back together |
1410 | */ |
1062 | */ |
1411 | ismore = 1; |
1063 | ismore = 1; |
1412 | break; |
1064 | break; |
1413 | |
1065 | |
1414 | case KW_end: |
1066 | case KW_end: |
1415 | check_loaded_object (op); |
1067 | check_loaded_object (op); |
1416 | |
1068 | |
1417 | if (!arch_init) |
1069 | if (!arch_init) |
1418 | op->instantiate (); |
1070 | op->instantiate (); |
1419 | |
1071 | |
1420 | return ismore ? LL_MORE : LL_NORMAL; |
1072 | return ismore ? LL_MORE : LL_NORMAL; |
1421 | |
1073 | |
1422 | case KW_EOF: |
1074 | case KW_EOF: |
1423 | return LL_EOF; |
1075 | return LL_EOF; |
1424 | |
1076 | |
1425 | case KW_ERROR: |
1077 | case KW_ERROR: |
1426 | set_ob_key_value (op, thawer.line, thawer.last_value, true); |
1078 | set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); |
1427 | //printf ("addkv(%s,%s)\n", thawer.line, thawer.get_str());//D |
1079 | //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D |
1428 | |
|
|
1429 | //TODO: skip line, ugly, factor parsing better |
|
|
1430 | if (thawer.last_value) |
|
|
1431 | thawer.line = thawer.last_value; |
|
|
1432 | |
|
|
1433 | thawer.line += strlen (thawer.line) + 1; |
|
|
1434 | |
|
|
1435 | break; |
1080 | break; |
1436 | |
1081 | |
1437 | default: |
1082 | default: |
1438 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1083 | LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); |
1439 | break; |
1084 | break; |
1440 | } |
1085 | } |
1441 | } |
1086 | } |
1442 | } |
1087 | } |
1443 | |
1088 | |
1444 | /* |
1089 | /* |
… | |
… | |
1453 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1098 | * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should |
1454 | * be reset. |
1099 | * be reset. |
1455 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1100 | * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null) |
1456 | * |
1101 | * |
1457 | */ |
1102 | */ |
1458 | |
|
|
1459 | int |
1103 | int |
1460 | load_object (object_thawer & fp, object *op, int map_flags) |
1104 | load_object (object_thawer &fp, object *op, int map_flags) |
1461 | { |
1105 | { |
|
|
1106 | coroapi::cede_every (1000); // cede once in a while |
|
|
1107 | |
1462 | return parse_object (op, fp, map_flags); |
1108 | return parse_object (op, fp, map_flags); |
1463 | } |
1109 | } |
1464 | |
|
|
1465 | |
1110 | |
1466 | /* This takes a buffer, scans it for variables, and sets those variables |
1111 | /* This takes a buffer, scans it for variables, and sets those variables |
1467 | * as appropriate in op. |
1112 | * as appropriate in op. |
1468 | * |
1113 | * |
1469 | * This function appears to be used in only 2 places - in crossedit to |
1114 | * This function appears to be used in only 2 places - in crossedit to |
1470 | * override values and in c_wiz to mutate values. |
1115 | * override values and in c_wiz to mutate values. |
1471 | */ |
1116 | */ |
1472 | int |
1117 | int |
1473 | set_variable (object *op, char *buf) |
1118 | set_variable (object *op, char *buf) |
1474 | { |
1119 | { |
1475 | return 0; |
|
|
1476 | #if 0 |
|
|
1477 | int retval; |
|
|
1478 | object_thawer thawer (0); |
1120 | object_thawer thawer (buf, (AV *)0); |
1479 | |
1121 | |
1480 | strcpy (msgbuf, ""); |
|
|
1481 | strcpy (lorebuf, ""); |
|
|
1482 | retval = parse_object (op, thawer, 0); |
1122 | return parse_object (op, thawer, 0); |
1483 | yy_switch_to_buffer (yycurbuf); |
|
|
1484 | yy_delete_buffer (yybufstate); |
|
|
1485 | yy_pop_state (); |
|
|
1486 | return retval; |
|
|
1487 | #endif |
|
|
1488 | } |
1123 | } |
1489 | |
|
|
1490 | /* This array equates the FLAG_ values with the V_ values. Use -1 to |
|
|
1491 | * put gaps in the array that should not be processed. |
|
|
1492 | * The order matches the order of the define values in 'define.h'. |
|
|
1493 | */ |
|
|
1494 | |
|
|
1495 | /* This is a list of pointers that correspond to the FLAG_.. values. |
|
|
1496 | * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then |
|
|
1497 | * the 15'th element of this array should match that name. |
|
|
1498 | * If an entry is NULL, that is a flag not to loaded/saved. |
|
|
1499 | */ |
|
|
1500 | static const char *const flag_names[NUM_FLAGS + 1] = { |
|
|
1501 | "alive", "wiz", NULL, NULL, "was_wiz", "applied", "unpaid", |
|
|
1502 | "can_use_shield", "no_pick", NULL /* walk_on */ , NULL /* no_pass */ , /* 10 */ |
|
|
1503 | "is_animated", NULL /* slow_move */ , |
|
|
1504 | NULL /* flying */ , "monster", "friendly", "generator", |
|
|
1505 | "is_thrown", "auto_apply", "treasure", "player sold", /* 20 */ |
|
|
1506 | "see_invisible", "can_roll", "overlay_floor", |
|
|
1507 | "is_turnable", NULL /* walk_off */ , NULL /* fly_on */ , |
|
|
1508 | NULL /*fly_off */ , "is_used_up", "identified", "reflecting", /* 30 */ |
|
|
1509 | "changing", "splitting", "hitback", "startequip", |
|
|
1510 | "blocksview", "undead", "scared", "unaggressive", |
|
|
1511 | "reflect_missile", "reflect_spell", /* 40 */ |
|
|
1512 | "no_magic", "no_fix_player", "is_lightable", "tear_down", |
|
|
1513 | "run_away", NULL /*pass_thru */ , NULL /*can_pass_thru */ , |
|
|
1514 | "pick_up", "unique", "no_drop", /* 50 */ |
|
|
1515 | NULL /* wizcast */ , "can_cast_spell", "can_use_scroll", "can_use_range", |
|
|
1516 | "can_use_bow", "can_use_armour", "can_use_weapon", |
|
|
1517 | "can_use_ring", "has_ready_range", "has_ready_bow", /* 60 */ |
|
|
1518 | "xrays", NULL, "is_floor", "lifesave", "no_strength", "sleep", |
|
|
1519 | "stand_still", "random_move", "only_attack", "confused", /* 70 */ |
|
|
1520 | "stealth", NULL, NULL, "cursed", "damned", |
|
|
1521 | "see_anywhere", "known_magical", "known_cursed", |
|
|
1522 | "can_use_skill", "been_applied", /* 80 */ |
|
|
1523 | "has_ready_scroll", "can_use_rod", NULL, |
|
|
1524 | "can_use_horn", "make_invisible", "inv_locked", "is_wooded", |
|
|
1525 | "is_hilly", "has_ready_skill", "has_ready_weapon", /* 90 */ |
|
|
1526 | "no_skill_ident", "is_blind", "can_see_in_dark", "is_cauldron", |
|
|
1527 | "is_dust", "no_steal", "one_hit", NULL, "berserk", "neutral", /* 100 */ |
|
|
1528 | "no_attack", "no_damage", NULL, NULL, "activate_on_push", |
|
|
1529 | "activate_on_release", "is_water", "use_content_on_gen", NULL, "is_buildable", /* 110 */ |
|
|
1530 | NULL |
|
|
1531 | }; |
|
|
1532 | |
|
|
1533 | |
1124 | |
1534 | /* |
1125 | /* |
1535 | * Initialises the array of variable-names. Needed before any |
1126 | * Initialises the array of variable-names. Needed before any |
1536 | * objects can be loaded. Called by init_library(). |
1127 | * objects can be loaded. Called by init_library(). |
1537 | */ |
1128 | */ |
… | |
… | |
1592 | } |
1183 | } |
1593 | #endif |
1184 | #endif |
1594 | |
1185 | |
1595 | // compare *op against *tmp and output differences |
1186 | // compare *op against *tmp and output differences |
1596 | void |
1187 | void |
1597 | put (object_freezer & f, object *op, object *tmp) |
1188 | put (object_freezer &f, object *op, object *tmp) |
1598 | { |
1189 | { |
|
|
1190 | static const keyword resist_save[NROFATTACKS] = { |
|
|
1191 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
|
|
1192 | # include "attackinc.h" |
|
|
1193 | # undef def |
|
|
1194 | }; |
|
|
1195 | |
|
|
1196 | /* This is a list of keywords that correspond to the FLAG_.. values. |
|
|
1197 | * This is a simple 1:1 mapping - if FLAG_FRIENDLY is 15, then |
|
|
1198 | * the 15'th element of this array should match that name. |
|
|
1199 | * If an entry is NULL, that is a flag not to loaded/saved. |
|
|
1200 | */ |
|
|
1201 | static const keyword flag_names [NUM_FLAGS] = { |
|
|
1202 | KW_alive, |
|
|
1203 | KW_wiz, |
|
|
1204 | KW_NULL, |
|
|
1205 | KW_NULL, |
|
|
1206 | KW_was_wiz, |
|
|
1207 | KW_applied, |
|
|
1208 | KW_unpaid, |
|
|
1209 | KW_can_use_shield, |
|
|
1210 | KW_no_pick, |
|
|
1211 | KW_NULL, // walk_on |
|
|
1212 | KW_NULL, // no_pass |
|
|
1213 | /* 10 */ |
|
|
1214 | KW_is_animated, |
|
|
1215 | KW_NULL, // slow_move |
|
|
1216 | KW_NULL, // flying |
|
|
1217 | KW_monster, |
|
|
1218 | KW_friendly, |
|
|
1219 | KW_generator, |
|
|
1220 | KW_is_thrown, |
|
|
1221 | KW_auto_apply, |
|
|
1222 | KW_NULL, // was KW_treasure |
|
|
1223 | KW_player_sold, |
|
|
1224 | /* 20 */ |
|
|
1225 | KW_see_invisible, |
|
|
1226 | KW_can_roll, |
|
|
1227 | KW_overlay_floor, |
|
|
1228 | KW_is_turnable, |
|
|
1229 | KW_NULL, // walk_off |
|
|
1230 | KW_NULL, // fly_on |
|
|
1231 | KW_NULL, // fly_off |
|
|
1232 | KW_is_used_up, |
|
|
1233 | KW_identified, |
|
|
1234 | KW_reflecting, |
|
|
1235 | /* 30 */ |
|
|
1236 | KW_changing, |
|
|
1237 | KW_splitting, |
|
|
1238 | KW_hitback, |
|
|
1239 | KW_startequip, |
|
|
1240 | KW_blocksview, |
|
|
1241 | KW_undead, |
|
|
1242 | KW_scared, |
|
|
1243 | KW_unaggressive, |
|
|
1244 | KW_reflect_missile, |
|
|
1245 | KW_reflect_spell, |
|
|
1246 | /* 40 */ |
|
|
1247 | KW_no_magic, |
|
|
1248 | KW_no_fix_player, |
|
|
1249 | KW_is_lightable, |
|
|
1250 | KW_tear_down, |
|
|
1251 | KW_run_away, |
|
|
1252 | KW_NULL, // pass_thru |
|
|
1253 | KW_NULL, // an_pass_thru |
|
|
1254 | KW_pick_up, |
|
|
1255 | KW_unique, |
|
|
1256 | KW_no_drop, |
|
|
1257 | /* 50 */ |
|
|
1258 | KW_NULL, // wizcast |
|
|
1259 | KW_can_cast_spell, |
|
|
1260 | KW_can_use_scroll, |
|
|
1261 | KW_can_use_range, |
|
|
1262 | KW_can_use_bow, |
|
|
1263 | KW_can_use_armour, |
|
|
1264 | KW_can_use_weapon, |
|
|
1265 | KW_can_use_ring, |
|
|
1266 | KW_has_ready_range, |
|
|
1267 | KW_has_ready_bow, |
|
|
1268 | /* 60 */ |
|
|
1269 | KW_xrays, |
|
|
1270 | KW_NULL, |
|
|
1271 | KW_is_floor, |
|
|
1272 | KW_lifesave, |
|
|
1273 | KW_no_strength, |
|
|
1274 | KW_sleep, |
|
|
1275 | KW_stand_still, |
|
|
1276 | KW_random_move, |
|
|
1277 | KW_only_attack, |
|
|
1278 | KW_confused, |
|
|
1279 | /* 70 */ |
|
|
1280 | KW_stealth, |
|
|
1281 | KW_NULL, |
|
|
1282 | KW_NULL, |
|
|
1283 | KW_cursed, |
|
|
1284 | KW_damned, |
|
|
1285 | KW_see_anywhere, |
|
|
1286 | KW_known_magical, |
|
|
1287 | KW_known_cursed, |
|
|
1288 | KW_can_use_skill, |
|
|
1289 | KW_been_applied, |
|
|
1290 | /* 80 */ |
|
|
1291 | KW_has_ready_scroll, |
|
|
1292 | KW_can_use_rod, |
|
|
1293 | KW_NULL, |
|
|
1294 | KW_can_use_horn, |
|
|
1295 | KW_make_invisible, |
|
|
1296 | KW_inv_locked, |
|
|
1297 | KW_is_wooded, |
|
|
1298 | KW_is_hilly, |
|
|
1299 | KW_has_ready_skill, |
|
|
1300 | KW_has_ready_weapon, |
|
|
1301 | /* 90 */ |
|
|
1302 | KW_no_skill_ident, |
|
|
1303 | KW_is_blind, |
|
|
1304 | KW_can_see_in_dark, |
|
|
1305 | KW_is_cauldron, |
|
|
1306 | KW_NULL, |
|
|
1307 | KW_no_steal, |
|
|
1308 | KW_one_hit, |
|
|
1309 | KW_NULL, |
|
|
1310 | KW_berserk, |
|
|
1311 | KW_neutral, |
|
|
1312 | /* 100 */ |
|
|
1313 | KW_no_attack, |
|
|
1314 | KW_no_damage, |
|
|
1315 | KW_obj_original, |
|
|
1316 | KW_NULL, |
|
|
1317 | KW_activate_on_push, |
|
|
1318 | KW_activate_on_release, |
|
|
1319 | KW_is_water, |
|
|
1320 | KW_use_content_on_gen, |
|
|
1321 | KW_NULL, |
|
|
1322 | KW_is_buildable, |
|
|
1323 | /* 110 */ |
|
|
1324 | KW_destroy_on_death, |
|
|
1325 | KW_NULL, |
|
|
1326 | }; |
|
|
1327 | |
1599 | int i; |
1328 | int i; |
1600 | |
1329 | |
1601 | /* This saves the key/value lists. We do it first so that any |
1330 | /* This saves the key/value lists. We do it first so that any |
1602 | * keys that match field names will be overwritten by the loader. |
1331 | * keys that match field names will be overwritten by the loader. |
1603 | */ |
1332 | */ |
1604 | for (key_value *my_field = op->key_values; my_field != NULL; my_field = my_field->next) |
1333 | for (key_value *my_field = op->key_values; my_field; my_field = my_field->next) |
1605 | { |
1334 | { |
1606 | /* Find the field in the opposing member. */ |
1335 | /* Find the field in the opposing member. */ |
1607 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1336 | key_value *arch_field = get_ob_key_link (tmp, my_field->key); |
1608 | |
1337 | |
1609 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1338 | /* If there's no partnering field, or it's got a different value, save our field. */ |
1610 | if (arch_field == NULL || my_field->value != arch_field->value) |
1339 | if (!arch_field || my_field->value != arch_field->value) |
1611 | f.put (my_field->key, my_field->value); |
1340 | f.put (my_field->key, my_field->value); |
1612 | } |
1341 | } |
1613 | |
1342 | |
1614 | /* We don't need to worry about the arch's extra fields - they |
1343 | /* We don't need to worry about the arch's extra fields - they |
1615 | * will get taken care of the copy_object function. |
1344 | * will get taken care of the copy_to method. |
1616 | */ |
1345 | */ |
|
|
1346 | |
|
|
1347 | { |
|
|
1348 | char uids[64]; |
|
|
1349 | snprintf (uids, sizeof (uids), "<1.%llx>", (unsigned long long)op->uuid.seq); |
|
|
1350 | f.put (KW_uuid, (const char *)uids); |
|
|
1351 | } |
1617 | |
1352 | |
1618 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1353 | #define CMP_OUT(v) if (op->v != tmp->v) f.put (KW_ ## v, op->v) |
1619 | #define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) |
1354 | #define CMP_OUT2(k,v) if (op->v != tmp->v) f.put (KW_ ## k, op->v) |
1620 | |
1355 | |
1621 | CMP_OUT (name); |
1356 | CMP_OUT (name); |
… | |
… | |
1630 | if (op->lore != tmp->lore) |
1365 | if (op->lore != tmp->lore) |
1631 | f.put (KW_lore, KW_endlore, op->lore); |
1366 | f.put (KW_lore, KW_endlore, op->lore); |
1632 | |
1367 | |
1633 | CMP_OUT (other_arch); |
1368 | CMP_OUT (other_arch); |
1634 | CMP_OUT (face); |
1369 | CMP_OUT (face); |
1635 | |
|
|
1636 | if (!op->face || !op->face->name) |
|
|
1637 | 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 |
|
|
1638 | |
1370 | |
1639 | if (op->animation_id != tmp->animation_id) |
1371 | if (op->animation_id != tmp->animation_id) |
1640 | if (op->animation_id) |
1372 | if (op->animation_id) |
1641 | { |
1373 | { |
1642 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
1374 | f.put (KW_animation, animations[GET_ANIM_ID (op)].name); |
… | |
… | |
1734 | CMP_OUT (move_on); |
1466 | CMP_OUT (move_on); |
1735 | CMP_OUT (move_off); |
1467 | CMP_OUT (move_off); |
1736 | CMP_OUT (move_slow); |
1468 | CMP_OUT (move_slow); |
1737 | CMP_OUT (move_slow_penalty); |
1469 | CMP_OUT (move_slow_penalty); |
1738 | |
1470 | |
1739 | if (!COMPARE_FLAGS (op, tmp)) |
1471 | if (op->flag != tmp->flag) |
1740 | for (i = 0; i <= NUM_FLAGS; i++) |
1472 | for (i = 0; i <= NUM_FLAGS; i++) |
1741 | if (flag_names[i] && (QUERY_FLAG (op, i) != QUERY_FLAG (tmp, i))) |
1473 | if (flag_names [i] && op->flag [i] != tmp->flag [i]) |
1742 | f.put (flag_names[i], QUERY_FLAG (op, i) ? "1" : "0"); |
1474 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1743 | |
1475 | |
1744 | /* Save body locations */ |
1476 | /* Save body locations */ |
1745 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1477 | for (i = 0; i < NUM_BODY_LOCATIONS; i++) |
1746 | if (op->body_info[i] != tmp->body_info[i]) |
1478 | if (op->body_info[i] != tmp->body_info[i]) |
1747 | f.put (body_locations[i].save_name, op->body_info[i]); |
1479 | f.put (body_locations[i].save_name, op->body_info[i]); |
… | |
… | |
1749 | |
1481 | |
1750 | /* |
1482 | /* |
1751 | * Dumps all variables in an object to a file. |
1483 | * Dumps all variables in an object to a file. |
1752 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1484 | * If bit 0 of flag is set, unpaid objects will be saved. As of now, |
1753 | * the only place this is not set is when saving the player. |
1485 | * the only place this is not set is when saving the player. |
1754 | * If bit 1 of flag is set, don't remove the object after save. As of now, |
|
|
1755 | * all of the callers are setting this. |
|
|
1756 | */ |
1486 | */ |
1757 | |
|
|
1758 | void |
1487 | void |
1759 | save_object (object_freezer & fp, object *op, int flag) |
1488 | save_object (object_freezer &fp, object *op, int flag) |
1760 | { |
1489 | { |
1761 | archetype *at; |
|
|
1762 | object *tmp, *old; |
|
|
1763 | |
|
|
1764 | /* Even if the object does have an owner, it would seem that we should |
1490 | /* Even if the object does have an owner, it would seem that we should |
1765 | * still save it. |
1491 | * still save it. |
1766 | */ |
1492 | */ |
1767 | if (op->owner) |
1493 | if (op->owner) |
1768 | return; |
1494 | return; |
1769 | |
1495 | |
1770 | /* If it is unpaid and we don't want to save those, just return. */ |
1496 | /* If it is unpaid and we don't want to save those, just return. */ |
1771 | if (!(flag & 1) && (QUERY_FLAG (op, FLAG_UNPAID))) |
1497 | if (!(flag & 1) && op->flag [FLAG_UNPAID]) |
1772 | return; |
1498 | return; |
1773 | |
1499 | |
1774 | if ((at = op->arch) == NULL) |
1500 | archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; |
1775 | at = empty_archetype; |
|
|
1776 | |
1501 | |
1777 | fp.put (KW_arch, at->name); |
1502 | fp.put (KW_arch, at->name); |
1778 | |
|
|
1779 | put (fp, op, &at->clone); |
1503 | put (fp, op, &at->clone); |
1780 | |
1504 | |
1781 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1505 | /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */ |
1782 | |
1506 | |
1783 | old = NULL; |
|
|
1784 | |
|
|
1785 | if (flag & 2) |
|
|
1786 | for (tmp = op->inv; tmp != NULL; tmp = tmp->below) |
1507 | for (object *tmp = op->inv; tmp; tmp = tmp->below) |
1787 | save_object (fp, tmp, flag); |
1508 | save_object (fp, tmp, flag); |
1788 | else |
|
|
1789 | /* Slightly different logic because tmp/op will be removed by |
|
|
1790 | * the save_object we call. So we just keep looking at op->inv |
|
|
1791 | * until there is nothing left. In theory, the variable old |
|
|
1792 | * should not be needed, as recursive loops shouldn't happen. |
|
|
1793 | */ |
|
|
1794 | while ((tmp = op->inv) != NULL) |
|
|
1795 | { |
|
|
1796 | if (old == tmp) |
|
|
1797 | { |
|
|
1798 | LOG (llevError, " Recursive loop in inventory\n"); |
|
|
1799 | break; |
|
|
1800 | } |
|
|
1801 | |
|
|
1802 | save_object (fp, tmp, flag); |
|
|
1803 | old = tmp; |
|
|
1804 | } |
|
|
1805 | |
|
|
1806 | if (!(flag & 2)) |
|
|
1807 | { |
|
|
1808 | remove_ob (op); |
|
|
1809 | free_object (op); |
|
|
1810 | } |
|
|
1811 | |
1509 | |
1812 | fp.put (op); |
1510 | fp.put (op); |
1813 | fprintf (fp, "end\n"); |
1511 | fp.put (KW_end); |
1814 | } |
1512 | } |
|
|
1513 | |