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.57 by root, Sat Feb 10 01:52:25 2007 UTC vs.
Revision 1.77 by root, Mon May 7 04:21:09 2007 UTC

1/* 1/*
2 * CrossFire, A Multiplayer game for X-windows 2 * CrossFire, A Multiplayer game
3 * 3 *
4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team 4 * Copyright (C) 2005, 2006, 2007 Marc Lehmann & Crossfire+ Development Team
5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team 5 * Copyright (C) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (C) 1992 Frank Tore Johansen 6 * Copyright (C) 1992 Frank Tore Johansen
7 * 7 *
… …
29#include <global.h> 29#include <global.h>
30#include <loader.h> 30#include <loader.h>
31#include <sproto.h> 31#include <sproto.h>
32 32
33///////////////////////////////////////////////////////////////////////////// 33/////////////////////////////////////////////////////////////////////////////
34
35loader_base::~loader_base ()
36{
37}
38
39// the base class warns about and skips everything
40archetype *
41loader_base::get_arch (const char *name)
42{
43 LOG (llevError, "%s: found archetype definition '%s', which is not allowed in files of this type.\n",
44 filename, name);
45
46 return new archetype;
47}
48
49object *
50loader_base::get_object (const char *name)
51{
52 LOG (llevError, "%s: found object definition '%s', which is not allowed in files of this type.\n",
53 filename, name);
54
55 return object::create ();
56}
57
58player *
59loader_base::get_player ()
60{
61 LOG (llevError, "%s: found player definition, which is not allowed in files of this type.\n",
62 filename);
63
64 return player::create ();
65}
66
67region *
68loader_base::get_region (const char *name)
69{
70 LOG (llevError, "%s: found region definition '%s', which is not allowed in files of this type.\n",
71 filename, name);
72
73 return new region;
74}
75
76facetile *
77loader_base::get_face (const char *name)
78{
79 LOG (llevError, "%s: found face definition '%s', which is not allowed in files of this type.\n",
80 filename, name);
81
82 return new facetile;
83}
84
85treasurelist *
86loader_base::get_treasure (const char *name, bool one)
87{
88 LOG (llevError, "%s: found treasure definition '%s', which is not allowed in files of this type.\n",
89 filename, name);
90
91 return new treasurelist;//D
92}
93
94animation *
95loader_base::get_animation (const char *name)
96{
97 LOG (llevError, "%s: found animation definition '%s', which is not allowed in files of this type.\n",
98 filename, name);
99
100 return new animation;
101}
102
103void
104loader_base::put_arch (archetype *arch)
105{
106 delete arch;
107}
108
109void
110loader_base::put_object (object *op)
111{
112 op->destroy ();
113}
114
115void
116loader_base::put_player (player *pl)
117{
118 delete pl;
119}
120
121void
122loader_base::put_region (region *region)
123{
124 delete region;
125}
126
127void
128loader_base::put_face (facetile *face)
129{
130 delete face;
131}
132
133void
134loader_base::put_treasure (treasurelist *treasure)
135{
136 delete treasure;
137}
138
139void
140loader_base::put_animation (animation *anim)
141{
142 delete anim;
143}
144
145/////////////////////////////////////////////////////////////////////////////
146
147bool loader_base::parse (object_thawer &thawer)
148{
149 for (;;)
150 {
151 keyword kw = thawer.get_kv ();
152
153 switch (kw)
154 {
155 case KW_region:
156 {
157 region *rgn = get_region (thawer.get_str ());
158
159 if (!parse_region (thawer, rgn))
160 {
161 delete rgn;
162 return false;
163 }
164
165 put_region (rgn);
166 }
167 break;
168
169 case KW_EOF:
170 return true;
171
172 default:
173 if (!thawer.parse_error (kw, "resource file"))
174 return false;
175 }
176 }
177}
178
179bool loader_base::load (const char *filename)
180{
181 this->filename = filename;
182
183 object_thawer fp (filename);
184
185 if (!fp)
186 return false;
187
188 return parse (fp);
189}
190
191/////////////////////////////////////////////////////////////////////////////
192
193/* Maps the MOVE_* values to names */
194static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
195 34
196/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
197 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
198 * to go through every mapping looking for every potion, rod, wand, etc 37 * to go through every mapping looking for every potion, rod, wand, etc
199 * that had a sp set and update to the new value. So this maps the 38 * that had a sp set and update to the new value. So this maps the
… …
411 "spell_cause_rabies", /* 204 */ 250 "spell_cause_rabies", /* 204 */
412 "spell_glyph", /* 205 */ 251 "spell_glyph", /* 205 */
413 NULL 252 NULL
414}; 253};
415 254
416extern int arch_init; 255extern bool loading_arch;
417 256
418/* This function checks the object after it has been loaded (when we 257/* This function checks the object after it has been loaded (when we
419 * get the 'end' in the input stream). This function can be used to 258 * get the 'end' in the input stream). This function can be used to
420 * deal with legacy objects where fields may have changed. It can also be used 259 * deal with legacy objects where fields may have changed. It can also be used
421 * to check for objects to make sure there are no common errors. 260 * to check for objects to make sure there are no common errors.
… …
450 /* only do these when program is first run - a bit 289 /* only do these when program is first run - a bit
451 * excessive to do this at every run - most of this is 290 * excessive to do this at every run - most of this is
452 * really just to catch any errors - program will still run, but 291 * really just to catch any errors - program will still run, but
453 * not in the ideal fashion. 292 * not in the ideal fashion.
454 */ 293 */
455 if ((op->type == WEAPON || op->type == BOW) && arch_init) 294 if ((op->type == WEAPON || op->type == BOW) && loading_arch)
456 { 295 {
457 if (!op->skill) 296 if (!op->skill)
458 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
459 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 298 else if ((!strcmp (op->skill, "one handed weapons") && op->slot[1].info != -1) ||
460 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 299 (!strcmp (op->skill, "two handed weapons") && op->slot[1].info != -2))
461 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 300 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->slot[1].info, &op->skill);
462 } 301 }
463 302
464 /* We changed last_heal to gen_sp_armour, which is what it 303 /* We changed last_heal to gen_sp_armour, which is what it
465 * really does for many objects. Need to catch any in maps 304 * really does for many objects. Need to catch any in maps
466 * that may have an old value. 305 * that may have an old value.
… …
501 } 340 }
502 341
503 /* Old spellcasting object - need to load in the appropiate object */ 342 /* Old spellcasting object - need to load in the appropiate object */
504 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 343 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
505 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 344 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
506 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 345 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !loading_arch)
507 { 346 {
508 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 347 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
509 * in that spell was stored in sp. 348 * in that spell was stored in sp.
510 */ 349 */
511 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 350 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
512 insert_ob_in_ob (tmp, op); 351 insert_ob_in_ob (tmp, op);
513 op->randomitems = NULL; /* So another spell isn't created for this object */ 352 op->randomitems = NULL; /* So another spell isn't created for this object */
514 } 353 }
515 354
516 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 355 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
517 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 356 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !loading_arch)
518 { 357 {
519 object *tmp = get_archetype_by_object_name (op->slaying); 358 object *tmp = get_archetype_by_object_name (op->slaying);
520 insert_ob_in_ob (tmp, op); 359 insert_ob_in_ob (tmp, op);
521 op->randomitems = NULL; /* So another spell isn't created for this object */ 360 op->randomitems = NULL; /* So another spell isn't created for this object */
522 /* without this, value is all screwed up */ 361 /* without this, value is all screwed up */
… …
567 } 406 }
568 407
569} 408}
570 409
571static void 410static void
572set_move (MoveType & mt, const char *str) 411set_move (MoveType &mt, const char *str)
573{ 412{
413 static const struct flagstr {
414 const char *name;
415 MoveType flags;
416 } move_flags[] = {
417 { "walk" , MOVE_WALK },
418 { "flying" , MOVE_FLY_LOW | MOVE_FLY_HIGH },
419 { "fly_low" , MOVE_FLY_LOW },
420 { "fly_high", MOVE_FLY_HIGH },
421 { "swim" , MOVE_SWIM },
422 { "boat" , MOVE_BOAT },
423 { "ship" , MOVE_SHIP },
424 { "all" , MOVE_ALL },
425 };
426
574 if (!str) 427 if (!str)
575 { 428 {
576 mt = 0; 429 mt = 0;
577 return; 430 return;
578 } 431 }
… …
585 438
586 mt = 0; 439 mt = 0;
587 440
588 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 441 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
589 { 442 {
590 if (!strcasecmp (str, "all")) 443 bool negate = 0;
591 mt |= MOVE_ALL; 444
592 else 445 if (*str == '-')
593 { 446 {
594 int i, negate = 0; 447 negate = 1;
448 str++;
449 }
595 450
596 if (*str == '-') 451 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
452 {
453 if (!strcmp (f->name, str))
597 { 454 {
598 negate = 1;
599 str++;
600 }
601
602 for (i = 0; move_name[i]; i++)
603 {
604 if (!strcasecmp (move_name[i], str))
605 {
606 if (negate) 455 if (negate)
607 mt &= ~(1 << i); 456 mt &= ~f->flags;
608 else
609 mt |= (1 << i);
610
611 break;
612 }
613 }
614
615 if (!move_name[i])
616 {
617 /* fly is a special case - covers both fly_low and
618 * fly_high - since it doesn't match to a specific
619 * single bit, have to special case it.
620 */
621 if (!strcasecmp (str, "flying"))
622 {
623 if (negate)
624 mt &= ~MOVE_FLYING;
625 else
626 mt |= MOVE_FLYING;
627 }
628 else 457 else
629 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str); 458 mt |= f->flags;
459
460 goto next;
630 } 461 }
631 } 462 }
463
464 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
465
466next: ;
632 } 467 }
633} 468}
634 469
635#define GET_FLAG(op,flag) \ 470#define GET_FLAG(op,flag) \
636 if (thawer.get_sint32 ()) \ 471 if (f.get_sint32 ()) \
637 SET_FLAG (op, flag); \ 472 SET_FLAG (op, flag); \
638 else \ 473 else \
639 CLEAR_FLAG (op, flag) \ 474 CLEAR_FLAG (op, flag) \
640 475
641int 476bool
642parse_object (object *op, object_thawer &thawer, int map_flags) 477object::parse_kv (object_thawer &f)
643{ 478{
644 bool ismore = 0;
645 object *op_inv = op->inv; 479 object *op_inv = inv;
646 480
647 for (;;) 481 for (;;)
648 { 482 {
649 keyword kw = thawer.get_kv ();
650
651 switch (kw) 483 switch (f.kw)
652 { 484 {
653 case KW_Object: // uppercase alias
654 case KW_object:
655 thawer.get (op->name);
656
657 if (op->arch)
658 op->arch->name = op->name;
659
660 break;
661
662 case KW_uuid: 485 case KW_uuid:
663 if (const char *s = thawer.get_str ()) 486 if (const char *s = f.get_str ())
664 { 487 {
665 unsigned int version; 488 unsigned int version;
666 unsigned long long seq; 489 unsigned long long seq;
667 490
668 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 491 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
669 { 492 {
670 op->uuid.seq = seq; 493 uuid.seq = seq;
671 break; 494 break;
672 } 495 }
673 } 496 }
674 497
675 op->uuid = gen_uuid (); 498 uuid = gen_uuid ();
676 break; 499 break;
677 500
678 case KW_oid: 501 case KW_oid:
679 thawer.get (op, thawer.get_sint32 ()); 502 f.get (this, f.get_sint32 ());
680 break; 503 break;
681 504
682 case KW_name: thawer.get (op->name); break; 505 case KW_name: f.get (name); break;
683 case KW_name_pl: thawer.get (op->name_pl); break; 506 case KW_name_pl: f.get (name_pl); break;
684 case KW_title: thawer.get (op->title); break; 507 case KW_title: f.get (title); break;
685 case KW_custom_name: thawer.get (op->custom_name); break; 508 case KW_custom_name: f.get (custom_name); break;
686 509
687 case KW_attach: thawer.get_ornull (op->attach); break; 510 case KW_attach: f.get_ornull (attach); break;
688 case KW_skill: thawer.get_ornull (op->skill); break; 511 case KW_skill: f.get_ornull (skill); break;
689 case KW_race: thawer.get_ornull (op->race); break; 512 case KW_race: f.get_ornull (race); break;
690 case KW_slaying: thawer.get_ornull (op->slaying); break; 513 case KW_slaying: f.get_ornull (slaying); break;
691 514
692 case KW_arch: 515 case KW_arch:
693 { 516 {
694 const char *str = thawer.get_str ();
695
696 if (op->arch)
697 {
698 /* If op->arch has been set, then this new object
699 * must be part of the inventory. So process
700 * appropriately.
701 */
702 archetype *arch = archetype::find (str);
703
704 object *tmp;
705
706 if (arch)
707 tmp = arch_to_object (arch);
708 else
709 {
710 tmp = object::create (); 517 object *tmp = object::read (f);
711 /* record the name of the broken object */
712 //TODO: but do not log???
713 tmp->name = str;
714 }
715
716 // decativate the object we, as we are still going
717 // to read the speed value. Objects should be activated
718 // when the map, object or player is completly loaded.
719 tmp->deactivate (); 518 tmp->deactivate ();
720 519
721 parse_object (tmp, thawer, map_flags);
722
723 if (tmp->arch)
724 { 520 {
725 // was: insert_ob_in_ob (tmp, op); 521 // was: insert_ob_in_ob (tmp, op);
726 // but manually adding it can improve map loading times a lot 522 // but manually adding it can improve map loading times a lot
727 // also, appending instead of prepending keeps the 523 // also, appending instead of prepending keeps the
728 // save ordering the same between repeated load/saves. 524 // save ordering the same between repeated load/saves.
729 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 525 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
730 CLEAR_FLAG (tmp, FLAG_REMOVED); 526 CLEAR_FLAG (tmp, FLAG_REMOVED);
731 527
732 if (!op_inv) 528 if (!op_inv)
733 { 529 {
734 op->inv = tmp;
735 tmp->above = 0;
736 }
737 else
738 {
739 while (op_inv->below)
740 op_inv = op_inv->below;
741
742 op_inv->below = tmp;
743 tmp->above = op_inv;
744 }
745
746 tmp->below = 0;
747 tmp->env = op;
748 op_inv = tmp; 530 inv = tmp;
531 tmp->above = 0;
749 } 532 }
750 else 533 else
751 { 534 {
752 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 535 while (op_inv->below)
753 tmp->destroy (); 536 op_inv = op_inv->below;
537
538 op_inv->below = tmp;
539 tmp->above = op_inv;
754 } 540 }
541
542 tmp->below = 0;
543 tmp->env = this;
544 op_inv = tmp;
755 } 545 }
756 else
757 {
758 /* This is the actual archetype definition then */
759 op->arch = archetype::find (str);
760
761 if (op->arch)
762 {
763 op->arch->clone.copy_to (op);
764 // copy_to activates, this should be fixed properly
765 op->deactivate ();
766 }
767 else if (!arch_init)
768 /* record the name of the broken object */
769 op->name = str;
770 }
771 } 546 }
772 break; 547 continue;
773 548
774 case KW_other_arch: 549 case KW_other_arch:
550 other_arch =
551 loading_arch
552 ? archetype::get (f.get_str ())
775 op->other_arch = archetype::find (thawer.get_str ()); 553 : archetype::find (f.get_str ());
554
555 if (!other_arch)
556 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
776 break; 557 break;
777 558
778 case KW_animation: 559 case KW_animation:
779 { 560 {
780 CLEAR_FLAG (op, FLAG_ANIMATE); 561 CLEAR_FLAG (this, FLAG_ANIMATE);
781 op->animation_id = 0; 562 animation_id = 0;
782 563
783 const char *str = thawer.get_str (); 564 const char *str = f.get_str ();
784 if (str && (op->animation_id = find_animation (str))) 565 if (str && (animation_id = find_animation (str)))
785 SET_FLAG (op, FLAG_ANIMATE); 566 SET_FLAG (this, FLAG_ANIMATE);
786 } 567 }
787 break; 568 break;
788 569
789 case KW_last_heal: thawer.get (op->last_heal); break; 570 case KW_last_heal: f.get (last_heal); break;
790 case KW_last_sp: thawer.get (op->last_sp); break; 571 case KW_last_sp: f.get (last_sp); break;
791 case KW_last_grace: thawer.get (op->last_grace); break; 572 case KW_last_grace: f.get (last_grace); break;
792 case KW_last_eat: thawer.get (op->last_eat); break; 573 case KW_last_eat: f.get (last_eat); break;
793 case KW_speed_left: thawer.get (op->speed_left); break; 574 case KW_speed_left: f.get (speed_left); break;
794 575
795 case KW_speed: 576 case KW_speed:
796 thawer.get (op->speed); 577 f.get (speed);
797 578
798 //TODO: maybe do in check_object 579 //TODO: maybe do in check_object
799 // removed check for style maps 580 // removed check for style maps
800 if (op->speed < 0) 581 if (speed < 0)
801 op->speed_left = op->speed_left - rndm (); 582 speed_left = speed_left - rndm ();
802 583
803 break; 584 break;
804 585
805 case KW_slow_move: 586 case KW_slow_move:
806 op->move_slow |= MOVE_WALK; 587 move_slow |= MOVE_WALK;
807 thawer.get (op->move_slow_penalty); 588 f.get (move_slow_penalty);
808 break; 589 break;
809 590
810 case KW_face: 591 case KW_face:
811 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 592 face = face_find (f.get_str ());
812 break; 593 break;
813 594
814 case KW_x: thawer.get (op->x); break; 595 case KW_x: f.get (x); break;
815 case KW_y: thawer.get (op->y); break; 596 case KW_y: f.get (y); break;
816 597
817 case KW_Str: // uppercase alias 598 case KW_Str: // uppercase alias
818 case KW_str: thawer.get (op->stats.Str); break; 599 case KW_str: f.get (stats.Str); break;
819 case KW_Dex: // uppercase alias 600 case KW_Dex: // uppercase alias
820 case KW_dex: thawer.get (op->stats.Dex); break; 601 case KW_dex: f.get (stats.Dex); break;
821 case KW_Con: // uppercase alias 602 case KW_Con: // uppercase alias
822 case KW_con: thawer.get (op->stats.Con); break; 603 case KW_con: f.get (stats.Con); break;
823 case KW_Wis: // uppercase alias 604 case KW_Wis: // uppercase alias
824 case KW_wis: thawer.get (op->stats.Wis); break; 605 case KW_wis: f.get (stats.Wis); break;
825 case KW_Cha: // uppercase alias 606 case KW_Cha: // uppercase alias
826 case KW_cha: thawer.get (op->stats.Cha); break; 607 case KW_cha: f.get (stats.Cha); break;
827 case KW_Int: // uppercase alias 608 case KW_Int: // uppercase alias
828 case KW_int: thawer.get (op->stats.Int); break; 609 case KW_int: f.get (stats.Int); break;
829 case KW_Pow: // uppercase alias 610 case KW_Pow: // uppercase alias
830 case KW_pow: thawer.get (op->stats.Pow); break; 611 case KW_pow: f.get (stats.Pow); break;
831 612
832 case KW_hp: thawer.get (op->stats.hp); break; 613 case KW_hp: f.get (stats.hp); break;
833 case KW_maxhp: thawer.get (op->stats.maxhp); break; 614 case KW_maxhp: f.get (stats.maxhp); break;
834 case KW_sp: thawer.get (op->stats.sp); break; 615 case KW_sp: f.get (stats.sp); break;
835 case KW_maxsp: thawer.get (op->stats.maxsp); break; 616 case KW_maxsp: f.get (stats.maxsp); break;
836 case KW_grace: thawer.get (op->stats.grace); break; 617 case KW_grace: f.get (stats.grace); break;
837 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 618 case KW_maxgrace: f.get (stats.maxgrace); break;
838 619
839 case KW_exp: thawer.get (op->stats.exp); break; 620 case KW_exp: f.get (stats.exp); break;
840 case KW_perm_exp: thawer.get (op->perm_exp); break; 621 case KW_perm_exp: f.get (perm_exp); break;
841 case KW_food: thawer.get (op->stats.food); break; 622 case KW_food: f.get (stats.food); break;
842 case KW_dam: thawer.get (op->stats.dam); break; 623 case KW_dam: f.get (stats.dam); break;
843 case KW_wc: thawer.get (op->stats.wc); break; 624 case KW_wc: f.get (stats.wc); break;
844 case KW_ac: thawer.get (op->stats.ac); break; 625 case KW_ac: f.get (stats.ac); break;
845 case KW_nrof: thawer.get (op->nrof); break; 626 case KW_nrof: f.get (nrof); break;
846 case KW_level: thawer.get (op->level); break; 627 case KW_level: f.get (level); break;
847 case KW_direction: thawer.get (op->direction); break; 628 case KW_direction: f.get (direction); break;
848 case KW_type: thawer.get (op->type); break; 629 case KW_type: f.get (type); break;
849 case KW_subtype: thawer.get (op->subtype); break; 630 case KW_subtype: f.get (subtype); break;
850 case KW_value: thawer.get (op->value); break; 631 case KW_value: f.get (value); break;
851 case KW_weight: thawer.get (op->weight); break; 632 case KW_weight: f.get (weight); break;
852 case KW_carrying: thawer.get (op->carrying); break; 633 case KW_carrying: f.get (carrying); break;
853 case KW_attacktype: thawer.get (op->attacktype); break; 634 case KW_attacktype: f.get (attacktype); break;
854 case KW_path_attuned: thawer.get (op->path_attuned); break; 635 case KW_path_attuned: f.get (path_attuned); break;
855 case KW_path_repelled: thawer.get (op->path_repelled); break; 636 case KW_path_repelled: f.get (path_repelled); break;
856 case KW_path_denied: thawer.get (op->path_denied); break; 637 case KW_path_denied: f.get (path_denied); break;
857 case KW_invisible: thawer.get (op->invisible); break; 638 case KW_invisible: f.get (invisible); break;
858 case KW_magic: thawer.get (op->magic); break; 639 case KW_magic: f.get (magic); break;
859 case KW_state: thawer.get (op->state); break; 640 case KW_state: f.get (state); break;
860 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 641 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
861 case KW_material: thawer.get (op->materials); break; //TODO: nuke 642 case KW_material: f.get (materials); break; //TODO: nuke
862 case KW_materialname: thawer.get (op->materialname); break; 643 case KW_materialname: f.get (materialname); break;
863 644
864 /* These are the new values */ 645 /* These are the new values */
865 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 646 case KW_move_block: set_move (move_block, f.get_str ()); break;
866 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 647 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
867 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 648 case KW_move_type: set_move (move_type, f.get_str ()); break;
868 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 649 case KW_move_on: set_move (move_on, f.get_str ()); break;
869 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 650 case KW_move_off: set_move (move_off, f.get_str ()); break;
870 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 651 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
871 652
872 /* These are all legacy - any new objects should use the move_ .. values */ 653 /* These are all legacy - any new objects should use the move_ .. values */
873 case KW_no_pass: 654 case KW_no_pass:
874 { 655 {
875 if (thawer.get_sint32 ()) 656 if (f.get_sint32 ())
876 op->move_block = MOVE_ALL; 657 move_block = MOVE_ALL;
877 else 658 else
878 op->move_block = 0; 659 move_block = 0;
879 } 660 }
880 661
881 break; 662 break;
882 663
883 /* These are all legacy - any new objects should use the move_ .. values */ 664 /* These are all legacy - any new objects should use the move_ .. values */
884 case KW_walk_on: 665 case KW_walk_on:
885 { 666 {
886 if (thawer.get_sint32 ()) 667 if (f.get_sint32 ())
887 op->move_on |= MOVE_WALK; 668 move_on |= MOVE_WALK;
888 else 669 else
889 op->move_on &= ~MOVE_WALK; 670 move_on &= ~MOVE_WALK;
890 } 671 }
891 672
892 break; 673 break;
893 674
894 /* These are all legacy - any new objects should use the move_ .. values */ 675 /* These are all legacy - any new objects should use the move_ .. values */
895 case KW_walk_off: 676 case KW_walk_off:
896 { 677 {
897 if (thawer.get_sint32 ()) 678 if (f.get_sint32 ())
898 op->move_off |= MOVE_WALK; 679 move_off |= MOVE_WALK;
899 else 680 else
900 op->move_off &= ~MOVE_WALK; 681 move_off &= ~MOVE_WALK;
901 } 682 }
902 break; 683 break;
903 684
904 /* These are all legacy - any new objects should use the move_ .. values */ 685 /* These are all legacy - any new objects should use the move_ .. values */
905 case KW_fly_on: 686 case KW_fly_on:
906 { 687 {
907 if (thawer.get_sint32 ()) 688 if (f.get_sint32 ())
908 op->move_on |= MOVE_FLY_LOW; 689 move_on |= MOVE_FLY_LOW;
909 else 690 else
910 op->move_on &= ~MOVE_FLY_LOW; 691 move_on &= ~MOVE_FLY_LOW;
911 } 692 }
912 break; 693 break;
913 694
914 /* These are all legacy - any new objects should use the move_ .. values */ 695 /* These are all legacy - any new objects should use the move_ .. values */
915 case KW_fly_off: 696 case KW_fly_off:
916 { 697 {
917 if (thawer.get_sint32 ()) 698 if (f.get_sint32 ())
918 op->move_off |= MOVE_FLY_LOW; 699 move_off |= MOVE_FLY_LOW;
919 else 700 else
920 op->move_off &= ~MOVE_FLY_LOW; 701 move_off &= ~MOVE_FLY_LOW;
921 } 702 }
922 break; 703 break;
923 704
924 //TODO: remove these after converting archetypes 705 //TODO: remove these after converting archetypes
925 case KW_can_use_wand: 706 case KW_can_use_wand:
926 GET_FLAG (op, FLAG_USE_RANGE); 707 GET_FLAG (this, FLAG_USE_RANGE);
927 break; 708 break;
928 709
929 /* These are all legacy - any new objects should use the move_ .. values */ 710 /* These are all legacy - any new objects should use the move_ .. values */
930 case KW_flying: 711 case KW_flying:
931 { 712 {
932 if (thawer.get_sint32 ()) 713 if (f.get_sint32 ())
933 op->move_type |= MOVE_FLY_LOW; 714 move_type |= MOVE_FLY_LOW;
934 else 715 else
935 op->move_type &= ~MOVE_FLY_LOW; 716 move_type &= ~MOVE_FLY_LOW;
936 } 717 }
937 break; 718 break;
938 719
939 720
940 case KW_identified: 721 case KW_identified:
941 GET_FLAG (op, FLAG_IDENTIFIED); 722 GET_FLAG (this, FLAG_IDENTIFIED);
942 //TODO: move to check_object or so 723 //TODO: move to check_object or so
943 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 724 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
944 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 725 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
945 726
946 break; 727 break;
947 728
948 case KW_wiz: 729 case KW_wiz:
949 GET_FLAG (op, FLAG_WIZ); 730 GET_FLAG (this, FLAG_WIZ);
950 //TODO: move to check_object 731 //TODO: move to check_object
951 if (QUERY_FLAG (op, FLAG_WIZ)) 732 if (QUERY_FLAG (this, FLAG_WIZ))
952 { 733 {
953 SET_FLAG (op, FLAG_WAS_WIZ); 734 SET_FLAG (this, FLAG_WAS_WIZ);
954 SET_FLAG (op, FLAG_WIZPASS); 735 SET_FLAG (this, FLAG_WIZPASS);
955 SET_FLAG (op, FLAG_WIZCAST); 736 SET_FLAG (this, FLAG_WIZCAST);
956 } 737 }
957 else 738 else
958 { 739 {
959 CLEAR_FLAG (op, FLAG_WIZPASS); 740 CLEAR_FLAG (this, FLAG_WIZPASS);
960 CLEAR_FLAG (op, FLAG_WIZCAST); 741 CLEAR_FLAG (this, FLAG_WIZCAST);
961 } 742 }
962 break; 743 break;
963 744
964 case KW_friendly: 745 case KW_friendly:
965 if (thawer.get_sint32 ()) 746 if (f.get_sint32 ())
966 if (op->type != PLAYER) 747 if (type != PLAYER)
967 add_friendly_object (op); 748 add_friendly_object (this);
968 749
969 break; 750 break;
970 751
971 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 752 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
972 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 753 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
973 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 754 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
974 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 755 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
975 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; 756 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
976 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 757 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
977 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 758 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
978 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 759 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
979 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 760 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
980 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 761 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
981 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 762 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
982 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 763 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
983 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 764 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
984 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 765 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
985 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 766 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
986 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 767 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
987 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 768 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
988 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 769 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
989 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 770 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
990 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 771 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
991 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 772 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
992 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 773 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
993 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 774 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
994 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 775 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
995 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 776 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
996 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 777 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
997 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 778 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
998 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 779 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
999 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 780 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
1000 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 781 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
1001 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 782 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
1002 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 783 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
1003 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 784 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1004 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 785 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
1005 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 786 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
1006 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 787 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
1007 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 788 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
1008 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 789 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
1009 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 790 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
1010 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 791 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
1011 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 792 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
1012 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 793 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
1013 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 794 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
1014 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 795 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
1015 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 796 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
1016 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 797 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
1017 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 798 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
1018 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 799 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
1019 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 800 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
1020 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 801 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
1021 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 802 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
1022 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 803 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
1023 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 804 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
1024 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 805 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1025 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 806 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
1026 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 807 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
1027 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 808 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
1028 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 809 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
1029 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 810 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
1030 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 811 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
1031 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 812 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
1032 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 813 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
1033 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 814 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
1034 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 815 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
1035 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 816 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
1036 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 817 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
1037 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 818 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
1038 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 819 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
1039 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 820 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
1040 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 821 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
1041 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 822 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
1042 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 823 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
1043 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 824 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
1044 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 825 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
1045 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 826 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
1046 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 827 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
1047 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 828 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
1048 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 829 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
1049 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 830 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
1050 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 831 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
1051 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 832 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
1052 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 833 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
1053 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 834 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
1054 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 835 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
1055 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 836 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
1056 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; 837 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
838 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
839 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
1057 840
1058 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 841 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
1059 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 842 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
1060 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 843 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
1061 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 844 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1062 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 845 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
1063 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 846 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
1064 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 847 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
1065 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 848 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
1066 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 849 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
1067 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 850 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
1068 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 851 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
1069 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 852 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
1070 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 853 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
1071 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 854 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
1072 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 855 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
1073 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 856 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
1074 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 857 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
1075 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 858 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
1076 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 859 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
1077 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 860 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
1078 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 861 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
1079 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 862 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
1080 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 863 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
1081 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 864 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
1082 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 865 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
1083 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 866 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
1084 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 867 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
1085 868
1086 case KW_luck: thawer.get (op->stats.luck); break; 869 case KW_luck: f.get (stats.luck); break;
1087 case KW_run_away: thawer.get (op->run_away); break; 870 case KW_run_away: f.get (run_away); break;
1088 case KW_pick_up: thawer.get (op->pick_up); break; 871 case KW_pick_up: f.get (pick_up); break;
1089 case KW_item_power: thawer.get (op->item_power); break; 872 case KW_item_power: f.get (item_power); break;
1090 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 873 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
1091 case KW_anim_speed: thawer.get (op->anim_speed); break; 874 case KW_anim_speed: f.get (anim_speed); break;
1092 case KW_container: thawer.get (op->weight_limit); break; 875 case KW_container: f.get (weight_limit); break;
1093 case KW_will_apply: thawer.get (op->will_apply); break; 876 case KW_will_apply: f.get (will_apply); break;
1094 case KW_attack_movement: thawer.get (op->attack_movement); break; 877 case KW_attack_movement: f.get (attack_movement); break;
1095 case KW_move_state: thawer.get (op->move_status); break; 878 case KW_move_state: f.get (move_status); break;
1096 case KW_expmul: thawer.get (op->expmul); break; 879 case KW_expmul: f.get (expmul); break;
1097 case KW_glow_radius: thawer.get (op->glow_radius); break; 880 case KW_glow_radius: f.get (glow_radius); break;
1098 case KW_weapontype: thawer.get (op->weapontype); break; 881 case KW_weapontype: f.get (weapontype); break;
1099 case KW_tooltype: thawer.get (op->tooltype); break; 882 case KW_tooltype: f.get (tooltype); break;
1100 case KW_casting_time: thawer.get (op->casting_time); break; 883 case KW_casting_time: f.get (casting_time); break;
1101 case KW_elevation: thawer.get (op->elevation); break; 884 case KW_elevation: f.get (elevation); break;
1102 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 885 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
1103 case KW_client_type: thawer.get (op->client_type); break; 886 case KW_client_type: f.get (client_type); break;
1104 case KW_duration: thawer.get (op->duration); break; 887 case KW_duration: f.get (duration); break;
1105 case KW_range: thawer.get (op->range); break; 888 case KW_range: f.get (range); break;
1106 case KW_range_modifier: thawer.get (op->range_modifier); break; 889 case KW_range_modifier: f.get (range_modifier); break;
1107 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 890 case KW_dam_modifier: f.get (dam_modifier); break;
1108 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 891 case KW_duration_modifier: f.get (duration_modifier); break;
1109 892
1110 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 893 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1111 //TODO: parse from other include files 894 //TODO: parse from other include files
1112 case KW_body_range: thawer.get (op->body_info[0]); break; 895 case KW_body_range: slot[ 0].info = f.get_sint32 (); break;
1113 case KW_body_arm: thawer.get (op->body_info[1]); break; 896 case KW_body_arm: slot[ 1].info = f.get_sint32 (); break;
1114 case KW_body_torso: thawer.get (op->body_info[2]); break; 897 case KW_body_torso: slot[ 2].info = f.get_sint32 (); break;
1115 case KW_body_head: thawer.get (op->body_info[3]); break; 898 case KW_body_head: slot[ 3].info = f.get_sint32 (); break;
1116 case KW_body_neck: thawer.get (op->body_info[4]); break; 899 case KW_body_neck: slot[ 4].info = f.get_sint32 (); break;
1117 case KW_body_skill: thawer.get (op->body_info[5]); break; 900 case KW_body_skill: slot[ 5].info = f.get_sint32 (); break;
1118 case KW_body_finger: thawer.get (op->body_info[6]); break; 901 case KW_body_finger: slot[ 6].info = f.get_sint32 (); break;
1119 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 902 case KW_body_shoulder: slot[ 7].info = f.get_sint32 (); break;
1120 case KW_body_foot: thawer.get (op->body_info[8]); break; 903 case KW_body_foot: slot[ 8].info = f.get_sint32 (); break;
1121 case KW_body_hand: thawer.get (op->body_info[9]); break; 904 case KW_body_hand: slot[ 9].info = f.get_sint32 (); break;
1122 case KW_body_wrist: thawer.get (op->body_info[10]); break; 905 case KW_body_wrist: slot[10].info = f.get_sint32 (); break;
1123 case KW_body_waist: thawer.get (op->body_info[11]); break; 906 case KW_body_waist: slot[11].info = f.get_sint32 (); break;
1124 case KW_can_apply: 907 case KW_can_apply:
1125 break; 908 break;
1126 909
1127 case KW_connected: 910 case KW_connected:
1128 add_button_link (op, op->map, thawer.get_sint32 ()); 911 add_button_link (this, map, f.get_sint32 ());
1129 break; 912 break;
1130 913
1131 case KW_randomitems: 914 case KW_randomitems:
1132 op->randomitems = find_treasurelist (thawer.get_str ()); 915 if (f.get_str ())
916 {
917 randomitems =
918 loading_arch
919 ? treasurelist::get (f.get_str ())
920 : treasurelist::find (f.get_str ());
921
1133 //if (!op->randomitems) 922 if (!randomitems)
1134 // 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 ());
924 }
925 else
926 randomitems = 0;
1135 break; 927 break;
1136 928
1137 case KW_msg: 929 case KW_msg:
1138 thawer.get_ml (KW_endmsg, op->msg); 930 f.get_ml (KW_endmsg, msg);
1139 //TODO: allow longer messages 931 //TODO: allow longer messages
1140 if (strlen (op->msg) >= HUGE_BUF) 932 if (strlen (msg) >= HUGE_BUF)
1141 { 933 {
1142 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 934 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
1143 op->msg = "ERROR, please report: string too long, winged.\n"; 935 msg = "ERROR, please report: string too long, winged.\n";
1144 } 936 }
1145 break; 937 break;
1146 938
1147 case KW_lore: 939 case KW_lore:
1148 thawer.get_ml (KW_endlore, op->lore); 940 f.get_ml (KW_endlore, lore);
1149 //TODO: allow longer messages 941 //TODO: allow longer messages
1150 /* Just print a warning so we can be reasonably safe 942 /* Just print a warning so we can be reasonably safe
1151 * about not overflowing the buffer. 943 * about not overflowing the buffer.
1152 */ 944 */
1153 if (strlen (op->lore) > (HUGE_BUF / 2)) 945 if (strlen (lore) > (HUGE_BUF / 2))
1154 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 946 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1155 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 947 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1156 break; 948 break;
1157 949
1158 case KW_editable: 950 case KW_editable:
1159 case KW_editor_folder: 951 case KW_editor_folder:
1160 break; 952 break;
1161 953
1162 case KW_More: // uppercase alias
1163 case KW_more:
1164 /* We need to record that this is a multipart object,
1165 * so the calling function can glue things back together
1166 */
1167 ismore = 1;
1168 break;
1169
1170 case KW_end: 954 case KW_end:
1171 check_loaded_object (op); 955 check_loaded_object (this);
1172 956
1173 if (!arch_init) 957 if (!loading_arch)
1174 op->instantiate (); 958 instantiate ();
1175 959
1176 return ismore ? LL_MORE : LL_NORMAL; 960 f.next ();
1177
1178 case KW_EOF:
1179 return LL_EOF; 961 return true;
1180 962
1181 case KW_ERROR: 963 case KW_ERROR:
1182 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 964 set_ob_key_value (this, f.kw_str, f.value, true);
1183 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 965 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1184 break; 966 break;
1185 967
1186 default: 968 default:
1187 if (!thawer.parse_error (kw, "object", op->name)) 969 if (!f.parse_error ("object", name))
1188 return false; 970 return false;
1189 break; 971 break;
1190 } 972 }
973
974 f.next ();
1191 } 975 }
1192} 976}
1193 977
1194/* 978object *
1195 * Loads an object from the given file-pointer. 979object::read (object_thawer &f, maptile *map)
1196 * Variables will be read and parsed and patched into the object
1197 * until the string "end" is reached, or the end of the file.
1198 *
1199 * bufstat is used to determine various file attributes:
1200 * LO_REPATE (0): We are reading from the same buffer as the last call.
1201 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1202 * will also be reading from this (treasure file, artifacts.)
1203 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1204 * be reset.
1205 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1206 *
1207 */
1208int
1209load_object (object_thawer &fp, object *op, int map_flags)
1210{ 980{
1211 coroapi::cede_every (1000); // cede once in a while 981 assert (f.kw == KW_arch);
1212 982
1213 return parse_object (op, fp, map_flags); 983 archetype *arch = archetype::find (f.get_str ());
984
985 if (!arch)
986 {
987 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
988 arch = archetype::find ("earthwall");
989 }
990
991 assert (arch); //D maybe use exception handling of sorts?
992
993 f.next ();
994
995 object *op = object::create ();
996
997 op->map = map;
998 arch->clone.copy_to (op);
999 // copy_to activates, this should be fixed properly
1000 op->deactivate ();
1001
1002 if (!op->parse_kv (f))
1003 {
1004 op->destroy (true);
1005 return 0;
1006 }
1007
1008 return op;
1214} 1009}
1215 1010
1216/* This takes a buffer, scans it for variables, and sets those variables 1011/* This takes a buffer, scans it for variables, and sets those variables
1217 * as appropriate in op. 1012 * as appropriate in op.
1218 * 1013 *
… …
1220 * override values and in c_wiz to mutate values. 1015 * override values and in c_wiz to mutate values.
1221 */ 1016 */
1222int 1017int
1223set_variable (object *op, char *buf) 1018set_variable (object *op, char *buf)
1224{ 1019{
1225 object_thawer thawer (buf, (AV *)0); 1020 object_thawer f (buf, (AV *)0);
1226 1021
1227 return parse_object (op, thawer, 0); 1022 f.next ();
1228} 1023 return op->parse_kv (f);
1229
1230/*
1231 * Initialises the array of variable-names. Needed before any
1232 * objects can be loaded. Called by init_library().
1233 */
1234
1235void
1236init_vars ()
1237{
1238} 1024}
1239 1025
1240/* This returns a string of the integer movement type */ 1026/* This returns a string of the integer movement type */
1241#if 0 1027#if 0
1242// unused function 1028// unused function
… …
1287 return retbuf + 1; 1073 return retbuf + 1;
1288} 1074}
1289#endif 1075#endif
1290 1076
1291// compare *op against *tmp and output differences 1077// compare *op against *tmp and output differences
1292void 1078static void
1293put (object_freezer &f, object *op, object *tmp) 1079write_diff (object_freezer &f, object *op, object *tmp)
1294{ 1080{
1295 static const keyword resist_save[NROFATTACKS] = { 1081 static const keyword resist_save[NROFATTACKS] = {
1296# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1082# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1297# include "attackinc.h" 1083# include "attackinc.h"
1298# undef def 1084# undef def
… …
1322 KW_monster, 1108 KW_monster,
1323 KW_friendly, 1109 KW_friendly,
1324 KW_generator, 1110 KW_generator,
1325 KW_is_thrown, 1111 KW_is_thrown,
1326 KW_auto_apply, 1112 KW_auto_apply,
1327 KW_NULL, // was KW_treasure 1113 KW_treasure_env,
1328 KW_player_sold, 1114 KW_player_sold,
1329 /* 20 */ 1115 /* 20 */
1330 KW_see_invisible, 1116 KW_see_invisible,
1331 KW_can_roll, 1117 KW_can_roll,
1332 KW_overlay_floor, 1118 KW_overlay_floor,
… …
1393 KW_can_use_skill, 1179 KW_can_use_skill,
1394 KW_been_applied, 1180 KW_been_applied,
1395 /* 80 */ 1181 /* 80 */
1396 KW_has_ready_scroll, 1182 KW_has_ready_scroll,
1397 KW_can_use_rod, 1183 KW_can_use_rod,
1398 KW_NULL, 1184 KW_precious,
1399 KW_can_use_horn, 1185 KW_can_use_horn,
1400 KW_make_invisible, 1186 KW_make_invisible,
1401 KW_inv_locked, 1187 KW_inv_locked,
1402 KW_is_wooded, 1188 KW_is_wooded,
1403 KW_is_hilly, 1189 KW_is_hilly,
… …
1469 f.put (KW_msg, KW_endmsg, op->msg); 1255 f.put (KW_msg, KW_endmsg, op->msg);
1470 if (op->lore != tmp->lore) 1256 if (op->lore != tmp->lore)
1471 f.put (KW_lore, KW_endlore, op->lore); 1257 f.put (KW_lore, KW_endlore, op->lore);
1472 1258
1473 CMP_OUT (other_arch); 1259 CMP_OUT (other_arch);
1474 CMP_OUT (face); 1260
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1475 1262
1476 if (op->animation_id != tmp->animation_id) 1263 if (op->animation_id != tmp->animation_id)
1477 if (op->animation_id) 1264 if (op->animation_id)
1478 { 1265 {
1479 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1576 if (op->flag != tmp->flag) 1363 if (op->flag != tmp->flag)
1577 for (i = 0; i <= NUM_FLAGS; i++) 1364 for (i = 0; i <= NUM_FLAGS; i++)
1578 if (flag_names [i] && op->flag [i] != tmp->flag [i]) 1365 if (flag_names [i] && op->flag [i] != tmp->flag [i])
1579 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1366 f.put (flag_names [i], op->flag [i] ? "1" : "0");
1580 1367
1581 /* Save body locations */ 1368 // save body locations
1582 for (i = 0; i < NUM_BODY_LOCATIONS; i++) 1369 for (i = 0; i < NUM_BODY_LOCATIONS; i++)
1583 if (op->body_info[i] != tmp->body_info[i]) 1370 if (op->slot[i].info != tmp->slot[i].info)
1584 f.put (body_locations[i].save_name, op->body_info[i]); 1371 f.put (body_locations[i].save_name, op->slot[i].info);
1585} 1372}
1586 1373
1587/* 1374/*
1588 * Dumps all variables in an object to a file. 1375 * Dumps all variables in an object to a file.
1589 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1376 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1590 * the only place this is not set is when saving the player. 1377 * the only place this is not set is when saving the player.
1591 */ 1378 */
1592void 1379bool
1593save_object (object_freezer &fp, object *op, int flag) 1380object::write (object_freezer &f)
1594{ 1381{
1595 /* Even if the object does have an owner, it would seem that we should 1382 /* Even if the object does have an owner, it would seem that we should
1596 * still save it. 1383 * still save it.
1597 */ 1384 */
1598 if (op->owner) 1385 if (owner)
1599 return; 1386 return true;
1600 1387
1601 /* If it is unpaid and we don't want to save those, just return. */
1602 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1603 return;
1604
1605 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1388 archetype *at = arch ? (archetype *)arch : empty_archetype;
1606 1389
1607 fp.put (KW_arch, at->name); 1390 f.put (KW_arch, at->name);
1608 put (fp, op, &at->clone); 1391 write_diff (f, this, &at->clone);
1609 1392
1610 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1611
1612 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1393 for (object *tmp = inv; tmp; tmp = tmp->below)
1613 save_object (fp, tmp, flag); 1394 tmp->write (f);
1614 1395
1615 fp.put (op); 1396 f.put (this);
1616 fp.put (KW_end); 1397 f.put (KW_end);
1398
1399 return true;
1617} 1400}
1618 1401
1402/////////////////////////////////////////////////////////////////////////////
1403
1404// generic resource file load,
1405// currently supports: region, treasures, archetypes
1406bool load_resource_file (const char *filename)
1407{
1408 object_thawer f (filename);
1409
1410 bool success = false;
1411 bool seen_arch = false;
1412
1413 f.next ();
1414
1415 for (;;)
1416 {
1417 switch (f.kw)
1418 {
1419 case KW_region:
1420 if (!region::read (f))
1421 goto finish;
1422 break;
1423
1424 case KW_treasure:
1425 case KW_treasureone:
1426 if (!treasurelist::read (f))
1427 goto finish;
1428 break;
1429
1430 case KW_object:
1431 seen_arch = true;
1432 if (!archetype::read (f))
1433 goto finish;
1434 break;
1435
1436 case KW_EOF:
1437 success = true;
1438 goto finish;
1439
1440 default:
1441 if (!f.parse_error ("resource file"))
1442 goto finish;
1443
1444 f.next ();
1445 break;
1446 }
1447 }
1448
1449finish:
1450 if (seen_arch)
1451 init_archetype_pointers ();
1452
1453 return success;
1454}
1455

Diff Legend

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