ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/common/loader.C
(Generate patch)

Comparing deliantra/server/common/loader.C (file contents):
Revision 1.58 by root, Thu Feb 15 21:07:48 2007 UTC vs.
Revision 1.59 by root, Fri Feb 16 19:43:40 2007 UTC

… …
473 } 473 }
474 } 474 }
475} 475}
476 476
477#define GET_FLAG(op,flag) \ 477#define GET_FLAG(op,flag) \
478 if (thawer.get_sint32 ()) \ 478 if (f.get_sint32 ()) \
479 SET_FLAG (op, flag); \ 479 SET_FLAG (op, flag); \
480 else \ 480 else \
481 CLEAR_FLAG (op, flag) \ 481 CLEAR_FLAG (op, flag) \
482 482
483int 483bool
484parse_object (object *op, object_thawer &thawer, int map_flags) 484object::parse_kv (object_thawer &f)
485{ 485{
486 bool ismore = 0; 486 assert (f.kw == KW_object || f.kw == KW_arch);
487
488 if (f.kw == KW_object)
489 f.get (name); // preset name from object name
490
491 f.next ();
492
487 object *op_inv = op->inv; 493 object *op_inv = inv;
488 494
489 for (;;) 495 for (;;)
490 { 496 {
491 switch (thawer.get_kv ()) 497 switch (f.kw)
492 { 498 {
493 case KW_Object: // uppercase alias
494 case KW_object:
495 thawer.get (op->name);
496
497 if (op->arch)
498 op->arch->name = op->name;
499
500 break;
501
502 case KW_uuid: 499 case KW_uuid:
503 if (const char *s = thawer.get_str ()) 500 if (const char *s = f.get_str ())
504 { 501 {
505 unsigned int version; 502 unsigned int version;
506 unsigned long long seq; 503 unsigned long long seq;
507 504
508 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 505 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
509 { 506 {
510 op->uuid.seq = seq; 507 uuid.seq = seq;
511 break; 508 break;
512 } 509 }
513 } 510 }
514 511
515 op->uuid = gen_uuid (); 512 uuid = gen_uuid ();
516 break; 513 break;
517 514
518 case KW_oid: 515 case KW_oid:
519 thawer.get (op, thawer.get_sint32 ()); 516 f.get (this, f.get_sint32 ());
520 break; 517 break;
521 518
522 case KW_name: thawer.get (op->name); break; 519 case KW_name: f.get (name); break;
523 case KW_name_pl: thawer.get (op->name_pl); break; 520 case KW_name_pl: f.get (name_pl); break;
524 case KW_title: thawer.get (op->title); break; 521 case KW_title: f.get (title); break;
525 case KW_custom_name: thawer.get (op->custom_name); break; 522 case KW_custom_name: f.get (custom_name); break;
526 523
527 case KW_attach: thawer.get_ornull (op->attach); break; 524 case KW_attach: f.get_ornull (attach); break;
528 case KW_skill: thawer.get_ornull (op->skill); break; 525 case KW_skill: f.get_ornull (skill); break;
529 case KW_race: thawer.get_ornull (op->race); break; 526 case KW_race: f.get_ornull (race); break;
530 case KW_slaying: thawer.get_ornull (op->slaying); break; 527 case KW_slaying: f.get_ornull (slaying); break;
531 528
532 case KW_arch: 529 case KW_arch:
533 { 530 {
534 const char *str = thawer.get_str ();
535
536 if (op->arch)
537 {
538 /* If op->arch has been set, then this new object
539 * must be part of the inventory. So process
540 * appropriately.
541 */
542 archetype *arch = archetype::find (str);
543
544 object *tmp;
545
546 if (arch)
547 tmp = arch_to_object (arch);
548 else
549 {
550 tmp = object::create (); 531 object *tmp = object::read (f);
551 /* record the name of the broken object */
552 //TODO: but do not log???
553 tmp->name = str;
554 }
555
556 // decativate the object we, as we are still going
557 // to read the speed value. Objects should be activated
558 // when the map, object or player is completly loaded.
559 tmp->deactivate (); 532 tmp->deactivate ();
560 533
561 parse_object (tmp, thawer, map_flags);
562
563 if (tmp->arch)
564 { 534 {
565 // was: insert_ob_in_ob (tmp, op); 535 // was: insert_ob_in_ob (tmp, op);
566 // but manually adding it can improve map loading times a lot 536 // but manually adding it can improve map loading times a lot
567 // also, appending instead of prepending keeps the 537 // also, appending instead of prepending keeps the
568 // save ordering the same between repeated load/saves. 538 // save ordering the same between repeated load/saves.
569 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 539 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
570 CLEAR_FLAG (tmp, FLAG_REMOVED); 540 CLEAR_FLAG (tmp, FLAG_REMOVED);
571 541
572 if (!op_inv) 542 if (!op_inv)
573 { 543 {
574 op->inv = tmp;
575 tmp->above = 0;
576 }
577 else
578 {
579 while (op_inv->below)
580 op_inv = op_inv->below;
581
582 op_inv->below = tmp;
583 tmp->above = op_inv;
584 }
585
586 tmp->below = 0;
587 tmp->env = op;
588 op_inv = tmp; 544 inv = tmp;
545 tmp->above = 0;
589 } 546 }
590 else 547 else
591 { 548 {
592 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 549 while (op_inv->below)
593 tmp->destroy (); 550 op_inv = op_inv->below;
551
552 op_inv->below = tmp;
553 tmp->above = op_inv;
594 } 554 }
555
556 tmp->below = 0;
557 tmp->env = this;
558 op_inv = tmp;
595 } 559 }
596 else
597 {
598 /* This is the actual archetype definition then */
599 op->arch = archetype::find (str);
600
601 if (op->arch)
602 {
603 op->arch->clone.copy_to (op);
604 // copy_to activates, this should be fixed properly
605 op->deactivate ();
606 }
607 else if (!arch_init)
608 /* record the name of the broken object */
609 op->name = str;
610 }
611 } 560 }
612 break; 561 continue;
613 562
614 case KW_other_arch: 563 case KW_other_arch:
615 op->other_arch = archetype::find (thawer.get_str ()); 564 other_arch = archetype::find (f.get_str ());
616 break; 565 break;
617 566
618 case KW_animation: 567 case KW_animation:
619 { 568 {
620 CLEAR_FLAG (op, FLAG_ANIMATE); 569 CLEAR_FLAG (this, FLAG_ANIMATE);
621 op->animation_id = 0; 570 animation_id = 0;
622 571
623 const char *str = thawer.get_str (); 572 const char *str = f.get_str ();
624 if (str && (op->animation_id = find_animation (str))) 573 if (str && (animation_id = find_animation (str)))
625 SET_FLAG (op, FLAG_ANIMATE); 574 SET_FLAG (this, FLAG_ANIMATE);
626 } 575 }
627 break; 576 break;
628 577
629 case KW_last_heal: thawer.get (op->last_heal); break; 578 case KW_last_heal: f.get (last_heal); break;
630 case KW_last_sp: thawer.get (op->last_sp); break; 579 case KW_last_sp: f.get (last_sp); break;
631 case KW_last_grace: thawer.get (op->last_grace); break; 580 case KW_last_grace: f.get (last_grace); break;
632 case KW_last_eat: thawer.get (op->last_eat); break; 581 case KW_last_eat: f.get (last_eat); break;
633 case KW_speed_left: thawer.get (op->speed_left); break; 582 case KW_speed_left: f.get (speed_left); break;
634 583
635 case KW_speed: 584 case KW_speed:
636 thawer.get (op->speed); 585 f.get (speed);
637 586
638 //TODO: maybe do in check_object 587 //TODO: maybe do in check_object
639 // removed check for style maps 588 // removed check for style maps
640 if (op->speed < 0) 589 if (speed < 0)
641 op->speed_left = op->speed_left - rndm (); 590 speed_left = speed_left - rndm ();
642 591
643 break; 592 break;
644 593
645 case KW_slow_move: 594 case KW_slow_move:
646 op->move_slow |= MOVE_WALK; 595 move_slow |= MOVE_WALK;
647 thawer.get (op->move_slow_penalty); 596 f.get (move_slow_penalty);
648 break; 597 break;
649 598
650 case KW_face: 599 case KW_face:
651 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 600 face = &new_faces[FindFace (f.get_str (), 0)];
652 break; 601 break;
653 602
654 case KW_x: thawer.get (op->x); break; 603 case KW_x: f.get (x); break;
655 case KW_y: thawer.get (op->y); break; 604 case KW_y: f.get (y); break;
656 605
657 case KW_Str: // uppercase alias 606 case KW_Str: // uppercase alias
658 case KW_str: thawer.get (op->stats.Str); break; 607 case KW_str: f.get (stats.Str); break;
659 case KW_Dex: // uppercase alias 608 case KW_Dex: // uppercase alias
660 case KW_dex: thawer.get (op->stats.Dex); break; 609 case KW_dex: f.get (stats.Dex); break;
661 case KW_Con: // uppercase alias 610 case KW_Con: // uppercase alias
662 case KW_con: thawer.get (op->stats.Con); break; 611 case KW_con: f.get (stats.Con); break;
663 case KW_Wis: // uppercase alias 612 case KW_Wis: // uppercase alias
664 case KW_wis: thawer.get (op->stats.Wis); break; 613 case KW_wis: f.get (stats.Wis); break;
665 case KW_Cha: // uppercase alias 614 case KW_Cha: // uppercase alias
666 case KW_cha: thawer.get (op->stats.Cha); break; 615 case KW_cha: f.get (stats.Cha); break;
667 case KW_Int: // uppercase alias 616 case KW_Int: // uppercase alias
668 case KW_int: thawer.get (op->stats.Int); break; 617 case KW_int: f.get (stats.Int); break;
669 case KW_Pow: // uppercase alias 618 case KW_Pow: // uppercase alias
670 case KW_pow: thawer.get (op->stats.Pow); break; 619 case KW_pow: f.get (stats.Pow); break;
671 620
672 case KW_hp: thawer.get (op->stats.hp); break; 621 case KW_hp: f.get (stats.hp); break;
673 case KW_maxhp: thawer.get (op->stats.maxhp); break; 622 case KW_maxhp: f.get (stats.maxhp); break;
674 case KW_sp: thawer.get (op->stats.sp); break; 623 case KW_sp: f.get (stats.sp); break;
675 case KW_maxsp: thawer.get (op->stats.maxsp); break; 624 case KW_maxsp: f.get (stats.maxsp); break;
676 case KW_grace: thawer.get (op->stats.grace); break; 625 case KW_grace: f.get (stats.grace); break;
677 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 626 case KW_maxgrace: f.get (stats.maxgrace); break;
678 627
679 case KW_exp: thawer.get (op->stats.exp); break; 628 case KW_exp: f.get (stats.exp); break;
680 case KW_perm_exp: thawer.get (op->perm_exp); break; 629 case KW_perm_exp: f.get (perm_exp); break;
681 case KW_food: thawer.get (op->stats.food); break; 630 case KW_food: f.get (stats.food); break;
682 case KW_dam: thawer.get (op->stats.dam); break; 631 case KW_dam: f.get (stats.dam); break;
683 case KW_wc: thawer.get (op->stats.wc); break; 632 case KW_wc: f.get (stats.wc); break;
684 case KW_ac: thawer.get (op->stats.ac); break; 633 case KW_ac: f.get (stats.ac); break;
685 case KW_nrof: thawer.get (op->nrof); break; 634 case KW_nrof: f.get (nrof); break;
686 case KW_level: thawer.get (op->level); break; 635 case KW_level: f.get (level); break;
687 case KW_direction: thawer.get (op->direction); break; 636 case KW_direction: f.get (direction); break;
688 case KW_type: thawer.get (op->type); break; 637 case KW_type: f.get (type); break;
689 case KW_subtype: thawer.get (op->subtype); break; 638 case KW_subtype: f.get (subtype); break;
690 case KW_value: thawer.get (op->value); break; 639 case KW_value: f.get (value); break;
691 case KW_weight: thawer.get (op->weight); break; 640 case KW_weight: f.get (weight); break;
692 case KW_carrying: thawer.get (op->carrying); break; 641 case KW_carrying: f.get (carrying); break;
693 case KW_attacktype: thawer.get (op->attacktype); break; 642 case KW_attacktype: f.get (attacktype); break;
694 case KW_path_attuned: thawer.get (op->path_attuned); break; 643 case KW_path_attuned: f.get (path_attuned); break;
695 case KW_path_repelled: thawer.get (op->path_repelled); break; 644 case KW_path_repelled: f.get (path_repelled); break;
696 case KW_path_denied: thawer.get (op->path_denied); break; 645 case KW_path_denied: f.get (path_denied); break;
697 case KW_invisible: thawer.get (op->invisible); break; 646 case KW_invisible: f.get (invisible); break;
698 case KW_magic: thawer.get (op->magic); break; 647 case KW_magic: f.get (magic); break;
699 case KW_state: thawer.get (op->state); break; 648 case KW_state: f.get (state); break;
700 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 649 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
701 case KW_material: thawer.get (op->materials); break; //TODO: nuke 650 case KW_material: f.get (materials); break; //TODO: nuke
702 case KW_materialname: thawer.get (op->materialname); break; 651 case KW_materialname: f.get (materialname); break;
703 652
704 /* These are the new values */ 653 /* These are the new values */
705 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 654 case KW_move_block: set_move (move_block, f.get_str ()); break;
706 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 655 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
707 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 656 case KW_move_type: set_move (move_type, f.get_str ()); break;
708 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 657 case KW_move_on: set_move (move_on, f.get_str ()); break;
709 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 658 case KW_move_off: set_move (move_off, f.get_str ()); break;
710 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 659 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
711 660
712 /* These are all legacy - any new objects should use the move_ .. values */ 661 /* These are all legacy - any new objects should use the move_ .. values */
713 case KW_no_pass: 662 case KW_no_pass:
714 { 663 {
715 if (thawer.get_sint32 ()) 664 if (f.get_sint32 ())
716 op->move_block = MOVE_ALL; 665 move_block = MOVE_ALL;
717 else 666 else
718 op->move_block = 0; 667 move_block = 0;
719 } 668 }
720 669
721 break; 670 break;
722 671
723 /* These are all legacy - any new objects should use the move_ .. values */ 672 /* These are all legacy - any new objects should use the move_ .. values */
724 case KW_walk_on: 673 case KW_walk_on:
725 { 674 {
726 if (thawer.get_sint32 ()) 675 if (f.get_sint32 ())
727 op->move_on |= MOVE_WALK; 676 move_on |= MOVE_WALK;
728 else 677 else
729 op->move_on &= ~MOVE_WALK; 678 move_on &= ~MOVE_WALK;
730 } 679 }
731 680
732 break; 681 break;
733 682
734 /* These are all legacy - any new objects should use the move_ .. values */ 683 /* These are all legacy - any new objects should use the move_ .. values */
735 case KW_walk_off: 684 case KW_walk_off:
736 { 685 {
737 if (thawer.get_sint32 ()) 686 if (f.get_sint32 ())
738 op->move_off |= MOVE_WALK; 687 move_off |= MOVE_WALK;
739 else 688 else
740 op->move_off &= ~MOVE_WALK; 689 move_off &= ~MOVE_WALK;
741 } 690 }
742 break; 691 break;
743 692
744 /* These are all legacy - any new objects should use the move_ .. values */ 693 /* These are all legacy - any new objects should use the move_ .. values */
745 case KW_fly_on: 694 case KW_fly_on:
746 { 695 {
747 if (thawer.get_sint32 ()) 696 if (f.get_sint32 ())
748 op->move_on |= MOVE_FLY_LOW; 697 move_on |= MOVE_FLY_LOW;
749 else 698 else
750 op->move_on &= ~MOVE_FLY_LOW; 699 move_on &= ~MOVE_FLY_LOW;
751 } 700 }
752 break; 701 break;
753 702
754 /* These are all legacy - any new objects should use the move_ .. values */ 703 /* These are all legacy - any new objects should use the move_ .. values */
755 case KW_fly_off: 704 case KW_fly_off:
756 { 705 {
757 if (thawer.get_sint32 ()) 706 if (f.get_sint32 ())
758 op->move_off |= MOVE_FLY_LOW; 707 move_off |= MOVE_FLY_LOW;
759 else 708 else
760 op->move_off &= ~MOVE_FLY_LOW; 709 move_off &= ~MOVE_FLY_LOW;
761 } 710 }
762 break; 711 break;
763 712
764 //TODO: remove these after converting archetypes 713 //TODO: remove these after converting archetypes
765 case KW_can_use_wand: 714 case KW_can_use_wand:
766 GET_FLAG (op, FLAG_USE_RANGE); 715 GET_FLAG (this, FLAG_USE_RANGE);
767 break; 716 break;
768 717
769 /* These are all legacy - any new objects should use the move_ .. values */ 718 /* These are all legacy - any new objects should use the move_ .. values */
770 case KW_flying: 719 case KW_flying:
771 { 720 {
772 if (thawer.get_sint32 ()) 721 if (f.get_sint32 ())
773 op->move_type |= MOVE_FLY_LOW; 722 move_type |= MOVE_FLY_LOW;
774 else 723 else
775 op->move_type &= ~MOVE_FLY_LOW; 724 move_type &= ~MOVE_FLY_LOW;
776 } 725 }
777 break; 726 break;
778 727
779 728
780 case KW_identified: 729 case KW_identified:
781 GET_FLAG (op, FLAG_IDENTIFIED); 730 GET_FLAG (this, FLAG_IDENTIFIED);
782 //TODO: move to check_object or so 731 //TODO: move to check_object or so
783 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 732 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
784 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 733 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
785 734
786 break; 735 break;
787 736
788 case KW_wiz: 737 case KW_wiz:
789 GET_FLAG (op, FLAG_WIZ); 738 GET_FLAG (this, FLAG_WIZ);
790 //TODO: move to check_object 739 //TODO: move to check_object
791 if (QUERY_FLAG (op, FLAG_WIZ)) 740 if (QUERY_FLAG (this, FLAG_WIZ))
792 { 741 {
793 SET_FLAG (op, FLAG_WAS_WIZ); 742 SET_FLAG (this, FLAG_WAS_WIZ);
794 SET_FLAG (op, FLAG_WIZPASS); 743 SET_FLAG (this, FLAG_WIZPASS);
795 SET_FLAG (op, FLAG_WIZCAST); 744 SET_FLAG (this, FLAG_WIZCAST);
796 } 745 }
797 else 746 else
798 { 747 {
799 CLEAR_FLAG (op, FLAG_WIZPASS); 748 CLEAR_FLAG (this, FLAG_WIZPASS);
800 CLEAR_FLAG (op, FLAG_WIZCAST); 749 CLEAR_FLAG (this, FLAG_WIZCAST);
801 } 750 }
802 break; 751 break;
803 752
804 case KW_friendly: 753 case KW_friendly:
805 if (thawer.get_sint32 ()) 754 if (f.get_sint32 ())
806 if (op->type != PLAYER) 755 if (type != PLAYER)
807 add_friendly_object (op); 756 add_friendly_object (this);
808 757
809 break; 758 break;
810 759
811 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 760 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
812 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 761 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
813 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 762 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
814 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 763 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
815 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; 764 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
816 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 765 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
817 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 766 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
818 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 767 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
819 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 768 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
820 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 769 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
821 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 770 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
822 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 771 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
823 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 772 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
824 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 773 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
825 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 774 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
826 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 775 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
827 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 776 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
828 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 777 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
829 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 778 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
830 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 779 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
831 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 780 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
832 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 781 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
833 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 782 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
834 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 783 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
835 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 784 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
836 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 785 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
837 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 786 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
838 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 787 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
839 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 788 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
840 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 789 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
841 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 790 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
842 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 791 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
843 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 792 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
844 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 793 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
845 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 794 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
846 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 795 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
847 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 796 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
848 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 797 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
849 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 798 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
850 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 799 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
851 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 800 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
852 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 801 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
853 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 802 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
854 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 803 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
855 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 804 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
856 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 805 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
857 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 806 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
858 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 807 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
859 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 808 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
860 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 809 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
861 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 810 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
862 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 811 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
863 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 812 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
864 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 813 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
865 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 814 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
866 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 815 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
867 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 816 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
868 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 817 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
869 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 818 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
870 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 819 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
871 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 820 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
872 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 821 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
873 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 822 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
874 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 823 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
875 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 824 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
876 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 825 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
877 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 826 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
878 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 827 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
879 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 828 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
880 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 829 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
881 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 830 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
882 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 831 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
883 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 832 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
884 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 833 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
885 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 834 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
886 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 835 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
887 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 836 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
888 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 837 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
889 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 838 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
890 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 839 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
891 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 840 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
892 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
893 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
894 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
895 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
896 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; 845 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
897 846
898 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
899 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
900 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
901 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
902 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 851 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
903 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 852 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
904 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 853 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
905 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 854 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
906 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 855 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
907 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 856 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
908 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 857 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
909 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 858 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
910 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 859 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
911 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 860 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
912 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 861 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
913 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 862 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
914 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 863 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
915 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 864 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
916 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 865 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
917 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 866 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
918 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 867 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
919 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 868 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
920 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 869 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
921 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 870 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
922 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 871 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
923 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 872 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
924 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 873 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
925 874
926 case KW_luck: thawer.get (op->stats.luck); break; 875 case KW_luck: f.get (stats.luck); break;
927 case KW_run_away: thawer.get (op->run_away); break; 876 case KW_run_away: f.get (run_away); break;
928 case KW_pick_up: thawer.get (op->pick_up); break; 877 case KW_pick_up: f.get (pick_up); break;
929 case KW_item_power: thawer.get (op->item_power); break; 878 case KW_item_power: f.get (item_power); break;
930 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 879 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
931 case KW_anim_speed: thawer.get (op->anim_speed); break; 880 case KW_anim_speed: f.get (anim_speed); break;
932 case KW_container: thawer.get (op->weight_limit); break; 881 case KW_container: f.get (weight_limit); break;
933 case KW_will_apply: thawer.get (op->will_apply); break; 882 case KW_will_apply: f.get (will_apply); break;
934 case KW_attack_movement: thawer.get (op->attack_movement); break; 883 case KW_attack_movement: f.get (attack_movement); break;
935 case KW_move_state: thawer.get (op->move_status); break; 884 case KW_move_state: f.get (move_status); break;
936 case KW_expmul: thawer.get (op->expmul); break; 885 case KW_expmul: f.get (expmul); break;
937 case KW_glow_radius: thawer.get (op->glow_radius); break; 886 case KW_glow_radius: f.get (glow_radius); break;
938 case KW_weapontype: thawer.get (op->weapontype); break; 887 case KW_weapontype: f.get (weapontype); break;
939 case KW_tooltype: thawer.get (op->tooltype); break; 888 case KW_tooltype: f.get (tooltype); break;
940 case KW_casting_time: thawer.get (op->casting_time); break; 889 case KW_casting_time: f.get (casting_time); break;
941 case KW_elevation: thawer.get (op->elevation); break; 890 case KW_elevation: f.get (elevation); break;
942 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 891 case KW_smoothlevel: f.get (smoothlevel); break;
943 case KW_client_type: thawer.get (op->client_type); break; 892 case KW_client_type: f.get (client_type); break;
944 case KW_duration: thawer.get (op->duration); break; 893 case KW_duration: f.get (duration); break;
945 case KW_range: thawer.get (op->range); break; 894 case KW_range: f.get (range); break;
946 case KW_range_modifier: thawer.get (op->range_modifier); break; 895 case KW_range_modifier: f.get (range_modifier); break;
947 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 896 case KW_dam_modifier: f.get (dam_modifier); break;
948 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 897 case KW_duration_modifier: f.get (duration_modifier); break;
949 898
950 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 899 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
951 //TODO: parse from other include files 900 //TODO: parse from other include files
952 case KW_body_range: thawer.get (op->body_info[0]); break; 901 case KW_body_range: f.get (body_info[0]); break;
953 case KW_body_arm: thawer.get (op->body_info[1]); break; 902 case KW_body_arm: f.get (body_info[1]); break;
954 case KW_body_torso: thawer.get (op->body_info[2]); break; 903 case KW_body_torso: f.get (body_info[2]); break;
955 case KW_body_head: thawer.get (op->body_info[3]); break; 904 case KW_body_head: f.get (body_info[3]); break;
956 case KW_body_neck: thawer.get (op->body_info[4]); break; 905 case KW_body_neck: f.get (body_info[4]); break;
957 case KW_body_skill: thawer.get (op->body_info[5]); break; 906 case KW_body_skill: f.get (body_info[5]); break;
958 case KW_body_finger: thawer.get (op->body_info[6]); break; 907 case KW_body_finger: f.get (body_info[6]); break;
959 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 908 case KW_body_shoulder: f.get (body_info[7]); break;
960 case KW_body_foot: thawer.get (op->body_info[8]); break; 909 case KW_body_foot: f.get (body_info[8]); break;
961 case KW_body_hand: thawer.get (op->body_info[9]); break; 910 case KW_body_hand: f.get (body_info[9]); break;
962 case KW_body_wrist: thawer.get (op->body_info[10]); break; 911 case KW_body_wrist: f.get (body_info[10]); break;
963 case KW_body_waist: thawer.get (op->body_info[11]); break; 912 case KW_body_waist: f.get (body_info[11]); break;
964 case KW_can_apply: 913 case KW_can_apply:
965 break; 914 break;
966 915
967 case KW_connected: 916 case KW_connected:
968 add_button_link (op, op->map, thawer.get_sint32 ()); 917 add_button_link (this, map, f.get_sint32 ());
969 break; 918 break;
970 919
971 case KW_randomitems: 920 case KW_randomitems:
972 op->randomitems = find_treasurelist (thawer.get_str ()); 921 randomitems = find_treasurelist (f.get_str ());
973 //if (!op->randomitems) 922 //if (!randomitems)
974 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); 923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
975 break; 924 break;
976 925
977 case KW_msg: 926 case KW_msg:
978 thawer.get_ml (KW_endmsg, op->msg); 927 f.get_ml (KW_endmsg, msg);
979 //TODO: allow longer messages 928 //TODO: allow longer messages
980 if (strlen (op->msg) >= HUGE_BUF) 929 if (strlen (msg) >= HUGE_BUF)
981 { 930 {
982 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 931 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
983 op->msg = "ERROR, please report: string too long, winged.\n"; 932 msg = "ERROR, please report: string too long, winged.\n";
984 } 933 }
985 break; 934 break;
986 935
987 case KW_lore: 936 case KW_lore:
988 thawer.get_ml (KW_endlore, op->lore); 937 f.get_ml (KW_endlore, lore);
989 //TODO: allow longer messages 938 //TODO: allow longer messages
990 /* Just print a warning so we can be reasonably safe 939 /* Just print a warning so we can be reasonably safe
991 * about not overflowing the buffer. 940 * about not overflowing the buffer.
992 */ 941 */
993 if (strlen (op->lore) > (HUGE_BUF / 2)) 942 if (strlen (lore) > (HUGE_BUF / 2))
994 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 943 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
995 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 944 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
996 break; 945 break;
997 946
998 case KW_editable: 947 case KW_editable:
999 case KW_editor_folder: 948 case KW_editor_folder:
1000 break; 949 break;
1001 950
1002 case KW_More: // uppercase alias
1003 case KW_more:
1004 /* We need to record that this is a multipart object,
1005 * so the calling function can glue things back together
1006 */
1007 ismore = 1;
1008 break;
1009
1010 case KW_end: 951 case KW_end:
1011 check_loaded_object (op); 952 check_loaded_object (this);
1012 953
1013 if (!arch_init) 954 if (!arch_init)
1014 op->instantiate (); 955 instantiate ();
1015 956
1016 return ismore ? LL_MORE : LL_NORMAL; 957 f.next ();
1017
1018 case KW_EOF:
1019 return LL_EOF; 958 return true;
1020 959
1021 case KW_ERROR: 960 case KW_ERROR:
1022 set_ob_key_value (op, thawer.kw_str, thawer.value, true); 961 set_ob_key_value (this, f.kw_str, f.value, true);
1023 //fprintf (stderr, "addkv(%s,%s)\n", thawer.kw_str, thawer.value);//D 962 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1024 break; 963 break;
1025 964
1026 default: 965 default:
1027 if (!thawer.parse_error ("object", op->name)) 966 if (!f.parse_error ("object", name))
1028 return false; 967 return false;
1029 break; 968 break;
1030 } 969 }
970
971 f.next ();
1031 } 972 }
1032} 973}
1033 974
1034/* 975object *
1035 * Loads an object from the given file-pointer. 976object::read (object_thawer &f)
1036 * Variables will be read and parsed and patched into the object
1037 * until the string "end" is reached, or the end of the file.
1038 *
1039 * bufstat is used to determine various file attributes:
1040 * LO_REPATE (0): We are reading from the same buffer as the last call.
1041 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1042 * will also be reading from this (treasure file, artifacts.)
1043 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1044 * be reset.
1045 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1046 *
1047 */
1048int
1049load_object (object_thawer &fp, object *op, int map_flags)
1050{ 977{
1051 coroapi::cede_every (1000); // cede once in a while 978 assert (f.kw == KW_arch);
1052 979
1053 return parse_object (op, fp, map_flags); 980 archetype *arch = archetype::find (f.get_str ());
981 assert (arch); //D maybe use exception handling of sorts?
982
983 object *op = object::create ();
984
985 op->arch = arch;
986 arch->clone.copy_to (op);
987 // copy_to activates, this should be fixed properly
988 op->deactivate ();
989
990 if (!op->parse_kv (f))
991 {
992 delete op;
993 return 0;
994 }
995
996 return op;
1054} 997}
1055 998
1056/* This takes a buffer, scans it for variables, and sets those variables 999/* This takes a buffer, scans it for variables, and sets those variables
1057 * as appropriate in op. 1000 * as appropriate in op.
1058 * 1001 *
… …
1060 * override values and in c_wiz to mutate values. 1003 * override values and in c_wiz to mutate values.
1061 */ 1004 */
1062int 1005int
1063set_variable (object *op, char *buf) 1006set_variable (object *op, char *buf)
1064{ 1007{
1065 object_thawer thawer (buf, (AV *)0); 1008 object_thawer f (buf, (AV *)0);
1066 1009
1067 return parse_object (op, thawer, 0); 1010 return op->parse_kv (f);
1068}
1069
1070/*
1071 * Initialises the array of variable-names. Needed before any
1072 * objects can be loaded. Called by init_library().
1073 */
1074
1075void
1076init_vars ()
1077{
1078} 1011}
1079 1012
1080/* This returns a string of the integer movement type */ 1013/* This returns a string of the integer movement type */
1081#if 0 1014#if 0
1082// unused function 1015// unused function
… …
1127 return retbuf + 1; 1060 return retbuf + 1;
1128} 1061}
1129#endif 1062#endif
1130 1063
1131// compare *op against *tmp and output differences 1064// compare *op against *tmp and output differences
1132void 1065static void
1133put (object_freezer &f, object *op, object *tmp) 1066write_diff (object_freezer &f, object *op, object *tmp)
1134{ 1067{
1135 static const keyword resist_save[NROFATTACKS] = { 1068 static const keyword resist_save[NROFATTACKS] = {
1136# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1069# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1137# include "attackinc.h" 1070# include "attackinc.h"
1138# undef def 1071# undef def
… …
1427/* 1360/*
1428 * Dumps all variables in an object to a file. 1361 * Dumps all variables in an object to a file.
1429 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1362 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1430 * the only place this is not set is when saving the player. 1363 * the only place this is not set is when saving the player.
1431 */ 1364 */
1432void 1365bool
1433save_object (object_freezer &fp, object *op, int flag) 1366object::write (object_freezer &f)
1434{ 1367{
1435 /* Even if the object does have an owner, it would seem that we should 1368 /* Even if the object does have an owner, it would seem that we should
1436 * still save it. 1369 * still save it.
1437 */ 1370 */
1438 if (op->owner) 1371 if (owner)
1439 return; 1372 return true;
1440 1373
1441 /* If it is unpaid and we don't want to save those, just return. */
1442 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1443 return;
1444
1445 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1374 archetype *at = arch ? (archetype *)arch : empty_archetype;
1446 1375
1447 fp.put (KW_arch, at->name); 1376 f.put (KW_arch, at->name);
1448 put (fp, op, &at->clone); 1377 write_diff (f, this, &at->clone);
1449 1378
1450 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1451
1452 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1379 for (object *tmp = inv; tmp; tmp = tmp->below)
1453 save_object (fp, tmp, flag); 1380 tmp->write (f);
1454 1381
1455 fp.put (op); 1382 f.put (this);
1456 fp.put (KW_end); 1383 f.put (KW_end);
1384
1385 return true;
1457} 1386}
1458 1387
1459///////////////////////////////////////////////////////////////////////////// 1388/////////////////////////////////////////////////////////////////////////////
1460 1389
1461bool load_resource_file (const char *filename) 1390bool load_resource_file (const char *filename)
1462{ 1391{
1463 object_thawer f (filename); 1392 object_thawer f (filename);
1464 1393
1465 f.next_kv (); 1394 f.next ();
1466 1395
1467 for (;;) 1396 for (;;)
1468 { 1397 {
1469 switch (f.kw) 1398 switch (f.kw)
1470 { 1399 {
1471 case KW_region: 1400 case KW_region:
1472 if (!region::load (f)) 1401 if (!region::read (f))
1473 return false; 1402 return false;
1474 break; 1403 break;
1475 1404
1476 case KW_EOF: 1405 case KW_EOF:
1477 return true; 1406 return true;
… …
1479 default: 1408 default:
1480 if (!f.parse_error ("resource file")) 1409 if (!f.parse_error ("resource file"))
1481 return false; 1410 return false;
1482 } 1411 }
1483 1412
1484 f.next_kv (); 1413 f.next ();
1485 } 1414 }
1486} 1415}
1487 1416

Diff Legend

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