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.49 by root, Fri Jan 19 17:54:15 2007 UTC vs.
Revision 1.59 by root, Fri Feb 16 19:43:40 2007 UTC

… …
24 24
25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects. 25/* Eneq(@csd.uu.se): Added weight-modifiers in environment of objects.
26 sub/add_weight will transcend the environment updating the carrying 26 sub/add_weight will transcend the environment updating the carrying
27 variable. */ 27 variable. */
28 28
29
30#include <global.h> 29#include <global.h>
31#include <loader.h> 30#include <loader.h>
32#include <sproto.h> 31#include <sproto.h>
33 32
34// future resource loader base class 33/////////////////////////////////////////////////////////////////////////////
35struct loader_base
36{
37 virtual archetype *get_arch (const char *name);
38 virtual void put_arch (archetype *arch);
39
40 virtual object *get_object (const char *name);
41 virtual void put_object (object *op);
42
43 virtual player *get_player ();
44 virtual void put_player (player *pl);
45
46 virtual region *get_region ();
47 virtual void put_region (region *region);
48
49 virtual facetile *get_face (const char *name);
50 virtual void put_face (facetile *face);
51
52 virtual treasurelist *get_treasure (const char *name, bool one = false);
53 virtual void put_treasure (treasurelist *treasure);
54
55 virtual animation *get_animation (const char *name);
56 virtual void put_animation (animation *anim);
57};
58
59// future generic resource loader
60// handles generic stuff valid in most files, such as
61// animations, treasures, faces and so on
62struct loader_generic : loader_base
63{
64 virtual region *get_region ();
65 virtual void put_region (region *region);
66
67 virtual facetile *get_face (const char *name);
68 virtual void put_face (facetile *face);
69
70 virtual treasurelist *get_treasure (const char *name, bool one = false);
71 virtual void put_treasure (treasurelist *treasure);
72
73 virtual animation *get_animation (const char *name);
74 virtual void put_animation (animation *anim);
75};
76 34
77/* Maps the MOVE_* values to names */ 35/* Maps the MOVE_* values to names */
78static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL }; 36static const char *const move_name[] = { "walk", "fly_low", "fly_high", "swim", "boat", NULL };
79 37
80/* This table is only necessary to convert objects that existed before the 38/* This table is only necessary to convert objects that existed before the
… …
305 * to check for objects to make sure there are no common errors. 263 * to check for objects to make sure there are no common errors.
306 */ 264 */
307static void 265static void
308check_loaded_object (object *op) 266check_loaded_object (object *op)
309{ 267{
310 int ip;
311
312 /* We do some specialised handling to handle legacy cases of name_pl. 268 /* We do some specialised handling to handle legacy cases of name_pl.
313 * If the object doesn't have a name_pl, we just use the object name - 269 * If the object doesn't have a name_pl, we just use the object name -
314 * this isn't perfect (things won't be properly pluralised), but works to 270 * this isn't perfect (things won't be properly pluralised), but works to
315 * that degree (5 heart is still quite understandable). But the case we 271 * that degree (5 heart is still quite understandable). But the case we
316 * also have to catch is if this object is not using the normal name for 272 * also have to catch is if this object is not using the normal name for
317 * the object. In that case, we also want to use the loaded name. 273 * the object. In that case, we also want to use the loaded name.
318 * Otherwise, what happens is that the the plural name will lose 274 * Otherwise, what happens is that the the plural name will lose
319 * information (appear as just 'hearts' and not 'goblins heart') 275 * information (appear as just 'hearts' and not 'goblins heart')
320 */ 276 */
321 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl) 277 if (op->arch && op->name != op->arch->clone.name && op->name_pl == op->arch->clone.name_pl)
322 op->name_pl = NULL; 278 op->name_pl = 0;
323 279
324 if (!op->name_pl) 280 if (!op->name_pl)
325 op->name_pl = op->name; 281 op->name_pl = op->name;
326 282
327 /* objects now have a materialname. try to patch it in */ 283 /* objects now have a materialname. try to patch it in */
… …
330 if (op->map != NULL) 286 if (op->map != NULL)
331 set_materialname (op, op->map->difficulty, NULL); 287 set_materialname (op, op->map->difficulty, NULL);
332 else 288 else
333 set_materialname (op, 5, NULL); 289 set_materialname (op, 5, NULL);
334 } 290 }
291
335 /* only do these when program is first run - a bit 292 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 293 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 294 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 295 * not in the ideal fashion.
339 */ 296 */
340 if ((op->type == WEAPON || op->type == BOW) && arch_init) 297 if ((op->type == WEAPON || op->type == BOW) && arch_init)
341 { 298 {
342 if (!op->skill) 299 if (!op->skill)
343 {
344 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ()); 300 LOG (llevError, "Weapon %s lacks a skill.\n", op->debug_desc ());
345 }
346 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) || 301 else if ((!strcmp (op->skill, "one handed weapons") && op->body_info[1] != -1) ||
347 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2)) 302 (!strcmp (op->skill, "two handed weapons") && op->body_info[1] != -2))
348 {
349 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill); 303 LOG (llevError, "weapon %s arm usage does not match skill: %d, %s\n", op->debug_desc (), op->body_info[1], &op->skill);
350 }
351 } 304 }
352 305
353 /* We changed last_heal to gen_sp_armour, which is what it 306 /* We changed last_heal to gen_sp_armour, which is what it
354 * really does for many objects. Need to catch any in maps 307 * really does for many objects. Need to catch any in maps
355 * that may have an old value. 308 * that may have an old value.
356 */ 309 */
357 if ((op->type == WEAPON) || 310 if (op->type == WEAPON
358 (op->type == ARMOUR) || (op->type == HELMET) || 311 || op->type == ARMOUR || op->type == HELMET
359 (op->type == SHIELD) || (op->type == RING) || 312 || op->type == SHIELD || op->type == RING
360 (op->type == BOOTS) || (op->type == GLOVES) || 313 || op->type == BOOTS || op->type == GLOVES
361 (op->type == AMULET) || (op->type == GIRDLE) || (op->type == BRACERS) || (op->type == CLOAK)) 314 || op->type == AMULET || op->type == GIRDLE
315 || op->type == BRACERS || op->type == CLOAK)
362 { 316 {
363 if (op->last_heal) 317 if (op->last_heal)
364 { 318 {
365 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ()); 319 LOG (llevDebug, "Object %s still has last_heal set, not gen_sp_armour\n", op->debug_desc ());
366 op->gen_sp_armour = op->last_heal; 320 op->gen_sp_armour = op->last_heal;
367 op->last_heal = 0; 321 op->last_heal = 0;
368 } 322 }
369 323
370 ip = calc_item_power (op, 0); 324 int ip = calc_item_power (op, 0);
325
371 /* Legacy objects from before item power was in the game */ 326 /* Legacy objects from before item power was in the game */
372 if (!op->item_power && ip) 327 if (!op->item_power && ip)
373 { 328 {
374 if (ip > 3) 329 if (ip > 3)
375 {
376 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip); 330 LOG (llevDebug, "Object %s had no item power, using %d\n", op->debug_desc (), ip);
377 } 331
378 op->item_power = ip; 332 op->item_power = ip;
379 } 333 }
334
380 /* Check for possibly bogus values. Has to meet both these criteria - 335 /* Check for possibly bogus values. Has to meet both these criteria -
381 * something that has item_power 1 is probably just fine if our calculated 336 * something that has item_power 1 is probably just fine if our calculated
382 * value is 1 or 2 - these values are small enough that hard to be precise. 337 * value is 1 or 2 - these values are small enough that hard to be precise.
383 * similarly, it item_power is 0, the first check will always pass, 338 * similarly, it item_power is 0, the first check will always pass,
384 * but not the second one. 339 * but not the second one.
385 */ 340 */
386 if (ip > 2 * op->item_power && ip > (op->item_power + 3)) 341 if (ip > 2 * op->item_power && ip > (op->item_power + 3))
387 {
388 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power); 342 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", op->debug_desc (), ip, op->item_power);
389 }
390
391 } 343 }
344
392 /* Old spellcasting object - need to load in the appropiate object */ 345 /* Old spellcasting object - need to load in the appropiate object */
393 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL || 346 if ((op->type == ROD || op->type == WAND || op->type == SCROLL || op->type == HORN || op->type == FIREWALL ||
394 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */ 347 /* POTIONS and ALTARS don't always cast spells, but if they do, update them */
395 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init) 348 ((op->type == POTION || op->type == ALTAR) && op->stats.sp)) && !op->inv && !arch_init)
396 { 349 {
397 object *tmp;
398
399 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal' 350 /* Fireall is bizarre in that spell type was stored in dam. Rest are 'normal'
400 * in that spell was stored in sp. 351 * in that spell was stored in sp.
401 */ 352 */
402 tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]); 353 object *tmp = get_archetype (spell_mapping[op->type == FIREWALL ? op->stats.dam : op->stats.sp]);
403 insert_ob_in_ob (tmp, op); 354 insert_ob_in_ob (tmp, op);
404 op->randomitems = NULL; /* So another spell isn't created for this object */ 355 op->randomitems = NULL; /* So another spell isn't created for this object */
405 } 356 }
357
406 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 358 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
407
408 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init) 359 if ((op->type == SPELLBOOK || op->type == RUNE) && op->slaying && !op->inv && !arch_init)
409 { 360 {
410 object *tmp;
411
412 tmp = get_archetype_by_object_name (op->slaying); 361 object *tmp = get_archetype_by_object_name (op->slaying);
413 insert_ob_in_ob (tmp, op); 362 insert_ob_in_ob (tmp, op);
414 op->randomitems = NULL; /* So another spell isn't created for this object */ 363 op->randomitems = NULL; /* So another spell isn't created for this object */
415 /* without this, value is all screwed up */ 364 /* without this, value is all screwed up */
416 op->value = op->arch->clone.value * op->inv->value; 365 op->value = op->arch->clone.value * op->inv->value;
417 } 366 }
… …
453 { 402 {
454 op->move_type = MOVE_ALL; 403 op->move_type = MOVE_ALL;
455 op->stats.maxhp = 0; 404 op->stats.maxhp = 0;
456 } 405 }
457 else 406 else
458 {
459 op->move_type = MOVE_WALK; 407 op->move_type = MOVE_WALK;
460 }
461 } 408 }
462 } 409 }
463 410
464} 411}
465 412
… …
526 } 473 }
527 } 474 }
528} 475}
529 476
530#define GET_FLAG(op,flag) \ 477#define GET_FLAG(op,flag) \
531 if (thawer.get_sint32 ()) \ 478 if (f.get_sint32 ()) \
532 SET_FLAG (op, flag); \ 479 SET_FLAG (op, flag); \
533 else \ 480 else \
534 CLEAR_FLAG (op, flag) \ 481 CLEAR_FLAG (op, flag) \
535 482
536int 483bool
537parse_object (object *op, object_thawer &thawer, int map_flags) 484object::parse_kv (object_thawer &f)
538{ 485{
539 bool ismore = 0; 486 assert (f.kw == KW_object || f.kw == KW_arch);
487
488 if (f.kw == KW_object)
489 f.get (name); // preset name from object name
490
491 f.next ();
492
540 object *op_inv = op->inv; 493 object *op_inv = inv;
541 494
542 for (;;) 495 for (;;)
543 { 496 {
544 keyword kw = thawer.get_kv ();
545
546 switch (kw) 497 switch (f.kw)
547 { 498 {
548 case KW_Object: // uppercase alias
549 case KW_object:
550 thawer.get (op->name);
551
552 if (op->arch)
553 op->arch->name = op->name;
554
555 break;
556
557 case KW_uuid: 499 case KW_uuid:
558 if (const char *s = thawer.get_str ()) 500 if (const char *s = f.get_str ())
559 { 501 {
560 unsigned int version; 502 unsigned int version;
561 unsigned long long seq; 503 unsigned long long seq;
562 504
563 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1) 505 if (2 == sscanf (s, "<%d.%llx>", &version, &seq) && version == 1)
564 { 506 {
565 op->uuid.seq = seq; 507 uuid.seq = seq;
566 break; 508 break;
567 } 509 }
568 } 510 }
569 511
570 op->uuid = gen_uuid (); 512 uuid = gen_uuid ();
571 break; 513 break;
572 514
573 case KW_oid: 515 case KW_oid:
574 thawer.get (op, thawer.get_sint32 ()); 516 f.get (this, f.get_sint32 ());
575 break; 517 break;
576 518
577 case KW_name: thawer.get (op->name); break; 519 case KW_name: f.get (name); break;
578 case KW_name_pl: thawer.get (op->name_pl); break; 520 case KW_name_pl: f.get (name_pl); break;
579 case KW_title: thawer.get (op->title); break; 521 case KW_title: f.get (title); break;
580 case KW_custom_name: thawer.get (op->custom_name); break; 522 case KW_custom_name: f.get (custom_name); break;
581 523
582 case KW_attach: thawer.get_ornull (op->attach); break; 524 case KW_attach: f.get_ornull (attach); break;
583 case KW_skill: thawer.get_ornull (op->skill); break; 525 case KW_skill: f.get_ornull (skill); break;
584 case KW_race: thawer.get_ornull (op->race); break; 526 case KW_race: f.get_ornull (race); break;
585 case KW_slaying: thawer.get_ornull (op->slaying); break; 527 case KW_slaying: f.get_ornull (slaying); break;
586 528
587 case KW_arch: 529 case KW_arch:
588 { 530 {
589 const char *str = thawer.get_str ();
590
591 if (op->arch)
592 {
593 /* If op->arch has been set, then this new object
594 * must be part of the inventory. So process
595 * appropriately.
596 */
597 archetype *arch = archetype::find (str);
598
599 object *tmp;
600
601 if (arch)
602 tmp = arch_to_object (arch);
603 else
604 {
605 tmp = object::create (); 531 object *tmp = object::read (f);
606 /* record the name of the broken object */
607 tmp->name = str;
608 }
609
610 // decativate the object we, as we are still going
611 // to read the speed value. Objects should be activated
612 // when the map, object or player is completly loaded.
613 tmp->deactivate (); 532 tmp->deactivate ();
614 533
615 parse_object (tmp, thawer, map_flags);
616
617 if (tmp->arch)
618 { 534 {
619 // was: insert_ob_in_ob (tmp, op); 535 // was: insert_ob_in_ob (tmp, op);
620 // but manually adding it can improve map loading times a lot 536 // but manually adding it can improve map loading times a lot
621 // also, appending instead of prepending keeps the 537 // also, appending instead of prepending keeps the
622 // save ordering the same between repeated load/saves. 538 // save ordering the same between repeated load/saves.
623 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 539 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL);
624 CLEAR_FLAG (tmp, FLAG_REMOVED); 540 CLEAR_FLAG (tmp, FLAG_REMOVED);
625 541
626 if (!op_inv) 542 if (!op_inv)
627 { 543 {
628 op->inv = tmp;
629 tmp->above = 0;
630 }
631 else
632 {
633 while (op_inv->below)
634 op_inv = op_inv->below;
635
636 op_inv->below = tmp;
637 tmp->above = op_inv;
638 }
639
640 tmp->below = 0;
641 tmp->env = op;
642 op_inv = tmp; 544 inv = tmp;
545 tmp->above = 0;
643 } 546 }
644 else 547 else
645 { 548 {
646 LOG (llevDebug, "Discarding object without arch: %s\n", tmp->name ? (const char *) tmp->name : "(null)"); 549 while (op_inv->below)
647 tmp->destroy (); 550 op_inv = op_inv->below;
551
552 op_inv->below = tmp;
553 tmp->above = op_inv;
648 } 554 }
555
556 tmp->below = 0;
557 tmp->env = this;
558 op_inv = tmp;
649 } 559 }
650 else
651 {
652 /* This is the actual archetype definition then */
653 op->arch = archetype::find (str);
654
655 if (op->arch)
656 {
657 op->arch->clone.copy_to (op);
658 // copy_to activates, this should be fixed properly
659 op->deactivate ();
660 }
661 else if (!arch_init)
662 /* record the name of the broken object */
663 op->name = str;
664 }
665 } 560 }
666 break; 561 continue;
667 562
668 case KW_other_arch: 563 case KW_other_arch:
669 op->other_arch = archetype::find (thawer.get_str ()); 564 other_arch = archetype::find (f.get_str ());
670 break; 565 break;
671 566
672 case KW_animation: 567 case KW_animation:
673 { 568 {
569 CLEAR_FLAG (this, FLAG_ANIMATE);
570 animation_id = 0;
571
674 const char *str = thawer.get_str (); 572 const char *str = f.get_str ();
675
676 if (!str)
677 {
678 op->animation_id = 0;
679 CLEAR_FLAG (op, FLAG_ANIMATE);
680 }
681 else if ((op->animation_id = find_animation (str))) 573 if (str && (animation_id = find_animation (str)))
682 SET_FLAG (op, FLAG_ANIMATE); 574 SET_FLAG (this, FLAG_ANIMATE);
683 } 575 }
684
685 break; 576 break;
686 577
687 case KW_last_heal: thawer.get (op->last_heal); break; 578 case KW_last_heal: f.get (last_heal); break;
688 case KW_last_sp: thawer.get (op->last_sp); break; 579 case KW_last_sp: f.get (last_sp); break;
689 case KW_last_grace: thawer.get (op->last_grace); break; 580 case KW_last_grace: f.get (last_grace); break;
690 case KW_last_eat: thawer.get (op->last_eat); break; 581 case KW_last_eat: f.get (last_eat); break;
691 case KW_speed_left: thawer.get (op->speed_left); break; 582 case KW_speed_left: f.get (speed_left); break;
692 583
693 case KW_speed: 584 case KW_speed:
694 thawer.get (op->speed); 585 f.get (speed);
695 586
696 //TODO: maybe do in check_object 587 //TODO: maybe do in check_object
697 // removed check for style maps 588 // removed check for style maps
698 if (op->speed < 0) 589 if (speed < 0)
699 op->speed_left = op->speed_left - rndm (); 590 speed_left = speed_left - rndm ();
700 591
701 break; 592 break;
702 593
703 case KW_slow_move: 594 case KW_slow_move:
704 op->move_slow |= MOVE_WALK; 595 move_slow |= MOVE_WALK;
705 thawer.get (op->move_slow_penalty); 596 f.get (move_slow_penalty);
706 break; 597 break;
707 598
708 case KW_face: 599 case KW_face:
709 op->face = &new_faces[FindFace (thawer.get_str (), 0)]; 600 face = &new_faces[FindFace (f.get_str (), 0)];
710 break; 601 break;
711 602
712 case KW_x: thawer.get (op->x); break; 603 case KW_x: f.get (x); break;
713 case KW_y: thawer.get (op->y); break; 604 case KW_y: f.get (y); break;
714 605
715 case KW_Str: // uppercase alias 606 case KW_Str: // uppercase alias
716 case KW_str: thawer.get (op->stats.Str); break; 607 case KW_str: f.get (stats.Str); break;
717 case KW_Dex: // uppercase alias 608 case KW_Dex: // uppercase alias
718 case KW_dex: thawer.get (op->stats.Dex); break; 609 case KW_dex: f.get (stats.Dex); break;
719 case KW_Con: // uppercase alias 610 case KW_Con: // uppercase alias
720 case KW_con: thawer.get (op->stats.Con); break; 611 case KW_con: f.get (stats.Con); break;
721 case KW_Wis: // uppercase alias 612 case KW_Wis: // uppercase alias
722 case KW_wis: thawer.get (op->stats.Wis); break; 613 case KW_wis: f.get (stats.Wis); break;
723 case KW_Cha: // uppercase alias 614 case KW_Cha: // uppercase alias
724 case KW_cha: thawer.get (op->stats.Cha); break; 615 case KW_cha: f.get (stats.Cha); break;
725 case KW_Int: // uppercase alias 616 case KW_Int: // uppercase alias
726 case KW_int: thawer.get (op->stats.Int); break; 617 case KW_int: f.get (stats.Int); break;
727 case KW_Pow: // uppercase alias 618 case KW_Pow: // uppercase alias
728 case KW_pow: thawer.get (op->stats.Pow); break; 619 case KW_pow: f.get (stats.Pow); break;
729 620
730 case KW_hp: thawer.get (op->stats.hp); break; 621 case KW_hp: f.get (stats.hp); break;
731 case KW_maxhp: thawer.get (op->stats.maxhp); break; 622 case KW_maxhp: f.get (stats.maxhp); break;
732 case KW_sp: thawer.get (op->stats.sp); break; 623 case KW_sp: f.get (stats.sp); break;
733 case KW_maxsp: thawer.get (op->stats.maxsp); break; 624 case KW_maxsp: f.get (stats.maxsp); break;
734 case KW_grace: thawer.get (op->stats.grace); break; 625 case KW_grace: f.get (stats.grace); break;
735 case KW_maxgrace: thawer.get (op->stats.maxgrace); break; 626 case KW_maxgrace: f.get (stats.maxgrace); break;
736 627
737 case KW_exp: thawer.get (op->stats.exp); break; 628 case KW_exp: f.get (stats.exp); break;
738 case KW_perm_exp: thawer.get (op->perm_exp); break; 629 case KW_perm_exp: f.get (perm_exp); break;
739 case KW_food: thawer.get (op->stats.food); break; 630 case KW_food: f.get (stats.food); break;
740 case KW_dam: thawer.get (op->stats.dam); break; 631 case KW_dam: f.get (stats.dam); break;
741 case KW_wc: thawer.get (op->stats.wc); break; 632 case KW_wc: f.get (stats.wc); break;
742 case KW_ac: thawer.get (op->stats.ac); break; 633 case KW_ac: f.get (stats.ac); break;
743 case KW_nrof: thawer.get (op->nrof); break; 634 case KW_nrof: f.get (nrof); break;
744 case KW_level: thawer.get (op->level); break; 635 case KW_level: f.get (level); break;
745 case KW_direction: thawer.get (op->direction); break; 636 case KW_direction: f.get (direction); break;
746 case KW_type: thawer.get (op->type); break; 637 case KW_type: f.get (type); break;
747 case KW_subtype: thawer.get (op->subtype); break; 638 case KW_subtype: f.get (subtype); break;
748 case KW_value: thawer.get (op->value); break; 639 case KW_value: f.get (value); break;
749 case KW_weight: thawer.get (op->weight); break; 640 case KW_weight: f.get (weight); break;
750 case KW_carrying: thawer.get (op->carrying); break; 641 case KW_carrying: f.get (carrying); break;
751 case KW_attacktype: thawer.get (op->attacktype); break; 642 case KW_attacktype: f.get (attacktype); break;
752 case KW_path_attuned: thawer.get (op->path_attuned); break; 643 case KW_path_attuned: f.get (path_attuned); break;
753 case KW_path_repelled: thawer.get (op->path_repelled); break; 644 case KW_path_repelled: f.get (path_repelled); break;
754 case KW_path_denied: thawer.get (op->path_denied); break; 645 case KW_path_denied: f.get (path_denied); break;
755 case KW_invisible: thawer.get (op->invisible); break; 646 case KW_invisible: f.get (invisible); break;
756 case KW_magic: thawer.get (op->magic); break; 647 case KW_magic: f.get (magic); break;
757 case KW_state: thawer.get (op->state); break; 648 case KW_state: f.get (state); break;
758 case KW_move_slow_penalty: thawer.get (op->move_slow_penalty); break; 649 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
759 case KW_material: thawer.get (op->material); break; 650 case KW_material: f.get (materials); break; //TODO: nuke
760 case KW_materialname: thawer.get (op->materialname); break; 651 case KW_materialname: f.get (materialname); break;
761 652
762 /* These are the new values */ 653 /* These are the new values */
763 case KW_move_block: set_move (op->move_block, thawer.get_str ()); break; 654 case KW_move_block: set_move (move_block, f.get_str ()); break;
764 case KW_move_allow: set_move (op->move_allow, thawer.get_str ()); break; 655 case KW_move_allow: set_move (move_allow, f.get_str ()); break;
765 case KW_move_type: set_move (op->move_type, thawer.get_str ()); break; 656 case KW_move_type: set_move (move_type, f.get_str ()); break;
766 case KW_move_on: set_move (op->move_on, thawer.get_str ()); break; 657 case KW_move_on: set_move (move_on, f.get_str ()); break;
767 case KW_move_off: set_move (op->move_off, thawer.get_str ()); break; 658 case KW_move_off: set_move (move_off, f.get_str ()); break;
768 case KW_move_slow: set_move (op->move_slow, thawer.get_str ()); break; 659 case KW_move_slow: set_move (move_slow, f.get_str ()); break;
769 660
770 /* These are all legacy - any new objects should use the move_ .. values */ 661 /* These are all legacy - any new objects should use the move_ .. values */
771 case KW_no_pass: 662 case KW_no_pass:
772 { 663 {
773 if (thawer.get_sint32 ()) 664 if (f.get_sint32 ())
774 op->move_block = MOVE_ALL; 665 move_block = MOVE_ALL;
775 else 666 else
776 op->move_block = 0; 667 move_block = 0;
777 } 668 }
778 669
779 break; 670 break;
780 671
781 /* These are all legacy - any new objects should use the move_ .. values */ 672 /* These are all legacy - any new objects should use the move_ .. values */
782 case KW_walk_on: 673 case KW_walk_on:
783 { 674 {
784 if (thawer.get_sint32 ()) 675 if (f.get_sint32 ())
785 op->move_on |= MOVE_WALK; 676 move_on |= MOVE_WALK;
786 else 677 else
787 op->move_on &= ~MOVE_WALK; 678 move_on &= ~MOVE_WALK;
788 } 679 }
789 680
790 break; 681 break;
791 682
792 /* These are all legacy - any new objects should use the move_ .. values */ 683 /* These are all legacy - any new objects should use the move_ .. values */
793 case KW_walk_off: 684 case KW_walk_off:
794 { 685 {
795 if (thawer.get_sint32 ()) 686 if (f.get_sint32 ())
796 op->move_off |= MOVE_WALK; 687 move_off |= MOVE_WALK;
797 else 688 else
798 op->move_off &= ~MOVE_WALK; 689 move_off &= ~MOVE_WALK;
799 } 690 }
800 break; 691 break;
801 692
802 /* These are all legacy - any new objects should use the move_ .. values */ 693 /* These are all legacy - any new objects should use the move_ .. values */
803 case KW_fly_on: 694 case KW_fly_on:
804 { 695 {
805 if (thawer.get_sint32 ()) 696 if (f.get_sint32 ())
806 op->move_on |= MOVE_FLY_LOW; 697 move_on |= MOVE_FLY_LOW;
807 else 698 else
808 op->move_on &= ~MOVE_FLY_LOW; 699 move_on &= ~MOVE_FLY_LOW;
809 } 700 }
810 break; 701 break;
811 702
812 /* These are all legacy - any new objects should use the move_ .. values */ 703 /* These are all legacy - any new objects should use the move_ .. values */
813 case KW_fly_off: 704 case KW_fly_off:
814 { 705 {
815 if (thawer.get_sint32 ()) 706 if (f.get_sint32 ())
816 op->move_off |= MOVE_FLY_LOW; 707 move_off |= MOVE_FLY_LOW;
817 else 708 else
818 op->move_off &= ~MOVE_FLY_LOW; 709 move_off &= ~MOVE_FLY_LOW;
819 } 710 }
820 break; 711 break;
821 712
822 //TODO: remove these after converting archetypes 713 //TODO: remove these after converting archetypes
823 case KW_can_use_wand: 714 case KW_can_use_wand:
824 GET_FLAG (op, FLAG_USE_RANGE); 715 GET_FLAG (this, FLAG_USE_RANGE);
825 break; 716 break;
826 717
827 /* These are all legacy - any new objects should use the move_ .. values */ 718 /* These are all legacy - any new objects should use the move_ .. values */
828 case KW_flying: 719 case KW_flying:
829 { 720 {
830 if (thawer.get_sint32 ()) 721 if (f.get_sint32 ())
831 op->move_type |= MOVE_FLY_LOW; 722 move_type |= MOVE_FLY_LOW;
832 else 723 else
833 op->move_type &= ~MOVE_FLY_LOW; 724 move_type &= ~MOVE_FLY_LOW;
834 } 725 }
835 break; 726 break;
836 727
837 728
838 case KW_identified: 729 case KW_identified:
839 GET_FLAG (op, FLAG_IDENTIFIED); 730 GET_FLAG (this, FLAG_IDENTIFIED);
840 //TODO: move to check_object or so 731 //TODO: move to check_object or so
841 if (QUERY_FLAG (op, FLAG_IDENTIFIED)) 732 if (QUERY_FLAG (this, FLAG_IDENTIFIED))
842 CLEAR_FLAG (op, FLAG_KNOWN_MAGICAL); 733 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL);
843 734
844 break; 735 break;
845 736
846 case KW_wiz: 737 case KW_wiz:
847 GET_FLAG (op, FLAG_WIZ); 738 GET_FLAG (this, FLAG_WIZ);
848 //TODO: move to check_object 739 //TODO: move to check_object
849 if (QUERY_FLAG (op, FLAG_WIZ)) 740 if (QUERY_FLAG (this, FLAG_WIZ))
850 { 741 {
851 SET_FLAG (op, FLAG_WAS_WIZ); 742 SET_FLAG (this, FLAG_WAS_WIZ);
852 SET_FLAG (op, FLAG_WIZPASS); 743 SET_FLAG (this, FLAG_WIZPASS);
853 SET_FLAG (op, FLAG_WIZCAST); 744 SET_FLAG (this, FLAG_WIZCAST);
854 } 745 }
855 else 746 else
856 { 747 {
857 CLEAR_FLAG (op, FLAG_WIZPASS); 748 CLEAR_FLAG (this, FLAG_WIZPASS);
858 CLEAR_FLAG (op, FLAG_WIZCAST); 749 CLEAR_FLAG (this, FLAG_WIZCAST);
859 } 750 }
860 break; 751 break;
861 752
862 case KW_friendly: 753 case KW_friendly:
863 if (thawer.get_sint32 ()) 754 if (f.get_sint32 ())
864 if (op->type != PLAYER) 755 if (type != PLAYER)
865 add_friendly_object (op); 756 add_friendly_object (this);
866 757
867 break; 758 break;
868 759
869 case KW_monster: GET_FLAG (op, FLAG_MONSTER); break; 760 case KW_monster: GET_FLAG (this, FLAG_MONSTER); break;
870 case KW_neutral: GET_FLAG (op, FLAG_NEUTRAL); break; 761 case KW_neutral: GET_FLAG (this, FLAG_NEUTRAL); break;
871 case KW_no_attack: GET_FLAG (op, FLAG_NO_ATTACK); break; 762 case KW_no_attack: GET_FLAG (this, FLAG_NO_ATTACK); break;
872 case KW_no_damage: GET_FLAG (op, FLAG_NO_DAMAGE); break; 763 case KW_no_damage: GET_FLAG (this, FLAG_NO_DAMAGE); break;
873 case KW_obj_original: GET_FLAG (op, FLAG_OBJ_ORIGINAL); break; 764 case KW_obj_original: GET_FLAG (this, FLAG_OBJ_ORIGINAL); break;
874 case KW_generator: GET_FLAG (op, FLAG_GENERATOR); break; 765 case KW_generator: GET_FLAG (this, FLAG_GENERATOR); break;
875 case KW_use_content_on_gen: GET_FLAG (op, FLAG_CONTENT_ON_GEN); break; 766 case KW_use_content_on_gen: GET_FLAG (this, FLAG_CONTENT_ON_GEN); break;
876 case KW_is_thrown: GET_FLAG (op, FLAG_IS_THROWN); break; 767 case KW_is_thrown: GET_FLAG (this, FLAG_IS_THROWN); break;
877 case KW_auto_apply: GET_FLAG (op, FLAG_AUTO_APPLY); break; 768 case KW_auto_apply: GET_FLAG (this, FLAG_AUTO_APPLY); break;
878 case KW_see_invisible: GET_FLAG (op, FLAG_SEE_INVISIBLE); break; 769 case KW_see_invisible: GET_FLAG (this, FLAG_SEE_INVISIBLE); break;
879 case KW_can_roll: GET_FLAG (op, FLAG_CAN_ROLL); break; 770 case KW_can_roll: GET_FLAG (this, FLAG_CAN_ROLL); break;
880 case KW_overlay_floor: GET_FLAG (op, FLAG_OVERLAY_FLOOR); break; 771 case KW_overlay_floor: GET_FLAG (this, FLAG_OVERLAY_FLOOR); break;
881 case KW_is_turnable: GET_FLAG (op, FLAG_IS_TURNABLE); break; 772 case KW_is_turnable: GET_FLAG (this, FLAG_IS_TURNABLE); break;
882 case KW_is_used_up: GET_FLAG (op, FLAG_IS_USED_UP); break; 773 case KW_is_used_up: GET_FLAG (this, FLAG_IS_USED_UP); break;
883 case KW_alive: GET_FLAG (op, FLAG_ALIVE); break; 774 case KW_alive: GET_FLAG (this, FLAG_ALIVE); break;
884 case KW_applied: GET_FLAG (op, FLAG_APPLIED); break; 775 case KW_applied: GET_FLAG (this, FLAG_APPLIED); break;
885 case KW_unpaid: GET_FLAG (op, FLAG_UNPAID); break; 776 case KW_unpaid: GET_FLAG (this, FLAG_UNPAID); break;
886 case KW_is_animated: GET_FLAG (op, FLAG_ANIMATE); break; 777 case KW_is_animated: GET_FLAG (this, FLAG_ANIMATE); break;
887 case KW_no_pick: GET_FLAG (op, FLAG_NO_PICK); break; 778 case KW_no_pick: GET_FLAG (this, FLAG_NO_PICK); break;
888 case KW_reflecting: GET_FLAG (op, FLAG_REFLECTING); break; 779 case KW_reflecting: GET_FLAG (this, FLAG_REFLECTING); break;
889 case KW_changing: GET_FLAG (op, FLAG_CHANGING); break; 780 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
890 case KW_splitting: GET_FLAG (op, FLAG_SPLITTING); break; 781 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
891 case KW_hitback: GET_FLAG (op, FLAG_HITBACK); break; 782 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
892 case KW_startequip: GET_FLAG (op, FLAG_STARTEQUIP); break; 783 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
893 case KW_blocksview: GET_FLAG (op, FLAG_BLOCKSVIEW); break; 784 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
894 case KW_undead: GET_FLAG (op, FLAG_UNDEAD); break; 785 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
895 case KW_scared: GET_FLAG (op, FLAG_SCARED); break; 786 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
896 case KW_unaggressive: GET_FLAG (op, FLAG_UNAGGRESSIVE); break; 787 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
897 case KW_reflect_missile: GET_FLAG (op, FLAG_REFL_MISSILE); break; 788 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
898 case KW_reflect_spell: GET_FLAG (op, FLAG_REFL_SPELL); break; 789 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
899 case KW_no_magic: GET_FLAG (op, FLAG_NO_MAGIC); break; 790 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
900 case KW_no_drop: GET_FLAG (op, FLAG_NO_DROP); break; 791 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
901 case KW_random_movement: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 792 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
902 case KW_was_wiz: GET_FLAG (op, FLAG_WAS_WIZ); break; 793 case KW_was_wiz: GET_FLAG (this, FLAG_WAS_WIZ); break;
903 case KW_no_fix_player: GET_FLAG (op, FLAG_NO_FIX_PLAYER); break; 794 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
904 case KW_is_lightable: GET_FLAG (op, FLAG_IS_LIGHTABLE); break; 795 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
905 case KW_tear_down: GET_FLAG (op, FLAG_TEAR_DOWN); break; 796 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
906 case KW_can_use_shield: GET_FLAG (op, FLAG_USE_SHIELD); break; 797 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
907 case KW_can_cast_spell: GET_FLAG (op, FLAG_CAST_SPELL); break; 798 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
908 case KW_can_use_scroll: GET_FLAG (op, FLAG_USE_SCROLL); break; 799 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
909 case KW_can_use_range: GET_FLAG (op, FLAG_USE_RANGE); break; 800 case KW_can_use_range: GET_FLAG (this, FLAG_USE_RANGE); break;
910 case KW_can_use_bow: GET_FLAG (op, FLAG_USE_BOW); break; 801 case KW_can_use_bow: GET_FLAG (this, FLAG_USE_BOW); break;
911 case KW_can_use_armour: GET_FLAG (op, FLAG_USE_ARMOUR); break; 802 case KW_can_use_armour: GET_FLAG (this, FLAG_USE_ARMOUR); break;
912 case KW_can_use_weapon: GET_FLAG (op, FLAG_USE_WEAPON); break; 803 case KW_can_use_weapon: GET_FLAG (this, FLAG_USE_WEAPON); break;
913 case KW_can_use_ring: GET_FLAG (op, FLAG_USE_RING); break; 804 case KW_can_use_ring: GET_FLAG (this, FLAG_USE_RING); break;
914 case KW_has_ready_bow: GET_FLAG (op, FLAG_READY_BOW); break; 805 case KW_has_ready_bow: GET_FLAG (this, FLAG_READY_BOW); break;
915 case KW_has_ready_range: GET_FLAG (op, FLAG_READY_RANGE); break; 806 case KW_has_ready_range: GET_FLAG (this, FLAG_READY_RANGE); break;
916 case KW_xrays: GET_FLAG (op, FLAG_XRAYS); break; 807 case KW_xrays: GET_FLAG (this, FLAG_XRAYS); break;
917 case KW_is_floor: GET_FLAG (op, FLAG_IS_FLOOR); break; 808 case KW_is_floor: GET_FLAG (this, FLAG_IS_FLOOR); break;
918 case KW_lifesave: GET_FLAG (op, FLAG_LIFESAVE); break; 809 case KW_lifesave: GET_FLAG (this, FLAG_LIFESAVE); break;
919 case KW_no_strength: GET_FLAG (op, FLAG_NO_STRENGTH); break; 810 case KW_no_strength: GET_FLAG (this, FLAG_NO_STRENGTH); break;
920 case KW_sleep: GET_FLAG (op, FLAG_SLEEP); break; 811 case KW_sleep: GET_FLAG (this, FLAG_SLEEP); break;
921 case KW_stand_still: GET_FLAG (op, FLAG_STAND_STILL); break; 812 case KW_stand_still: GET_FLAG (this, FLAG_STAND_STILL); break;
922 case KW_random_move: GET_FLAG (op, FLAG_RANDOM_MOVE); break; 813 case KW_random_move: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
923 case KW_only_attack: GET_FLAG (op, FLAG_ONLY_ATTACK); break; 814 case KW_only_attack: GET_FLAG (this, FLAG_ONLY_ATTACK); break;
924 case KW_activate_on_push: GET_FLAG (op, FLAG_ACTIVATE_ON_PUSH); break; 815 case KW_activate_on_push: GET_FLAG (this, FLAG_ACTIVATE_ON_PUSH); break;
925 case KW_activate_on_release: GET_FLAG (op, FLAG_ACTIVATE_ON_RELEASE); break; 816 case KW_activate_on_release: GET_FLAG (this, FLAG_ACTIVATE_ON_RELEASE); break;
926 case KW_confused: GET_FLAG (op, FLAG_CONFUSED); break; 817 case KW_confused: GET_FLAG (this, FLAG_CONFUSED); break;
927 case KW_stealth: GET_FLAG (op, FLAG_STEALTH); break; 818 case KW_stealth: GET_FLAG (this, FLAG_STEALTH); break;
928 case KW_cursed: GET_FLAG (op, FLAG_CURSED); break; 819 case KW_cursed: GET_FLAG (this, FLAG_CURSED); break;
929 case KW_damned: GET_FLAG (op, FLAG_DAMNED); break; 820 case KW_damned: GET_FLAG (this, FLAG_DAMNED); break;
930 case KW_see_anywhere: GET_FLAG (op, FLAG_SEE_ANYWHERE); break; 821 case KW_see_anywhere: GET_FLAG (this, FLAG_SEE_ANYWHERE); break;
931 case KW_known_magical: GET_FLAG (op, FLAG_KNOWN_MAGICAL); break; 822 case KW_known_magical: GET_FLAG (this, FLAG_KNOWN_MAGICAL); break;
932 case KW_known_cursed: GET_FLAG (op, FLAG_KNOWN_CURSED); break; 823 case KW_known_cursed: GET_FLAG (this, FLAG_KNOWN_CURSED); break;
933 case KW_can_use_skill: GET_FLAG (op, FLAG_CAN_USE_SKILL); break; 824 case KW_can_use_skill: GET_FLAG (this, FLAG_CAN_USE_SKILL); break;
934 case KW_been_applied: GET_FLAG (op, FLAG_BEEN_APPLIED); break; 825 case KW_been_applied: GET_FLAG (this, FLAG_BEEN_APPLIED); break;
935 case KW_has_ready_scroll: GET_FLAG (op, FLAG_READY_SCROLL); break; 826 case KW_has_ready_scroll: GET_FLAG (this, FLAG_READY_SCROLL); break;
936 case KW_can_use_rod: GET_FLAG (op, FLAG_USE_ROD); break; 827 case KW_can_use_rod: GET_FLAG (this, FLAG_USE_ROD); break;
937 case KW_can_use_horn: GET_FLAG (op, FLAG_USE_HORN); break; 828 case KW_can_use_horn: GET_FLAG (this, FLAG_USE_HORN); break;
938 case KW_unique: GET_FLAG (op, FLAG_UNIQUE); break; 829 case KW_unique: GET_FLAG (this, FLAG_UNIQUE); break;
939 case KW_make_invisible: GET_FLAG (op, FLAG_MAKE_INVIS); break; 830 case KW_make_invisible: GET_FLAG (this, FLAG_MAKE_INVIS); break;
940 case KW_inv_locked: GET_FLAG (op, FLAG_INV_LOCKED); break; 831 case KW_inv_locked: GET_FLAG (this, FLAG_INV_LOCKED); break;
941 case KW_is_wooded: GET_FLAG (op, FLAG_IS_WOODED); break; 832 case KW_is_wooded: GET_FLAG (this, FLAG_IS_WOODED); break;
942 case KW_is_hilly: GET_FLAG (op, FLAG_IS_HILLY); break; 833 case KW_is_hilly: GET_FLAG (this, FLAG_IS_HILLY); break;
943 case KW_is_water: GET_FLAG (op, FLAG_IS_WATER); break; 834 case KW_is_water: GET_FLAG (this, FLAG_IS_WATER); break;
944 case KW_has_ready_skill: GET_FLAG (op, FLAG_READY_SKILL); break; 835 case KW_has_ready_skill: GET_FLAG (this, FLAG_READY_SKILL); break;
945 case KW_has_ready_weapon: GET_FLAG (op, FLAG_READY_WEAPON); break; 836 case KW_has_ready_weapon: GET_FLAG (this, FLAG_READY_WEAPON); break;
946 case KW_no_skill_ident: GET_FLAG (op, FLAG_NO_SKILL_IDENT); break; 837 case KW_no_skill_ident: GET_FLAG (this, FLAG_NO_SKILL_IDENT); break;
947 case KW_is_blind: GET_FLAG (op, FLAG_BLIND); break; 838 case KW_is_blind: GET_FLAG (this, FLAG_BLIND); break;
948 case KW_can_see_in_dark: GET_FLAG (op, FLAG_SEE_IN_DARK); break; 839 case KW_can_see_in_dark: GET_FLAG (this, FLAG_SEE_IN_DARK); break;
949 case KW_is_cauldron: GET_FLAG (op, FLAG_IS_CAULDRON); break; 840 case KW_is_cauldron: GET_FLAG (this, FLAG_IS_CAULDRON); break;
950 case KW_no_steal: GET_FLAG (op, FLAG_NO_STEAL); break; 841 case KW_no_steal: GET_FLAG (this, FLAG_NO_STEAL); break;
951 case KW_one_hit: GET_FLAG (op, FLAG_ONE_HIT); break; 842 case KW_one_hit: GET_FLAG (this, FLAG_ONE_HIT); break;
952 case KW_berserk: GET_FLAG (op, FLAG_BERSERK); break; 843 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
953 case KW_is_buildable: GET_FLAG (op, FLAG_IS_BUILDABLE); break; 844 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
954 case KW_destroy_on_death: GET_FLAG (op, FLAG_DESTROY_ON_DEATH); break; 845 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
955 846
956 case KW_armour: thawer.get (op->resist[ATNR_PHYSICAL]); break; 847 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
957 case KW_resist_physical: thawer.get (op->resist[ATNR_PHYSICAL]); break; 848 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
958 case KW_resist_magic: thawer.get (op->resist[ATNR_MAGIC]); break; 849 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
959 case KW_resist_fire: thawer.get (op->resist[ATNR_FIRE]); break; 850 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
960 case KW_resist_electricity: thawer.get (op->resist[ATNR_ELECTRICITY]); break; 851 case KW_resist_electricity: f.get (resist[ATNR_ELECTRICITY]); break;
961 case KW_resist_cold: thawer.get (op->resist[ATNR_COLD]); break; 852 case KW_resist_cold: f.get (resist[ATNR_COLD]); break;
962 case KW_resist_confusion: thawer.get (op->resist[ATNR_CONFUSION]); break; 853 case KW_resist_confusion: f.get (resist[ATNR_CONFUSION]); break;
963 case KW_resist_acid: thawer.get (op->resist[ATNR_ACID]); break; 854 case KW_resist_acid: f.get (resist[ATNR_ACID]); break;
964 case KW_resist_drain: thawer.get (op->resist[ATNR_DRAIN]); break; 855 case KW_resist_drain: f.get (resist[ATNR_DRAIN]); break;
965 case KW_resist_weaponmagic: thawer.get (op->resist[ATNR_WEAPONMAGIC]); break; 856 case KW_resist_weaponmagic: f.get (resist[ATNR_WEAPONMAGIC]); break;
966 case KW_resist_ghosthit: thawer.get (op->resist[ATNR_GHOSTHIT]); break; 857 case KW_resist_ghosthit: f.get (resist[ATNR_GHOSTHIT]); break;
967 case KW_resist_poison: thawer.get (op->resist[ATNR_POISON]); break; 858 case KW_resist_poison: f.get (resist[ATNR_POISON]); break;
968 case KW_resist_slow: thawer.get (op->resist[ATNR_SLOW]); break; 859 case KW_resist_slow: f.get (resist[ATNR_SLOW]); break;
969 case KW_resist_paralyze: thawer.get (op->resist[ATNR_PARALYZE]); break; 860 case KW_resist_paralyze: f.get (resist[ATNR_PARALYZE]); break;
970 case KW_resist_turn_undead: thawer.get (op->resist[ATNR_TURN_UNDEAD]); break; 861 case KW_resist_turn_undead: f.get (resist[ATNR_TURN_UNDEAD]); break;
971 case KW_resist_fear: thawer.get (op->resist[ATNR_FEAR]); break; 862 case KW_resist_fear: f.get (resist[ATNR_FEAR]); break;
972 case KW_resist_cancellation: thawer.get (op->resist[ATNR_CANCELLATION]); break; 863 case KW_resist_cancellation: f.get (resist[ATNR_CANCELLATION]); break;
973 case KW_resist_deplete: thawer.get (op->resist[ATNR_DEPLETE]); break; 864 case KW_resist_deplete: f.get (resist[ATNR_DEPLETE]); break;
974 case KW_resist_death: thawer.get (op->resist[ATNR_DEATH]); break; 865 case KW_resist_death: f.get (resist[ATNR_DEATH]); break;
975 case KW_resist_chaos: thawer.get (op->resist[ATNR_CHAOS]); break; 866 case KW_resist_chaos: f.get (resist[ATNR_CHAOS]); break;
976 case KW_resist_counterspell: thawer.get (op->resist[ATNR_COUNTERSPELL]); break; 867 case KW_resist_counterspell: f.get (resist[ATNR_COUNTERSPELL]); break;
977 case KW_resist_godpower: thawer.get (op->resist[ATNR_GODPOWER]); break; 868 case KW_resist_godpower: f.get (resist[ATNR_GODPOWER]); break;
978 case KW_resist_holyword: thawer.get (op->resist[ATNR_HOLYWORD]); break; 869 case KW_resist_holyword: f.get (resist[ATNR_HOLYWORD]); break;
979 case KW_resist_blind: thawer.get (op->resist[ATNR_BLIND]); break; 870 case KW_resist_blind: f.get (resist[ATNR_BLIND]); break;
980 case KW_resist_internal: thawer.get (op->resist[ATNR_INTERNAL]); break; 871 case KW_resist_internal: f.get (resist[ATNR_INTERNAL]); break;
981 case KW_resist_life_stealing: thawer.get (op->resist[ATNR_LIFE_STEALING]); break; 872 case KW_resist_life_stealing: f.get (resist[ATNR_LIFE_STEALING]); break;
982 case KW_resist_disease: thawer.get (op->resist[ATNR_DISEASE]); break; 873 case KW_resist_disease: f.get (resist[ATNR_DISEASE]); break;
983 874
984 case KW_luck: thawer.get (op->stats.luck); break; 875 case KW_luck: f.get (stats.luck); break;
985 case KW_run_away: thawer.get (op->run_away); break; 876 case KW_run_away: f.get (run_away); break;
986 case KW_pick_up: thawer.get (op->pick_up); break; 877 case KW_pick_up: f.get (pick_up); break;
987 case KW_item_power: thawer.get (op->item_power); break; 878 case KW_item_power: f.get (item_power); break;
988 case KW_gen_sp_armour: thawer.get (op->gen_sp_armour); break; 879 case KW_gen_sp_armour: f.get (gen_sp_armour); break;
989 case KW_anim_speed: thawer.get (op->anim_speed); break; 880 case KW_anim_speed: f.get (anim_speed); break;
990 case KW_container: thawer.get (op->weight_limit); break; 881 case KW_container: f.get (weight_limit); break;
991 case KW_will_apply: thawer.get (op->will_apply); break; 882 case KW_will_apply: f.get (will_apply); break;
992 case KW_attack_movement: thawer.get (op->attack_movement); break; 883 case KW_attack_movement: f.get (attack_movement); break;
993 case KW_move_state: thawer.get (op->move_status); break; 884 case KW_move_state: f.get (move_status); break;
994 case KW_expmul: thawer.get (op->expmul); break; 885 case KW_expmul: f.get (expmul); break;
995 case KW_glow_radius: thawer.get (op->glow_radius); break; 886 case KW_glow_radius: f.get (glow_radius); break;
996 case KW_weapontype: thawer.get (op->weapontype); break; 887 case KW_weapontype: f.get (weapontype); break;
997 case KW_tooltype: thawer.get (op->tooltype); break; 888 case KW_tooltype: f.get (tooltype); break;
998 case KW_casting_time: thawer.get (op->casting_time); break; 889 case KW_casting_time: f.get (casting_time); break;
999 case KW_elevation: thawer.get (op->elevation); break; 890 case KW_elevation: f.get (elevation); break;
1000 case KW_smoothlevel: thawer.get (op->smoothlevel); break; 891 case KW_smoothlevel: f.get (smoothlevel); break;
1001 case KW_client_type: thawer.get (op->client_type); break; 892 case KW_client_type: f.get (client_type); break;
1002 case KW_duration: thawer.get (op->duration); break; 893 case KW_duration: f.get (duration); break;
1003 case KW_range: thawer.get (op->range); break; 894 case KW_range: f.get (range); break;
1004 case KW_range_modifier: thawer.get (op->range_modifier); break; 895 case KW_range_modifier: f.get (range_modifier); break;
1005 case KW_dam_modifier: thawer.get (op->dam_modifier); break; 896 case KW_dam_modifier: f.get (dam_modifier); break;
1006 case KW_duration_modifier: thawer.get (op->duration_modifier); break; 897 case KW_duration_modifier: f.get (duration_modifier); break;
1007 898
1008 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess 899 //TODO: mechanism to ensure that KW_xxx is consecutive needed from include/preprocess
1009 //TODO: parse from other include files 900 //TODO: parse from other include files
1010 case KW_body_range: thawer.get (op->body_info[0]); break; 901 case KW_body_range: f.get (body_info[0]); break;
1011 case KW_body_arm: thawer.get (op->body_info[1]); break; 902 case KW_body_arm: f.get (body_info[1]); break;
1012 case KW_body_torso: thawer.get (op->body_info[2]); break; 903 case KW_body_torso: f.get (body_info[2]); break;
1013 case KW_body_head: thawer.get (op->body_info[3]); break; 904 case KW_body_head: f.get (body_info[3]); break;
1014 case KW_body_neck: thawer.get (op->body_info[4]); break; 905 case KW_body_neck: f.get (body_info[4]); break;
1015 case KW_body_skill: thawer.get (op->body_info[5]); break; 906 case KW_body_skill: f.get (body_info[5]); break;
1016 case KW_body_finger: thawer.get (op->body_info[6]); break; 907 case KW_body_finger: f.get (body_info[6]); break;
1017 case KW_body_shoulder: thawer.get (op->body_info[7]); break; 908 case KW_body_shoulder: f.get (body_info[7]); break;
1018 case KW_body_foot: thawer.get (op->body_info[8]); break; 909 case KW_body_foot: f.get (body_info[8]); break;
1019 case KW_body_hand: thawer.get (op->body_info[9]); break; 910 case KW_body_hand: f.get (body_info[9]); break;
1020 case KW_body_wrist: thawer.get (op->body_info[10]); break; 911 case KW_body_wrist: f.get (body_info[10]); break;
1021 case KW_body_waist: thawer.get (op->body_info[11]); break; 912 case KW_body_waist: f.get (body_info[11]); break;
1022 case KW_can_apply: 913 case KW_can_apply:
1023 break; 914 break;
1024 915
1025 case KW_connected: 916 case KW_connected:
1026 add_button_link (op, op->map, thawer.get_sint32 ()); 917 add_button_link (this, map, f.get_sint32 ());
1027 break; 918 break;
1028 919
1029 case KW_randomitems: 920 case KW_randomitems:
1030 op->randomitems = find_treasurelist (thawer.get_str ()); 921 randomitems = find_treasurelist (f.get_str ());
922 //if (!randomitems)
923 // LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1031 break; 924 break;
1032 925
1033 case KW_msg: 926 case KW_msg:
1034 thawer.get_ml (KW_endmsg, op->msg); 927 f.get_ml (KW_endmsg, msg);
1035 //TODO: allow longer messages 928 //TODO: allow longer messages
1036 if (strlen (op->msg) >= HUGE_BUF) 929 if (strlen (msg) >= HUGE_BUF)
1037 { 930 {
1038 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (op->msg), &op->msg); 931 LOG (llevDebug, "\tError message length >= %d: %d\n>%.80s<\n", HUGE_BUF, strlen (msg), &msg);
1039 op->msg = "ERROR, please report: string too long, winged.\n"; 932 msg = "ERROR, please report: string too long, winged.\n";
1040 } 933 }
1041 break; 934 break;
1042 935
1043 case KW_lore: 936 case KW_lore:
1044 thawer.get_ml (KW_endlore, op->lore); 937 f.get_ml (KW_endlore, lore);
1045 //TODO: allow longer messages 938 //TODO: allow longer messages
1046 /* Just print a warning so we can be reasonably safe 939 /* Just print a warning so we can be reasonably safe
1047 * about not overflowing the buffer. 940 * about not overflowing the buffer.
1048 */ 941 */
1049 if (strlen (op->lore) > (HUGE_BUF / 2)) 942 if (strlen (lore) > (HUGE_BUF / 2))
1050 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n", 943 LOG (llevDebug, "\tWarning lore length > %d (max allowed=%d): %d\n>%.80s<\n",
1051 HUGE_BUF / 2, HUGE_BUF, strlen (op->lore), &op->lore); 944 HUGE_BUF / 2, HUGE_BUF, strlen (lore), &lore);
1052 break; 945 break;
1053 946
1054 case KW_editable: 947 case KW_editable:
1055 case KW_editor_folder: 948 case KW_editor_folder:
1056 break; 949 break;
1057 950
1058 case KW_More: // uppercase alias
1059 case KW_more:
1060 /* We need to record that this is a multipart object,
1061 * so the calling function can glue things back together
1062 */
1063 ismore = 1;
1064 break;
1065
1066 case KW_end: 951 case KW_end:
1067 check_loaded_object (op); 952 check_loaded_object (this);
1068 953
1069 if (!arch_init) 954 if (!arch_init)
1070 op->instantiate (); 955 instantiate ();
1071 956
1072 return ismore ? LL_MORE : LL_NORMAL; 957 f.next ();
1073
1074 case KW_EOF:
1075 return LL_EOF; 958 return true;
1076 959
1077 case KW_ERROR: 960 case KW_ERROR:
1078 set_ob_key_value (op, thawer.last_keyword, thawer.last_value, true); 961 set_ob_key_value (this, f.kw_str, f.value, true);
1079 //fprintf (stderr, "addkv(%s,%s)\n", thawer.last_keyword, thawer.last_value);//D 962 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1080 break; 963 break;
1081 964
1082 default: 965 default:
1083 LOG (llevError, "UNSUPPORTED KEYWORD IN MAP: \"%s\", bug in normaliser. skipping.\n", keyword_str[kw]); 966 if (!f.parse_error ("object", name))
967 return false;
1084 break; 968 break;
1085 } 969 }
970
971 f.next ();
1086 } 972 }
1087} 973}
1088 974
1089/* 975object *
1090 * Loads an object from the given file-pointer. 976object::read (object_thawer &f)
1091 * Variables will be read and parsed and patched into the object
1092 * until the string "end" is reached, or the end of the file.
1093 *
1094 * bufstat is used to determine various file attributes:
1095 * LO_REPATE (0): We are reading from the same buffer as the last call.
1096 * LO_LINEMODE (1): file that is being read from is multi purpose (ie, other functions
1097 * will also be reading from this (treasure file, artifacts.)
1098 * LO_NEWFILE (2): This is the first read from a particular file, so the buffers should
1099 * be reset.
1100 * LO_NOREAD (3): Reset the buffers, but don't read from it. (op can be null)
1101 *
1102 */
1103int
1104load_object (object_thawer &fp, object *op, int map_flags)
1105{ 977{
1106 coroapi::cede_every (1000); // cede once in a while 978 assert (f.kw == KW_arch);
1107 979
1108 return parse_object (op, fp, map_flags); 980 archetype *arch = archetype::find (f.get_str ());
981 assert (arch); //D maybe use exception handling of sorts?
982
983 object *op = object::create ();
984
985 op->arch = arch;
986 arch->clone.copy_to (op);
987 // copy_to activates, this should be fixed properly
988 op->deactivate ();
989
990 if (!op->parse_kv (f))
991 {
992 delete op;
993 return 0;
994 }
995
996 return op;
1109} 997}
1110 998
1111/* This takes a buffer, scans it for variables, and sets those variables 999/* This takes a buffer, scans it for variables, and sets those variables
1112 * as appropriate in op. 1000 * as appropriate in op.
1113 * 1001 *
… …
1115 * override values and in c_wiz to mutate values. 1003 * override values and in c_wiz to mutate values.
1116 */ 1004 */
1117int 1005int
1118set_variable (object *op, char *buf) 1006set_variable (object *op, char *buf)
1119{ 1007{
1120 object_thawer thawer (buf, (AV *)0); 1008 object_thawer f (buf, (AV *)0);
1121 1009
1122 return parse_object (op, thawer, 0); 1010 return op->parse_kv (f);
1123}
1124
1125/*
1126 * Initialises the array of variable-names. Needed before any
1127 * objects can be loaded. Called by init_library().
1128 */
1129
1130void
1131init_vars ()
1132{
1133} 1011}
1134 1012
1135/* This returns a string of the integer movement type */ 1013/* This returns a string of the integer movement type */
1136#if 0 1014#if 0
1137// unused function 1015// unused function
… …
1182 return retbuf + 1; 1060 return retbuf + 1;
1183} 1061}
1184#endif 1062#endif
1185 1063
1186// compare *op against *tmp and output differences 1064// compare *op against *tmp and output differences
1187void 1065static void
1188put (object_freezer &f, object *op, object *tmp) 1066write_diff (object_freezer &f, object *op, object *tmp)
1189{ 1067{
1190 static const keyword resist_save[NROFATTACKS] = { 1068 static const keyword resist_save[NROFATTACKS] = {
1191# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1069# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1192# include "attackinc.h" 1070# include "attackinc.h"
1193# undef def 1071# undef def
… …
1422 f.put (resist_save[i], op->resist[i]); 1300 f.put (resist_save[i], op->resist[i]);
1423 1301
1424 CMP_OUT (path_attuned); 1302 CMP_OUT (path_attuned);
1425 CMP_OUT (path_repelled); 1303 CMP_OUT (path_repelled);
1426 CMP_OUT (path_denied); 1304 CMP_OUT (path_denied);
1427 CMP_OUT (material); 1305 CMP_OUT2 (material, materials);//TODO: nuke
1428 CMP_OUT (materialname); 1306 CMP_OUT (materialname);
1429 CMP_OUT (value); 1307 CMP_OUT (value);
1430 CMP_OUT (carrying); 1308 CMP_OUT (carrying);
1431 CMP_OUT (weight); 1309 CMP_OUT (weight);
1432 CMP_OUT (invisible); 1310 CMP_OUT (invisible);
… …
1482/* 1360/*
1483 * Dumps all variables in an object to a file. 1361 * Dumps all variables in an object to a file.
1484 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1362 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1485 * the only place this is not set is when saving the player. 1363 * the only place this is not set is when saving the player.
1486 */ 1364 */
1487void 1365bool
1488save_object (object_freezer &fp, object *op, int flag) 1366object::write (object_freezer &f)
1489{ 1367{
1490 /* Even if the object does have an owner, it would seem that we should 1368 /* Even if the object does have an owner, it would seem that we should
1491 * still save it. 1369 * still save it.
1492 */ 1370 */
1493 if (op->owner) 1371 if (owner)
1494 return; 1372 return true;
1495 1373
1496 /* If it is unpaid and we don't want to save those, just return. */
1497 if (!(flag & 1) && op->flag [FLAG_UNPAID])
1498 return;
1499
1500 archetype *at = op->arch ? (archetype *)op->arch : empty_archetype; 1374 archetype *at = arch ? (archetype *)arch : empty_archetype;
1501 1375
1502 fp.put (KW_arch, at->name); 1376 f.put (KW_arch, at->name);
1503 put (fp, op, &at->clone); 1377 write_diff (f, this, &at->clone);
1504 1378
1505 /* Eneq(@csd.uu.se): Added this to allow containers being saved with contents */
1506
1507 for (object *tmp = op->inv; tmp; tmp = tmp->below) 1379 for (object *tmp = inv; tmp; tmp = tmp->below)
1508 save_object (fp, tmp, flag); 1380 tmp->write (f);
1509 1381
1510 fp.put (op); 1382 f.put (this);
1511 fp.put (KW_end); 1383 f.put (KW_end);
1384
1385 return true;
1512} 1386}
1513 1387
1388/////////////////////////////////////////////////////////////////////////////
1389
1390bool load_resource_file (const char *filename)
1391{
1392 object_thawer f (filename);
1393
1394 f.next ();
1395
1396 for (;;)
1397 {
1398 switch (f.kw)
1399 {
1400 case KW_region:
1401 if (!region::read (f))
1402 return false;
1403 break;
1404
1405 case KW_EOF:
1406 return true;
1407
1408 default:
1409 if (!f.parse_error ("resource file"))
1410 return false;
1411 }
1412
1413 f.next ();
1414 }
1415}
1416

Diff Legend

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