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

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

Diff Legend

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