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.55 by root, Thu Feb 8 03:09:31 2007 UTC vs.
Revision 1.69 by root, Tue Apr 17 18:24:29 2007 UTC

… …
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.
422 */ 261 */
423static void 262static void
424check_loaded_object (object *op) 263check_loaded_object (object *op)
425{ 264{
426 int ip;
427
428 /* We do some specialised handling to handle legacy cases of name_pl. 265 /* We do some specialised handling to handle legacy cases of name_pl.
429 * If the object doesn't have a name_pl, we just use the object name - 266 * If the object doesn't have a name_pl, we just use the object name -
430 * this isn't perfect (things won't be properly pluralised), but works to 267 * this isn't perfect (things won't be properly pluralised), but works to
431 * that degree (5 heart is still quite understandable). But the case we 268 * that degree (5 heart is still quite understandable). But the case we
432 * also have to catch is if this object is not using the normal name for 269 * also have to catch is if this object is not using the normal name for
433 * the object. In that case, we also want to use the loaded name. 270 * the object. In that case, we also want to use the loaded name.
434 * Otherwise, what happens is that the the plural name will lose 271 * Otherwise, what happens is that the the plural name will lose
435 * information (appear as just 'hearts' and not 'goblins heart') 272 * information (appear as just 'hearts' and not 'goblins heart')
436 */ 273 */
437 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 274 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
438 op->name_pl = NULL; 275 op->name_pl = 0;
439 276
440 if (!op->name_pl) 277 if (!op->name_pl)
441 op->name_pl = op->name; 278 op->name_pl = op->name;
442 279
443 /* objects now have a materialname. try to patch it in */ 280 /* objects now have a materialname. try to patch it in */
… …
446 if (op->map != NULL) 283 if (op->map != NULL)
447 set_materialname (op, op->map->difficulty, NULL); 284 set_materialname (op, op->map->difficulty, NULL);
448 else 285 else
449 set_materialname (op, 5, NULL); 286 set_materialname (op, 5, NULL);
450 } 287 }
288
451 /* only do these when program is first run - a bit 289 /* only do these when program is first run - a bit
452 * excessive to do this at every run - most of this is 290 * excessive to do this at every run - most of this is
453 * really just to catch any errors - program will still run, but 291 * really just to catch any errors - program will still run, but
454 * not in the ideal fashion. 292 * not in the ideal fashion.
455 */ 293 */
456 if ((op->type == WEAPON || op->type == BOW) && arch_init) 294 if ((op->type == WEAPON || op->type == BOW) && loading_arch)
457 { 295 {
458 if (!op->skill) 296 if (!op->skill)
459 {
460 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 297 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
461 }
462 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 298 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
463 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 299 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
464 {
465 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->body_info[1], &op->skill);
466 }
467 } 301 }
468 302
469 /* 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
470 * really does for many objects. Need to catch any in maps 304 * really does for many objects. Need to catch any in maps
471 * that may have an old value. 305 * that may have an old value.
472 */ 306 */
473 if ((op->type == WEAPON) || 307 if (op->type == WEAPON
474 (op->type == ARMOUR) || (op->type == HELMET) || 308 || op->type == ARMOUR || op->type == HELMET
475 (op->type == SHIELD) || (op->type == RING) || 309 || op->type == SHIELD || op->type == RING
476 (op->type == BOOTS) || (op->type == GLOVES) || 310 || op->type == BOOTS || op->type == GLOVES
477 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 311 || op->type == AMULET || op->type == GIRDLE
312 || op->type == BRACERS || op->type == CLOAK)
478 { 313 {
479 if (op->last_heal) 314 if (op->last_heal)
480 { 315 {
481 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 316 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
482 op->gen_sp_armour = op->last_heal; 317 op->gen_sp_armour = op->last_heal;
483 op->last_heal = 0; 318 op->last_heal = 0;
484 } 319 }
485 320
486 ip = calc_item_power (op, 0); 321 int ip = calc_item_power (op, 0);
322
487 /* Legacy objects from before item power was in the game */ 323 /* Legacy objects from before item power was in the game */
488 if (!op->item_power && ip) 324 if (!op->item_power && ip)
489 { 325 {
490 if (ip > 3) 326 if (ip > 3)
491 {
492 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 327 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
493 } 328
494 op->item_power = ip; 329 op->item_power = ip;
495 } 330 }
331
496 /* Check for possibly bogus values. Has to meet both these criteria - 332 /* Check for possibly bogus values. Has to meet both these criteria -
497 * something that has item_power 1 is probably just fine if our calculated 333 * something that has item_power 1 is probably just fine if our calculated
498 * value is 1 or 2 - these values are small enough that hard to be precise. 334 * value is 1 or 2 - these values are small enough that hard to be precise.
499 * similarly, it item_power is 0, the first check will always pass, 335 * similarly, it item_power is 0, the first check will always pass,
500 * but not the second one. 336 * but not the second one.
501 */ 337 */
502 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 338 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
503 {
504 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 339 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
505 }
506
507 } 340 }
341
508 /* Old spellcasting object - need to load in the appropiate object */ 342 /* Old spellcasting object - need to load in the appropiate object */
509 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 ||
510 /* 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 */
511 ((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)
512 { 346 {
513 object *tmp;
514
515 /* 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'
516 * in that spell was stored in sp. 348 * in that spell was stored in sp.
517 */ 349 */
518 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]);
519 insert_ob_in_ob (tmp, op); 351 insert_ob_in_ob (tmp, op);
520 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 */
521 } 353 }
354
522 /* 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 */
523
524 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)
525 { 357 {
526 object *tmp;
527
528 tmp = get_archetype_by_object_name (op->slaying); 358 object *tmp = get_archetype_by_object_name (op->slaying);
529 insert_ob_in_ob (tmp, op); 359 insert_ob_in_ob (tmp, op);
530 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 */
531 /* without this, value is all screwed up */ 361 /* without this, value is all screwed up */
532 op->value = op->arch->clone.value * op->inv->value; 362 op->value = op->arch->clone.value * op->inv->value;
533 } 363 }
… …
569 { 399 {
570 op->move_type = MOVE_ALL; 400 op->move_type = MOVE_ALL;
571 op->stats.maxhp = 0; 401 op->stats.maxhp = 0;
572 } 402 }
573 else 403 else
404 op->move_type = MOVE_WALK;
405 }
406 }
407
408}
409
410static void
411set_move (MoveType &mt, const char *str)
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 { "all" , MOVE_ALL },
424 };
425
426 if (!str)
427 {
428 mt = 0;
429 return;
430 }
431
432 if (isdigit (*str))
433 {
434 mt = atoi (str);
435 return;
436 }
437
438 mt = 0;
439
440 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
441 {
442 bool negate = 0;
443
444 if (*str == '-')
445 {
446 negate = 1;
447 str++;
448 }
449
450 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f)
451 {
452 if (!strcmp (f->name, str))
574 { 453 {
575 op->move_type = MOVE_WALK; 454 if (negate)
455 mt &= ~f->flags;
456 else
457 mt |= f->flags;
458
459 goto next;
576 } 460 }
577 } 461 }
578 }
579 462
463 LOG (llevDebug, "common/loader.C: set_move - unknown move string '%s'\n", str);
464
465next: ;
466 }
580} 467}
581 468
582static void
583set_move (MoveType & mt, const char *str)
584{
585 if (!str)
586 {
587 mt = 0;
588 return;
589 }
590
591 if (isdigit (*str))
592 {
593 mt = atoi (str);
594 return;
595 }
596
597 mt = 0;
598
599 for (str = strtok ((char *) str, " "); str; str = strtok (0, " "))
600 {
601 if (!strcasecmp (str, "all"))
602 mt |= MOVE_ALL;
603 else
604 {
605 int i, negate = 0;
606
607 if (*str == '-')
608 {
609 negate = 1;
610 str++;
611 }
612
613 for (i = 0; move_name[i]; i++)
614 {
615 if (!strcasecmp (move_name[i], str))
616 {
617 if (negate)
618 mt &= ~(1 << i);
619 else
620 mt |= (1 << i);
621
622 break;
623 }
624 }
625
626 if (!move_name[i])
627 {
628 /* fly is a special case - covers both fly_low and
629 * fly_high - since it doesn't match to a specific
630 * single bit, have to special case it.
631 */
632 if (!strcasecmp (str, "flying"))
633 {
634 if (negate)
635 mt &= ~MOVE_FLYING;
636 else
637 mt |= MOVE_FLYING;
638 }
639 else
640 LOG (llevDebug, "common/loader.l: set_move - unknown move string '%s'\n", str);
641 }
642 }
643 }
644}
645
646#define GET_FLAG(op,flag) \ 469#define GET_FLAG(op,flag) \
647 if (thawer.get_sint32 ()) \ 470 if (f.get_sint32 ()) \
648 SET_FLAG (op, flag); \ 471 SET_FLAG (op, flag); \
649 else \ 472 else \
650 CLEAR_FLAG (op, flag) \ 473 CLEAR_FLAG (op, flag) \
651 474
652int 475bool
653parse_object (object *op, object_thawer &thawer, int map_flags) 476object::parse_kv (object_thawer &f)
654{ 477{
655 bool ismore = 0; 478 assert (f.kw == KW_object || f.kw == KW_arch);
479
480 if (f.kw == KW_object)
481 f.get (name); // preset name from object name
482
483 f.next ();
484
656 object *op_inv = op->inv; 485 object *op_inv = inv;
657 486
658 for (;;) 487 for (;;)
659 { 488 {
660 keyword kw = thawer.get_kv ();
661
662 switch (kw) 489 switch (f.kw)
663 { 490 {
664 case KW_Object: // uppercase alias
665 case KW_object:
666 thawer.get (op->name);
667
668 if (op->arch)
669 op->arch->name = op->name;
670
671 break;
672
673 case KW_uuid: 491 case KW_uuid:
674 if (const char *s = thawer.get_str ()) 492 if (const char *s = f.get_str ())
675 { 493 {
676 unsigned int version; 494 unsigned int version;
677 unsigned long long seq; 495 unsigned long long seq;
678 496
679 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 497 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
680 { 498 {
681 op->uuid.seq = seq; 499 uuid.seq = seq;
682 break; 500 break;
683 } 501 }
684 } 502 }
685 503
686 op->uuid = gen_uuid (); 504 uuid = gen_uuid ();
687 break; 505 break;
688 506
689 case KW_oid: 507 case KW_oid:
690 thawer.get (op, thawer.get_sint32 ()); 508 f.get (this, f.get_sint32 ());
691 break; 509 break;
692 510
693 case KW_name: thawer.get (op->name); break; 511 case KW_name: f.get (name); break;
694 case KW_name_pl: thawer.get (op->name_pl); break; 512 case KW_name_pl: f.get (name_pl); break;
695 case KW_title: thawer.get (op->title); break; 513 case KW_title: f.get (title); break;
696 case KW_custom_name: thawer.get (op->custom_name); break; 514 case KW_custom_name: f.get (custom_name); break;
697 515
698 case KW_attach: thawer.get_ornull (op->attach); break; 516 case KW_attach: f.get_ornull (attach); break;
699 case KW_skill: thawer.get_ornull (op->skill); break; 517 case KW_skill: f.get_ornull (skill); break;
700 case KW_race: thawer.get_ornull (op->race); break; 518 case KW_race: f.get_ornull (race); break;
701 case KW_slaying: thawer.get_ornull (op->slaying); break; 519 case KW_slaying: f.get_ornull (slaying); break;
702 520
703 case KW_arch: 521 case KW_arch:
704 { 522 {
705 const char *str = thawer.get_str ();
706
707 if (op->arch)
708 {
709 /* If op->arch has been set, then this new object
710 * must be part of the inventory. So process
711 * appropriately.
712 */
713 archetype *arch = archetype::find (str);
714
715 object *tmp;
716
717 if (arch)
718 tmp = arch_to_object (arch);
719 else
720 {
721 tmp = object::create (); 523 object *tmp = object::read (f);
722 /* record the name of the broken object */
723 tmp->name = str;
724 }
725
726 // decativate the object we, as we are still going
727 // to read the speed value. Objects should be activated
728 // when the map, object or player is completly loaded.
729 tmp->deactivate (); 524 tmp->deactivate ();
730 525
731 parse_object (tmp, thawer, map_flags);
732
733 if (tmp->arch)
734 { 526 {
735 // was: insert_ob_in_ob (tmp, op); 527 // was: insert_ob_in_ob (tmp, op);
736 // but manually adding it can improve map loading times a lot 528 // but manually adding it can improve map loading times a lot
737 // also, appending instead of prepending keeps the 529 // also, appending instead of prepending keeps the
738 // save ordering the same between repeated load/saves. 530 // save ordering the same between repeated load/saves.
739 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 531 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
740 CLEAR_FLAG (tmp, FLAG_REMOVED); 532 CLEAR_FLAG (tmp, FLAG_REMOVED);
741 533
742 if (!op_inv) 534 if (!op_inv)
743 { 535 {
744 op->inv = tmp;
745 tmp->above = 0;
746 }
747 else
748 {
749 while (op_inv->below)
750 op_inv = op_inv->below;
751
752 op_inv->below = tmp;
753 tmp->above = op_inv;
754 }
755
756 tmp->below = 0;
757 tmp->env = op;
758 op_inv = tmp; 536 inv = tmp;
537 tmp->above = 0;
759 } 538 }
760 else 539 else
761 { 540 {
762 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 541 while (op_inv->below)
763 tmp->destroy (); 542 op_inv = op_inv->below;
543
544 op_inv->below = tmp;
545 tmp->above = op_inv;
764 } 546 }
547
548 tmp->below = 0;
549 tmp->env = this;
550 op_inv = tmp;
765 } 551 }
766 else
767 {
768 /* This is the actual archetype definition then */
769 op->arch = archetype::find (str);
770
771 if (op->arch)
772 {
773 op->arch->clone.copy_to (op);
774 // copy_to activates, this should be fixed properly
775 op->deactivate ();
776 }
777 else if (!arch_init)
778 /* record the name of the broken object */
779 op->name = str;
780 }
781 } 552 }
782 break; 553 continue;
783 554
784 case KW_other_arch: 555 case KW_other_arch:
556 other_arch =
557 loading_arch
558 ? archetype::get (f.get_str ())
785 op->other_arch = archetype::find (thawer.get_str ()); 559 : archetype::find (f.get_str ());
560
561 if (!other_arch)
562 LOG (llevError, "%s uses unknown other_arch '%s'.\n", debug_desc (), f.get_str ());
786 break; 563 break;
787 564
788 case KW_animation: 565 case KW_animation:
789 { 566 {
567 CLEAR_FLAG (this, FLAG_ANIMATE);
568 animation_id = 0;
569
790 const char *str = thawer.get_str (); 570 const char *str = f.get_str ();
791
792 if (!str)
793 {
794 op->animation_id = 0;
795 CLEAR_FLAG (op, FLAG_ANIMATE);
796 }
797 else if ((op->animation_id = find_animation (str))) 571 if (str && (animation_id = find_animation (str)))
798 SET_FLAG (op, FLAG_ANIMATE); 572 SET_FLAG (this, FLAG_ANIMATE);
799 } 573 }
800
801 break; 574 break;
802 575
803 case KW_last_heal: thawer.get (op->last_heal); break; 576 case KW_last_heal: f.get (last_heal); break;
804 case KW_last_sp: thawer.get (op->last_sp); break; 577 case KW_last_sp: f.get (last_sp); break;
805 case KW_last_grace: thawer.get (op->last_grace); break; 578 case KW_last_grace: f.get (last_grace); break;
806 case KW_last_eat: thawer.get (op->last_eat); break; 579 case KW_last_eat: f.get (last_eat); break;
807 case KW_speed_left: thawer.get (op->speed_left); break; 580 case KW_speed_left: f.get (speed_left); break;
808 581
809 case KW_speed: 582 case KW_speed:
810 thawer.get (op->speed); 583 f.get (speed);
811 584
812 //TODO: maybe do in check_object 585 //TODO: maybe do in check_object
813 // removed check for style maps 586 // removed check for style maps
814 if (op->speed < 0) 587 if (speed < 0)
815 op->speed_left = op->speed_left - rndm (); 588 speed_left = speed_left - rndm ();
816 589
817 break; 590 break;
818 591
819 case KW_slow_move: 592 case KW_slow_move:
820 op->move_slow |= MOVE_WALK; 593 move_slow |= MOVE_WALK;
821 thawer.get (op->move_slow_penalty); 594 f.get (move_slow_penalty);
822 break; 595 break;
823 596
824 case KW_face: 597 case KW_face:
825 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 598 face = face_find (f.get_str ());
826 break; 599 break;
827 600
828 case KW_x: thawer.get (op->x); break; 601 case KW_x: f.get (x); break;
829 case KW_y: thawer.get (op->y); break; 602 case KW_y: f.get (y); break;
830 603
831 case KW_Str: // uppercase alias 604 case KW_Str: // uppercase alias
832 case KW_str: thawer.get (op->stats.Str); break; 605 case KW_str: f.get (stats.Str); break;
833 case KW_Dex: // uppercase alias 606 case KW_Dex: // uppercase alias
834 case KW_dex: thawer.get (op->stats.Dex); break; 607 case KW_dex: f.get (stats.Dex); break;
835 case KW_Con: // uppercase alias 608 case KW_Con: // uppercase alias
836 case KW_con: thawer.get (op->stats.Con); break; 609 case KW_con: f.get (stats.Con); break;
837 case KW_Wis: // uppercase alias 610 case KW_Wis: // uppercase alias
838 case KW_wis: thawer.get (op->stats.Wis); break; 611 case KW_wis: f.get (stats.Wis); break;
839 case KW_Cha: // uppercase alias 612 case KW_Cha: // uppercase alias
840 case KW_cha: thawer.get (op->stats.Cha); break; 613 case KW_cha: f.get (stats.Cha); break;
841 case KW_Int: // uppercase alias 614 case KW_Int: // uppercase alias
842 case KW_int: thawer.get (op->stats.Int); break; 615 case KW_int: f.get (stats.Int); break;
843 case KW_Pow: // uppercase alias 616 case KW_Pow: // uppercase alias
844 case KW_pow: thawer.get (op->stats.Pow); break; 617 case KW_pow: f.get (stats.Pow); break;
845 618
846 case KW_hp: thawer.get (op->stats.hp); break; 619 case KW_hp: f.get (stats.hp); break;
847 case KW_maxhp: thawer.get (op->stats.maxhp); break; 620 case KW_maxhp: f.get (stats.maxhp); break;
848 case KW_sp: thawer.get (op->stats.sp); break; 621 case KW_sp: f.get (stats.sp); break;
849 case KW_maxsp: thawer.get (op->stats.maxsp); break; 622 case KW_maxsp: f.get (stats.maxsp); break;
850 case KW_grace: thawer.get (op->stats.grace); break; 623 case KW_grace: f.get (stats.grace); break;
851 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 624 case KW_maxgrace: f.get (stats.maxgrace); break;
852 625
853 case KW_exp: thawer.get (op->stats.exp); break; 626 case KW_exp: f.get (stats.exp); break;
854 case KW_perm_exp: thawer.get (op->perm_exp); break; 627 case KW_perm_exp: f.get (perm_exp); break;
855 case KW_food: thawer.get (op->stats.food); break; 628 case KW_food: f.get (stats.food); break;
856 case KW_dam: thawer.get (op->stats.dam); break; 629 case KW_dam: f.get (stats.dam); break;
857 case KW_wc: thawer.get (op->stats.wc); break; 630 case KW_wc: f.get (stats.wc); break;
858 case KW_ac: thawer.get (op->stats.ac); break; 631 case KW_ac: f.get (stats.ac); break;
859 case KW_nrof: thawer.get (op->nrof); break; 632 case KW_nrof: f.get (nrof); break;
860 case KW_level: thawer.get (op->level); break; 633 case KW_level: f.get (level); break;
861 case KW_direction: thawer.get (op->direction); break; 634 case KW_direction: f.get (direction); break;
862 case KW_type: thawer.get (op->type); break; 635 case KW_type: f.get (type); break;
863 case KW_subtype: thawer.get (op->subtype); break; 636 case KW_subtype: f.get (subtype); break;
864 case KW_value: thawer.get (op->value); break; 637 case KW_value: f.get (value); break;
865 case KW_weight: thawer.get (op->weight); break; 638 case KW_weight: f.get (weight); break;
866 case KW_carrying: thawer.get (op->carrying); break; 639 case KW_carrying: f.get (carrying); break;
867 case KW_attacktype: thawer.get (op->attacktype); break; 640 case KW_attacktype: f.get (attacktype); break;
868 case KW_path_attuned: thawer.get (op->path_attuned); break; 641 case KW_path_attuned: f.get (path_attuned); break;
869 case KW_path_repelled: thawer.get (op->path_repelled); break; 642 case KW_path_repelled: f.get (path_repelled); break;
870 case KW_path_denied: thawer.get (op->path_denied); break; 643 case KW_path_denied: f.get (path_denied); break;
871 case KW_invisible: thawer.get (op->invisible); break; 644 case KW_invisible: f.get (invisible); break;
872 case KW_magic: thawer.get (op->magic); break; 645 case KW_magic: f.get (magic); break;
873 case KW_state: thawer.get (op->state); break; 646 case KW_state: f.get (state); break;
874 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 647 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
875 case KW_material: thawer.get (op->materials); break; //TODO: nuke 648 case KW_material: f.get (materials); break; //TODO: nuke
876 case KW_materialname: thawer.get (op->materialname); break; 649 case KW_materialname: f.get (materialname); break;
877 650
878 /* These are the new values */ 651 /* These are the new values */
879 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 652 case KW_move_block: set_move (move_block, f.get_str ()); break;
880 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 653 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
881 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 654 case KW_move_type: set_move (move_type, f.get_str ()); break;
882 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 655 case KW_move_on: set_move (move_on, f.get_str ()); break;
883 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 656 case KW_move_off: set_move (move_off, f.get_str ()); break;
884 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 657 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
885 658
886 /* These are all legacy - any new objects should use the move_ .. values */ 659 /* These are all legacy - any new objects should use the move_ .. values */
887 case KW_no_pass: 660 case KW_no_pass:
888 { 661 {
889 if (thawer.get_sint32 ()) 662 if (f.get_sint32 ())
890 op->move_block = MOVE_ALL; 663 move_block = MOVE_ALL;
891 else 664 else
892 op->move_block = 0; 665 move_block = 0;
893 } 666 }
894 667
895 break; 668 break;
896 669
897 /* These are all legacy - any new objects should use the move_ .. values */ 670 /* These are all legacy - any new objects should use the move_ .. values */
898 case KW_walk_on: 671 case KW_walk_on:
899 { 672 {
900 if (thawer.get_sint32 ()) 673 if (f.get_sint32 ())
901 op->move_on |= MOVE_WALK; 674 move_on |= MOVE_WALK;
902 else 675 else
903 op->move_on &= ~MOVE_WALK; 676 move_on &= ~MOVE_WALK;
904 } 677 }
905 678
906 break; 679 break;
907 680
908 /* These are all legacy - any new objects should use the move_ .. values */ 681 /* These are all legacy - any new objects should use the move_ .. values */
909 case KW_walk_off: 682 case KW_walk_off:
910 { 683 {
911 if (thawer.get_sint32 ()) 684 if (f.get_sint32 ())
912 op->move_off |= MOVE_WALK; 685 move_off |= MOVE_WALK;
913 else 686 else
914 op->move_off &= ~MOVE_WALK; 687 move_off &= ~MOVE_WALK;
915 } 688 }
916 break; 689 break;
917 690
918 /* These are all legacy - any new objects should use the move_ .. values */ 691 /* These are all legacy - any new objects should use the move_ .. values */
919 case KW_fly_on: 692 case KW_fly_on:
920 { 693 {
921 if (thawer.get_sint32 ()) 694 if (f.get_sint32 ())
922 op->move_on |= MOVE_FLY_LOW; 695 move_on |= MOVE_FLY_LOW;
923 else 696 else
924 op->move_on &= ~MOVE_FLY_LOW; 697 move_on &= ~MOVE_FLY_LOW;
925 } 698 }
926 break; 699 break;
927 700
928 /* These are all legacy - any new objects should use the move_ .. values */ 701 /* These are all legacy - any new objects should use the move_ .. values */
929 case KW_fly_off: 702 case KW_fly_off:
930 { 703 {
931 if (thawer.get_sint32 ()) 704 if (f.get_sint32 ())
932 op->move_off |= MOVE_FLY_LOW; 705 move_off |= MOVE_FLY_LOW;
933 else 706 else
934 op->move_off &= ~MOVE_FLY_LOW; 707 move_off &= ~MOVE_FLY_LOW;
935 } 708 }
936 break; 709 break;
937 710
938 //TODO: remove these after converting archetypes 711 //TODO: remove these after converting archetypes
939 case KW_can_use_wand: 712 case KW_can_use_wand:
940 GET_FLAG (op, FLAG_USE_RANGE); 713 GET_FLAG (this, FLAG_USE_RANGE);
941 break; 714 break;
942 715
943 /* These are all legacy - any new objects should use the move_ .. values */ 716 /* These are all legacy - any new objects should use the move_ .. values */
944 case KW_flying: 717 case KW_flying:
945 { 718 {
946 if (thawer.get_sint32 ()) 719 if (f.get_sint32 ())
947 op->move_type |= MOVE_FLY_LOW; 720 move_type |= MOVE_FLY_LOW;
948 else 721 else
949 op->move_type &= ~MOVE_FLY_LOW; 722 move_type &= ~MOVE_FLY_LOW;
950 } 723 }
951 break; 724 break;
952 725
953 726
954 case KW_identified: 727 case KW_identified:
955 GET_FLAG (op, FLAG_IDENTIFIED); 728 GET_FLAG (this, FLAG_IDENTIFIED);
956 //TODO: move to check_object or so 729 //TODO: move to check_object or so
957 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 730 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
958 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 731 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
959 732
960 break; 733 break;
961 734
962 case KW_wiz: 735 case KW_wiz:
963 GET_FLAG (op, FLAG_WIZ); 736 GET_FLAG (this, FLAG_WIZ);
964 //TODO: move to check_object 737 //TODO: move to check_object
965 if (QUERY_FLAG (op, FLAG_WIZ)) 738 if (QUERY_FLAG (this, FLAG_WIZ))
966 { 739 {
967 SET_FLAG (op, FLAG_WAS_WIZ); 740 SET_FLAG (this, FLAG_WAS_WIZ);
968 SET_FLAG (op, FLAG_WIZPASS); 741 SET_FLAG (this, FLAG_WIZPASS);
969 SET_FLAG (op, FLAG_WIZCAST); 742 SET_FLAG (this, FLAG_WIZCAST);
970 } 743 }
971 else 744 else
972 { 745 {
973 CLEAR_FLAG (op, FLAG_WIZPASS); 746 CLEAR_FLAG (this, FLAG_WIZPASS);
974 CLEAR_FLAG (op, FLAG_WIZCAST); 747 CLEAR_FLAG (this, FLAG_WIZCAST);
975 } 748 }
976 break; 749 break;
977 750
978 case KW_friendly: 751 case KW_friendly:
979 if (thawer.get_sint32 ()) 752 if (f.get_sint32 ())
980 if (op->type != PLAYER) 753 if (type != PLAYER)
981 add_friendly_object (op); 754 add_friendly_object (this);
982 755
983 break; 756 break;
984 757
985 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 758 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
986 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 759 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
987 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 760 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
988 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 761 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
989 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; 762 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
990 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 763 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
991 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 764 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
992 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 765 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
993 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 766 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
994 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 767 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
995 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 768 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
996 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 769 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
997 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 770 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
998 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 771 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
999 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 772 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
1000 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 773 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
1001 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 774 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
1002 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 775 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
1003 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 776 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
1004 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 777 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
1005 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 778 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
1006 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 779 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
1007 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 780 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
1008 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 781 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
1009 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 782 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
1010 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 783 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
1011 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 784 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
1012 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 785 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
1013 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 786 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
1014 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 787 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
1015 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 788 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
1016 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 789 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
1017 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 790 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1018 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 791 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
1019 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 792 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
1020 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 793 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
1021 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 794 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
1022 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 795 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
1023 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 796 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
1024 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 797 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
1025 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 798 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
1026 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 799 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
1027 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 800 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
1028 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 801 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
1029 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 802 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
1030 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 803 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
1031 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 804 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
1032 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 805 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
1033 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 806 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
1034 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 807 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
1035 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 808 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
1036 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 809 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
1037 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 810 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
1038 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 811 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
1039 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 812 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
1040 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 813 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
1041 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 814 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
1042 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 815 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
1043 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 816 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
1044 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 817 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
1045 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 818 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
1046 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 819 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
1047 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 820 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
1048 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 821 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
1049 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 822 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
1050 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 823 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
1051 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 824 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
1052 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 825 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
1053 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 826 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
1054 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 827 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
1055 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 828 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
1056 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 829 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
1057 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 830 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
1058 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 831 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
1059 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 832 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
1060 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 833 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
1061 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 834 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
1062 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 835 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
1063 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 836 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
1064 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 837 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
1065 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 838 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
1066 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 839 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
1067 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 840 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
1068 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 841 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
1069 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 842 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
1070 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; 843 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
1071 844
1072 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 845 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
1073 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 846 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
1074 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 847 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
1075 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 848 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
1076 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 849 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
1077 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 850 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
1078 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 851 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
1079 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 852 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
1080 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 853 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
1081 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 854 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
1082 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 855 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
1083 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 856 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
1084 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 857 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
1085 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 858 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
1086 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 859 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
1087 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 860 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
1088 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 861 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
1089 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 862 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
1090 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 863 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
1091 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 864 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
1092 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 865 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
1093 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 866 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
1094 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 867 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
1095 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 868 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
1096 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 869 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
1097 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 870 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
1098 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 871 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
1099 872
1100 case KW_luck: thawer.get (op->stats.luck); break; 873 case KW_luck: f.get (stats.luck); break;
1101 case KW_run_away: thawer.get (op->run_away); break; 874 case KW_run_away: f.get (run_away); break;
1102 case KW_pick_up: thawer.get (op->pick_up); break; 875 case KW_pick_up: f.get (pick_up); break;
1103 case KW_item_power: thawer.get (op->item_power); break; 876 case KW_item_power: f.get (item_power); break;
1104 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 877 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
1105 case KW_anim_speed: thawer.get (op->anim_speed); break; 878 case KW_anim_speed: f.get (anim_speed); break;
1106 case KW_container: thawer.get (op->weight_limit); break; 879 case KW_container: f.get (weight_limit); break;
1107 case KW_will_apply: thawer.get (op->will_apply); break; 880 case KW_will_apply: f.get (will_apply); break;
1108 case KW_attack_movement: thawer.get (op->attack_movement); break; 881 case KW_attack_movement: f.get (attack_movement); break;
1109 case KW_move_state: thawer.get (op->move_status); break; 882 case KW_move_state: f.get (move_status); break;
1110 case KW_expmul: thawer.get (op->expmul); break; 883 case KW_expmul: f.get (expmul); break;
1111 case KW_glow_radius: thawer.get (op->glow_radius); break; 884 case KW_glow_radius: f.get (glow_radius); break;
1112 case KW_weapontype: thawer.get (op->weapontype); break; 885 case KW_weapontype: f.get (weapontype); break;
1113 case KW_tooltype: thawer.get (op->tooltype); break; 886 case KW_tooltype: f.get (tooltype); break;
1114 case KW_casting_time: thawer.get (op->casting_time); break; 887 case KW_casting_time: f.get (casting_time); break;
1115 case KW_elevation: thawer.get (op->elevation); break; 888 case KW_elevation: f.get (elevation); break;
1116 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 889 case KW_smoothlevel: f.get (smoothlevel); smoothlevel = clamp (smoothlevel, 0, 255); break;
1117 case KW_client_type: thawer.get (op->client_type); break; 890 case KW_client_type: f.get (client_type); break;
1118 case KW_duration: thawer.get (op->duration); break; 891 case KW_duration: f.get (duration); break;
1119 case KW_range: thawer.get (op->range); break; 892 case KW_range: f.get (range); break;
1120 case KW_range_modifier: thawer.get (op->range_modifier); break; 893 case KW_range_modifier: f.get (range_modifier); break;
1121 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 894 case KW_dam_modifier: f.get (dam_modifier); break;
1122 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 895 case KW_duration_modifier: f.get (duration_modifier); break;
1123 896
1124 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 897 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1125 //TODO: parse from other include files 898 //TODO: parse from other include files
1126 case KW_body_range: thawer.get (op->body_info[0]); break; 899 case KW_body_range: f.get (body_info[0]); break;
1127 case KW_body_arm: thawer.get (op->body_info[1]); break; 900 case KW_body_arm: f.get (body_info[1]); break;
1128 case KW_body_torso: thawer.get (op->body_info[2]); break; 901 case KW_body_torso: f.get (body_info[2]); break;
1129 case KW_body_head: thawer.get (op->body_info[3]); break; 902 case KW_body_head: f.get (body_info[3]); break;
1130 case KW_body_neck: thawer.get (op->body_info[4]); break; 903 case KW_body_neck: f.get (body_info[4]); break;
1131 case KW_body_skill: thawer.get (op->body_info[5]); break; 904 case KW_body_skill: f.get (body_info[5]); break;
1132 case KW_body_finger: thawer.get (op->body_info[6]); break; 905 case KW_body_finger: f.get (body_info[6]); break;
1133 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 906 case KW_body_shoulder: f.get (body_info[7]); break;
1134 case KW_body_foot: thawer.get (op->body_info[8]); break; 907 case KW_body_foot: f.get (body_info[8]); break;
1135 case KW_body_hand: thawer.get (op->body_info[9]); break; 908 case KW_body_hand: f.get (body_info[9]); break;
1136 case KW_body_wrist: thawer.get (op->body_info[10]); break; 909 case KW_body_wrist: f.get (body_info[10]); break;
1137 case KW_body_waist: thawer.get (op->body_info[11]); break; 910 case KW_body_waist: f.get (body_info[11]); break;
1138 case KW_can_apply: 911 case KW_can_apply:
1139 break; 912 break;
1140 913
1141 case KW_connected: 914 case KW_connected:
1142 add_button_link (op, op->map, thawer.get_sint32 ()); 915 add_button_link (this, map, f.get_sint32 ());
1143 break; 916 break;
1144 917
1145 case KW_randomitems: 918 case KW_randomitems:
1146 op->randomitems = find_treasurelist (thawer.get_str ()); 919 if (f.get_str ())
920 {
921 randomitems =
922 loading_arch
923 ? treasurelist::get (f.get_str ())
924 : treasurelist::find (f.get_str ());
925
1147 //if (!op->randomitems) 926 if (!randomitems)
1148 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", op->debug_desc (), thawer.get_str ()); 927 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
928 }
1149 break; 929 break;
1150 930
1151 case KW_msg: 931 case KW_msg:
1152 thawer.get_ml (KW_endmsg, op->msg); 932 f.get_ml (KW_endmsg, msg);
1153 //TODO: allow longer messages 933 //TODO: allow longer messages
1154 if (strlen (op->msg) >= HUGE_BUF) 934 if (strlen (msg) >= HUGE_BUF)
1155 { 935 {
1156 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 936 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
1157 op->msg = "ERROR, please report: string too long, winged.\n"; 937 msg = "ERROR, please report: string too long, winged.\n";
1158 } 938 }
1159 break; 939 break;
1160 940
1161 case KW_lore: 941 case KW_lore:
1162 thawer.get_ml (KW_endlore, op->lore); 942 f.get_ml (KW_endlore, lore);
1163 //TODO: allow longer messages 943 //TODO: allow longer messages
1164 /* Just print a warning so we can be reasonably safe 944 /* Just print a warning so we can be reasonably safe
1165 * about not overflowing the buffer. 945 * about not overflowing the buffer.
1166 */ 946 */
1167 if (strlen (op->lore) > (HUGE_BUF / 2)) 947 if (strlen (lore) > (HUGE_BUF / 2))
1168 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 948 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1169 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 949 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1170 break; 950 break;
1171 951
1172 case KW_editable: 952 case KW_editable:
1173 case KW_editor_folder: 953 case KW_editor_folder:
1174 break; 954 break;
1175 955
1176 case KW_More: // uppercase alias
1177 case KW_more:
1178 /* We need to record that this is a multipart object,
1179 * so the calling function can glue things back together
1180 */
1181 ismore = 1;
1182 break;
1183
1184 case KW_end: 956 case KW_end:
1185 check_loaded_object (op); 957 check_loaded_object (this);
1186 958
1187 if (!arch_init) 959 if (!loading_arch)
1188 op->instantiate (); 960 instantiate ();
1189 961
1190 return ismore ? LL_MORE : LL_NORMAL; 962 f.next ();
1191
1192 case KW_EOF:
1193 return LL_EOF; 963 return true;
1194 964
1195 case KW_ERROR: 965 case KW_ERROR:
1196 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 966 set_ob_key_value (this, f.kw_str, f.value, true);
1197 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 967 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1198 break; 968 break;
1199 969
1200 default: 970 default:
1201 if (!thawer.parse_error (kw, "object", op->name)) 971 if (!f.parse_error ("object", name))
1202 return false; 972 return false;
1203 break; 973 break;
1204 } 974 }
975
976 f.next ();
1205 } 977 }
1206} 978}
1207 979
1208/* 980object *
1209 * Loads an object from the given file-pointer. 981object::read (object_thawer &f, maptile *map)
1210 * Variables will be read and parsed and patched into the object
1211 * until the string "end" is reached, or the end of the file.
1212 *
1213 * bufstat is used to determine various file attributes:
1214 * LO_REPATE (0): We are reading from the same buffer as the last call.
1215 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1216 * will also be reading from this (treasure file, artifacts.)
1217 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1218 * be reset.
1219 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1220 *
1221 */
1222int
1223load_object (object_thawer &fp, object *op, int map_flags)
1224{ 982{
1225 coroapi::cede_every (1000); // cede once in a while 983 assert (f.kw == KW_arch);
1226 984
1227 return parse_object (op, fp, map_flags); 985 archetype *arch = archetype::find (f.get_str ());
986
987 if (!arch)
988 {
989 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
990 arch = archetype::find ("earthwall");
991 }
992
993 assert (arch); //D maybe use exception handling of sorts?
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;
1228} 1009}
1229 1010
1230/* 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
1231 * as appropriate in op. 1012 * as appropriate in op.
1232 * 1013 *
… …
1234 * override values and in c_wiz to mutate values. 1015 * override values and in c_wiz to mutate values.
1235 */ 1016 */
1236int 1017int
1237set_variable (object *op, char *buf) 1018set_variable (object *op, char *buf)
1238{ 1019{
1239 object_thawer thawer (buf, (AV *)0); 1020 object_thawer f (buf, (AV *)0);
1240 1021
1241 return parse_object (op, thawer, 0); 1022 f.kw = KW_arch; // special hack so that parse_kv skips
1242} 1023 return op->parse_kv (f);
1243
1244/*
1245 * Initialises the array of variable-names. Needed before any
1246 * objects can be loaded. Called by init_library().
1247 */
1248
1249void
1250init_vars ()
1251{
1252} 1024}
1253 1025
1254/* This returns a string of the integer movement type */ 1026/* This returns a string of the integer movement type */
1255#if 0 1027#if 0
1256// unused function 1028// unused function
… …
1301 return retbuf + 1; 1073 return retbuf + 1;
1302} 1074}
1303#endif 1075#endif
1304 1076
1305// compare *op against *tmp and output differences 1077// compare *op against *tmp and output differences
1306void 1078static void
1307put (object_freezer &f, object *op, object *tmp) 1079write_diff (object_freezer &f, object *op, object *tmp)
1308{ 1080{
1309 static const keyword resist_save[NROFATTACKS] = { 1081 static const keyword resist_save[NROFATTACKS] = {
1310# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1082# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1311# include "attackinc.h" 1083# include "attackinc.h"
1312# undef def 1084# undef def
… …
1483 f.put (KW_msg, KW_endmsg, op->msg); 1255 f.put (KW_msg, KW_endmsg, op->msg);
1484 if (op->lore != tmp->lore) 1256 if (op->lore != tmp->lore)
1485 f.put (KW_lore, KW_endlore, op->lore); 1257 f.put (KW_lore, KW_endlore, op->lore);
1486 1258
1487 CMP_OUT (other_arch); 1259 CMP_OUT (other_arch);
1488 CMP_OUT (face); 1260
1261 if (op->face != tmp->face) f.put (KW_face, op->face ? &faces [op->face] : 0);
1489 1262
1490 if (op->animation_id != tmp->animation_id) 1263 if (op->animation_id != tmp->animation_id)
1491 if (op->animation_id) 1264 if (op->animation_id)
1492 { 1265 {
1493 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1266 f.put (KW_animation, animations[GET_ANIM_ID (op)].name);
… …
1601/* 1374/*
1602 * Dumps all variables in an object to a file. 1375 * Dumps all variables in an object to a file.
1603 * 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,
1604 * 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.
1605 */ 1378 */
1606void 1379bool
1607save_object (object_freezer &fp, object *op, int flag) 1380object::write (object_freezer &f)
1608{ 1381{
1609 /* 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
1610 * still save it. 1383 * still save it.
1611 */ 1384 */
1612 if (op->owner) 1385 if (owner)
1613 return; 1386 return true;
1614 1387
1615 /* If it is unpaid and we don't want to save those, just return. */
1616 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1617 return;
1618
1619 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1388 archetype *at = arch ? (archetype *)arch : empty_archetype;
1620 1389
1621 fp.put (KW_arch, at->name); 1390 f.put (KW_arch, at->name);
1622 put (fp, op, &at->clone); 1391 write_diff (f, this, &at->clone);
1623 1392
1624 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1625
1626 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1393 for (object *tmp = inv; tmp; tmp = tmp->below)
1627 save_object (fp, tmp, flag); 1394 tmp->write (f);
1628 1395
1629 fp.put (op); 1396 f.put (this);
1630 fp.put (KW_end); 1397 f.put (KW_end);
1398
1399 return true;
1631} 1400}
1632 1401
1402/////////////////////////////////////////////////////////////////////////////
1403
1404// generic resource file load,
1405// currently supports: region, treasures
1406bool load_resource_file (const char *filename)
1407{
1408 object_thawer f (filename);
1409
1410 f.next ();
1411
1412 for (;;)
1413 {
1414 switch (f.kw)
1415 {
1416 case KW_region:
1417 if (!region::read (f))
1418 return false;
1419 break;
1420
1421 case KW_treasure:
1422 case KW_treasureone:
1423 if (!treasurelist::read (f))
1424 return false;
1425 break;
1426
1427 case KW_EOF:
1428 return true;
1429
1430 default:
1431 if (!f.parse_error ("resource file"))
1432 return false;
1433 }
1434 }
1435}
1436

Diff Legend

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