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.126 by root, Thu Jan 1 11:41:17 2009 UTC vs.
Revision 1.173 by root, Fri Jan 27 22:00:39 2012 UTC

1/* 1/*
2 * This file is part of Deliantra, the Roguelike Realtime MMORPG. 2 * This file is part of Deliantra, the Roguelike Realtime MMORPG.
3 * 3 *
4 * Copyright (©) 2005,2006,2007,2008 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009,2010,2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * it under the terms of the GNU General Public License as published by 9 * the terms of the Affero GNU General Public License as published by the
10 * the Free Software Foundation, either version 3 of the License, or 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * (at your option) any later version. 11 * option) any later version.
12 * 12 *
13 * This program is distributed in the hope that it will be useful, 13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of 14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details. 16 * GNU General Public License for more details.
17 * 17 *
18 * You should have received a copy of the GNU General Public License 18 * You should have received a copy of the Affero GNU General Public License
19 * along with this program. If not, see <http://www.gnu.org/licenses/>. 19 * and the GNU General Public License along with this program. If not, see
20 * <http://www.gnu.org/licenses/>.
20 * 21 *
21 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
22 */ 23 */
23 24
24#include <global.h> 25#include <global.h>
25#include <loader.h>
26#include <sproto.h> 26#include <sproto.h>
27 27
28///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
29 29
30extern archetype *loading_arch; 30extern archetype *loading_arch;
31
32//+GPL
31 33
32/* This table is only necessary to convert objects that existed before the 34/* This table is only necessary to convert objects that existed before the
33 * spell object conversion to the new object. It was not practical 35 * spell object conversion to the new object. It was not practical
34 * to go through every mapping looking for every potion, rod, wand, etc 36 * to go through every mapping looking for every potion, rod, wand, etc
35 * that had a sp set and update to the new value. So this maps the 37 * that had a sp set and update to the new value. So this maps the
… …
263 type = 0; 265 type = 0;
264 } 266 }
265 267
266 switch (type) 268 switch (type)
267 { 269 {
270 case RANGED:
268 case BOW: 271 case BOW:
269 case WAND: 272 case WAND:
270 case ROD: 273 case ROD:
271 case HORN: 274 case HORN:
272 if (slot [body_range].info != -1) 275 if (slot [body_range].info != -1)
… …
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
331 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
332 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
333 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337
338 if (speed < 0.)
339 {
340 flag [FLAG_RANDOM_SPEED] = true;
341 speed = -speed;
342 // speed_left will be randomised in instantiate () and copy_to ()
343 }
334 344
335 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 348 * not in the ideal fashion.
… …
385 if (ip > 2 * item_power && ip > (item_power + 3)) 395 if (ip > 2 * item_power && ip > (item_power + 3))
386 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); 396 LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power);
387#endif 397#endif
388 } 398 }
389 399
390 /* old style spellcasting object (pretty common) - need to load in the appropiate object */ 400 /* old style spellcasting object (pretty common) - need to load in the appropriate object */
391 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ 401 /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */
392 if ((type == ROD 402 if ((type == ROD
393 || type == WAND 403 || type == WAND
394 || type == SCROLL 404 || type == SCROLL
395 || type == HORN 405 || type == HORN
… …
404 // TODO: fix firewall object on map 414 // TODO: fix firewall object on map
405 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal' 415 /* Firewall is bizarre in that spell type was stored in dam. Rest are 'normal'
406 * in that spell was stored in sp. 416 * in that spell was stored in sp.
407 */ 417 */
408 //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); 418 //LOG (llevError, "old spellcasting object found: %s", debug_desc ());
409 object *tmp = get_archetype (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]); 419 object *tmp = archetype::get (spell_mapping[type == FIREWALL ? stats.dam : stats.sp]);
410 insert_ob_in_ob (tmp, this); 420 insert_ob_in_ob (tmp, this);
411 randomitems = 0; 421 randomitems = 0;
412 } 422 }
413 423
414 /* spellbooks & runes use slaying. But not to arch name, but to spell name */ 424 /* spellbooks & runes use slaying. But not to arch name, but to spell name */
… …
420 randomitems = 0; /* So another spell isn't created for this object */ 430 randomitems = 0; /* So another spell isn't created for this object */
421 /* without this, value is all screwed up */ 431 /* without this, value is all screwed up */
422 value = arch->value * inv->value; 432 value = arch->value * inv->value;
423 } 433 }
424 434
425 if (QUERY_FLAG (this, FLAG_MONSTER)) 435 if (this->flag [FLAG_MONSTER])
426 { 436 {
427 if (stats.hp > stats.maxhp) 437 if (stats.hp > stats.maxhp)
428 { 438 {
429 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); 439 LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp);
430 stats.maxhp = stats.hp; 440 stats.maxhp = stats.hp;
… …
433 /* The archs just need to be updated for this */ 443 /* The archs just need to be updated for this */
434 if (move_type == 0) 444 if (move_type == 0)
435 move_type = MOVE_WALK; 445 move_type = MOVE_WALK;
436 } 446 }
437 447
438 if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) 448 if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER)
439 /* Object will duplicate it's content as part of the 449 /* Object will duplicate it's content as part of the
440 * generation process. To do this, we must flag inventory 450 * generation process. To do this, we must flag inventory
441 * so it remains unevaluated concerning the randomitems and 451 * so it remains unevaluated concerning the randomitems and
442 * the living (a demonlord shouldn't cast from inside generator!) 452 * the living (a demonlord shouldn't cast from inside generator!)
443 */ 453 */
… …
461 } 471 }
462 else 472 else
463 move_type = MOVE_WALK; 473 move_type = MOVE_WALK;
464 } 474 }
465 } 475 }
476
477 // if the object has an animation, try to provide a default face
478 if (has_anim ())
479 {
480 const animation &anim_ob = anim ();
481
482 if (anim_speed)
483 // if this item is time-animated, force the last frame
484 animate_object (this, 0);
485 else if (flag [FLAG_MONSTER])
486 // if it is a monster, set appropriate facing
487 animate_object (this, direction);
488 }
466} 489}
467 490
468static void 491static void
469set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
470{ 493{
471 static const struct flagstr { 494 static const struct flagstr {
472 const char *name; 495 const char *name;
473 MoveType flags; 496 MoveType flags;
474 } move_flags[] = { 497 } move_flags[] = {
… …
480 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
481 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
482 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
483 }; 506 };
484 507
485 if (!str) 508 const char *str = f.get_str ();
486 {
487 mt = 0;
488 return;
489 }
490 509
491 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
492 { 511 {
493 mt = atoi (str); 512 mt = atoi (str);
494 return; 513 return;
495 } 514 }
496 515
497 mt = 0; 516 mt = 0;
498 517
499 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
500 { 519 {
501 bool negate = 0; 520 bool negate = 0;
502 521
503 if (*str == '-') 522 if (*str == '-')
504 { 523 {
505 negate = 1; 524 negate = 1;
506 str++; 525 str++;
507 } 526 }
508 527
509 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
510 { 529 {
511 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
512 { 531 {
513 if (negate) 532 if (negate)
514 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
523 542
524next: ; 543next: ;
525 } 544 }
526} 545}
527 546
547//-GPL
548
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 549#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 550
530bool 551bool
531object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
532{ 553{
533 object *op_inv = inv; 554 object *op_inv = inv;
534 key_value *last_kv = key_values;
535 555
536 for (;;) 556 for (;;)
537 { 557 {
538 switch (f.kw) 558 switch (f.kw)
539 { 559 {
540 case KW_uuid: 560 case KW_uuid:
541 if (const char *s = f.get_str ())
542 if (!uuid.parse (s)) 561 if (!uuid.parse (f.get_str ()))
543 { 562 {
544 f.parse_warn ("unparseable uuid"); 563 f.parse_warn ("unparseable uuid");
545 uuid = UUID::gen (); 564 uuid = UUID::gen ();
546 } 565 }
547 break; 566 break;
548 567
549 case KW_oid: 568 case KW_oid:
550 f.get (this, f.get_sint32 ()); 569 f.get (this, f.get_sint32 ());
551 break; 570 break;
… …
569 // was: insert_ob_in_ob (tmp, op); 588 // was: insert_ob_in_ob (tmp, op);
570 // but manually adding it can improve map loading times a lot 589 // but manually adding it can improve map loading times a lot
571 // also, appending instead of prepending keeps the 590 // also, appending instead of prepending keeps the
572 // save ordering the same between repeated load/saves. 591 // save ordering the same between repeated load/saves.
573 // and finally we do not want any funny effects 592 // and finally we do not want any funny effects
574 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 593 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
575 CLEAR_FLAG (tmp, FLAG_REMOVED); 594 tmp->clr_flag (FLAG_REMOVED);
576 595
577 if (!op_inv) 596 if (!op_inv)
578 { 597 {
579 inv = tmp; 598 inv = tmp;
580 tmp->above = 0; 599 tmp->above = 0;
… …
613 f.delayed_deref (this, owner, f.get_str ()); 632 f.delayed_deref (this, owner, f.get_str ());
614 break; 633 break;
615 634
616 case KW_animation: 635 case KW_animation:
617 { 636 {
618 CLEAR_FLAG (this, FLAG_ANIMATE); 637 this->clr_flag (FLAG_ANIMATE);
619 animation_id = 0; 638 animation_id = 0;
620 639
621 const char *str = f.get_str ();
622 if (str && (animation_id = find_animation (str))) 640 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 641 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
624 } 642 }
625 break; 643 break;
626 644
627 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
628 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
629 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
630 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
631 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
632 651
633 case KW_speed: 652 case KW_speed:
634 f.get (speed); 653 f.get (speed);
635 654
… …
644 move_slow |= MOVE_WALK; 663 move_slow |= MOVE_WALK;
645 f.get (move_slow_penalty); 664 f.get (move_slow_penalty);
646 break; 665 break;
647 666
648 case KW_face: 667 case KW_face:
649 face = face_find (f.get_str ()); 668 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
650 break; 669 break;
651 670
652 case KW_sound: 671 case KW_sound:
672 if (f.has_value ())
673 {
653 sound = sound_find (f.get_str ()); 674 sound = sound_find (f.get_str ());
654 if (!sound) 675 if (!sound)
655 f.parse_warn ("sound not found"); 676 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
677 }
678 else
679 sound = 0;
656 break; 680 break;
657 681
658 case KW_sound_destroy: 682 case KW_sound_destroy:
683 if (f.has_value ())
684 {
659 sound_destroy = sound_find (f.get_str ()); 685 sound_destroy = sound_find (f.get_str ());
660 if (!sound_destroy) 686 if (!sound_destroy)
661 f.parse_warn ("sound not found"); 687 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
688 }
689 else
690 sound_destroy = 0;
662 break; 691 break;
663 692
664 case KW_x: f.get (x); break; 693 case KW_x: f.get (x); break;
665 case KW_y: f.get (y); break; 694 case KW_y: f.get (y); break;
666 695
… …
707 case KW_invisible: f.get (invisible); break; 736 case KW_invisible: f.get (invisible); break;
708 case KW_magic: f.get (magic); break; 737 case KW_magic: f.get (magic); break;
709 case KW_state: f.get (state); break; 738 case KW_state: f.get (state); break;
710 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 739 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
711 case KW_material: f.get (materials); break; //TODO: nuke 740 case KW_material: f.get (materials); break; //TODO: nuke
712 case KW_materialname: f.get (materialname); break; 741 case KW_materialname: f.get (material); break;
713 742
714 /* These are the new values */ 743 /* These are the new values */
715 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
716 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
717 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
718 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
719 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
720 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
721
722 /* These are all legacy - any new objects should use the move_ .. values */
723 case KW_no_pass:
724 {
725 if (f.get_sint32 ())
726 move_block = MOVE_ALL;
727 else
728 move_block = 0;
729 }
730
731 break;
732
733 /* These are all legacy - any new objects should use the move_ .. values */
734 case KW_walk_on:
735 {
736 if (f.get_sint32 ())
737 move_on |= MOVE_WALK;
738 else
739 move_on &= ~MOVE_WALK;
740 }
741
742 break;
743
744 /* These are all legacy - any new objects should use the move_ .. values */
745 case KW_walk_off:
746 {
747 if (f.get_sint32 ())
748 move_off |= MOVE_WALK;
749 else
750 move_off &= ~MOVE_WALK;
751 }
752 break;
753
754 /* These are all legacy - any new objects should use the move_ .. values */
755 case KW_fly_on:
756 {
757 if (f.get_sint32 ())
758 move_on |= MOVE_FLY_LOW;
759 else
760 move_on &= ~MOVE_FLY_LOW;
761 }
762 break;
763
764 /* These are all legacy - any new objects should use the move_ .. values */
765 case KW_fly_off:
766 {
767 if (f.get_sint32 ())
768 move_off |= MOVE_FLY_LOW;
769 else
770 move_off &= ~MOVE_FLY_LOW;
771 }
772 break;
773 750
774 //TODO: remove these after converting archetypes 751 //TODO: remove these after converting archetypes
775 case KW_can_use_wand: 752 case KW_can_use_wand:
776 GET_FLAG (this, FLAG_USE_RANGE); 753 GET_FLAG (this, FLAG_USE_RANGE);
777 break; 754 break;
778 755
779 /* These are all legacy - any new objects should use the move_ .. values */
780 case KW_flying:
781 {
782 if (f.get_sint32 ())
783 move_type |= MOVE_FLY_LOW;
784 else
785 move_type &= ~MOVE_FLY_LOW;
786 }
787 break;
788
789
790 case KW_identified: 756 case KW_identified:
791 GET_FLAG (this, FLAG_IDENTIFIED); 757 GET_FLAG (this, FLAG_IDENTIFIED);
792 //TODO: move to check_object or so 758 //TODO: move to check_object or so
793 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 759 if (this->flag [FLAG_IDENTIFIED])
794 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 760 this->clr_flag (FLAG_KNOWN_MAGICAL);
795 761
796 break; 762 break;
797 763
798 case KW_friendly: 764 case KW_friendly:
799 if (f.get_bool ()) 765 if (f.get_bool ())
… …
826 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 792 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
827 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 793 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
828 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 794 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
829 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 795 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
830 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; 796 case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break;
797 case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break;
831 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 798 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
832 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 799 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
833 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 800 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
834 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 801 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
835 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 802 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
836 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 803 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
837 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 804 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
838 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 805 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
839 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
840 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 806 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
841 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 807 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
842 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 808 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
843 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 809 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
844 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 810 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
888 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 854 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
889 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 855 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
890 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 856 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
891 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 857 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
892 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 858 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
859 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
860 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
893 861
894 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 862 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
895 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 863 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
896 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 864 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
897 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 865 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
927 case KW_anim_speed: f.get (anim_speed); break; 895 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 896 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 897 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 898 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 899 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 900 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 901 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 902 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 903 case KW_casting_time: f.get (casting_time); break;
936 904
937 // elevation is deprecated 905 // elevation is deprecated
… …
963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 931 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964 case KW_can_apply: 932 case KW_can_apply:
965 break; 933 break;
966 934
967 case KW_connected: 935 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 936 {
937 shstr connected;
938
939 f.get (connected);
940 add_link (map, connected);
941 }
969 break; 942 break;
970 943
971 case KW_randomitems: 944 case KW_randomitems:
972 if (f.get_str ()) 945 if (f.has_value ())
973 { 946 {
974 randomitems = 947 randomitems =
975 loading_arch 948 loading_arch
976 ? treasurelist::get (f.get_str ()) 949 ? treasurelist::get (f.get_str ())
977 : treasurelist::find (f.get_str ()); 950 : treasurelist::find (f.get_str ());
978 951
979 if (!randomitems) 952 if (!randomitems)
953 {
980 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 954 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
955 randomitems = treasurelist::get (shstr_none); // avoid crashes
956 }
981 } 957 }
982 else 958 else
983 randomitems = 0; 959 randomitems = 0;
984 break; 960 break;
985 961
… …
1001 977
1002 f.next (); 978 f.next ();
1003 return true; 979 return true;
1004 980
1005 case KW_ERROR: 981 case KW_ERROR:
1006 // append as key value pair (do not use kv_set as it prepends)
1007 // we also do not even try to find old values, duplicate keys stay duplicate 982 // we do not even try to find old values, duplicate keys stay duplicate
1008 { 983 // the list gets reversed after loading
1009 key_value *kv = new key_value; 984 kv.add (shstr (f.kw_str), shstr (f.value));
1010
1011 kv->next = 0;
1012 kv->key = shstr (f.kw_str);
1013 kv->value = shstr (f.value);
1014
1015 if (!last_kv)
1016 key_values = last_kv = kv;
1017 else
1018 {
1019 while (last_kv->next)
1020 last_kv = last_kv->next;
1021
1022 last_kv->next = kv;
1023 last_kv = kv;
1024 }
1025 }
1026 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1027 break; 985 break;
1028 986
1029 default: 987 default:
1030 if (!f.parse_error ("object", name)) 988 if (!f.parse_error ("object", name))
1031 return false; 989 return false;
… …
1043 1001
1044 archetype *arch = archetype::find (f.get_str ()); 1002 archetype *arch = archetype::find (f.get_str ());
1045 1003
1046 if (!arch) 1004 if (!arch)
1047 { 1005 {
1048 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1006 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1049 arch = archetype::find ("earthwall"); 1007 arch = archetype::find (shstr_earthwall);
1050 } 1008 }
1051 1009
1052 assert (arch); //D maybe use exception handling of sorts? 1010 assert (arch); //D maybe use exception handling of sorts?
1053 1011
1054 f.next (); 1012 f.next ();
… …
1061 if (!op->parse_kv (f)) 1019 if (!op->parse_kv (f))
1062 { 1020 {
1063 op->destroy (); 1021 op->destroy ();
1064 return 0; 1022 return 0;
1065 } 1023 }
1024
1025 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1026 // that greatly simplifies the loading code.
1027 op->kv.reverse ();
1066 1028
1067 op->post_load_check (); 1029 op->post_load_check ();
1068 return op; 1030 return op;
1069} 1031}
1070 1032
… …
1075 * override values and in c_wiz to mutate values. 1037 * override values and in c_wiz to mutate values.
1076 */ 1038 */
1077int 1039int
1078set_variable (object *op, char *buf) 1040set_variable (object *op, char *buf)
1079{ 1041{
1080 object_thawer f (buf, (AV *)0); 1042 object_thawer f (format ("%s\nend", buf), (AV *)0);
1081 1043
1082 return op->parse_kv (f); 1044 return op->parse_kv (f);
1083} 1045}
1084 1046
1085/* This returns a string of the integer movement type */
1086#if 0
1087// unused function
1088static char *
1089get_string_move_type (MoveType mt)
1090{
1091 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1092 int i, all_count = 0, count;
1093
1094 strcpy (retbuf, "");
1095 strcpy (retbuf_all, " all");
1096
1097 /* Quick check, and probably fairly common */
1098 if (mt == MOVE_ALL)
1099 return retbuf_all + 1;
1100 if (mt == 0)
1101 {
1102 strcpy (retbuf, "0");
1103 return retbuf;
1104 }
1105
1106 /* We basically slide the bits down. Why look at MOVE_ALL?
1107 * because we may want to return a string like 'all -swim',
1108 * and if we just looked at mt, we couldn't get that.
1109 */
1110 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1111 {
1112 if (mt & (1 << count))
1113 {
1114 strcat (retbuf, " ");
1115 strcat (retbuf, move_name[count]);
1116 }
1117 else
1118 {
1119 strcat (retbuf_all, " -");
1120 strcat (retbuf_all, move_name[count]);
1121 all_count++;
1122 }
1123 }
1124 /* Basically, if there is a single negation, return it, eg
1125 * 'all -swim'. But more than that, just return the
1126 * enumerated values. It doesn't make sense to return
1127 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1128 */
1129 if (all_count <= 1)
1130 return retbuf_all + 1;
1131 else
1132 return retbuf + 1;
1133}
1134#endif
1135
1136// compare *op against *tmp and output differences 1047// compare *op against *arch and output differences
1137static void 1048static void
1138write_diff (object_freezer &f, object *op, object *tmp) 1049write_diff (object_freezer &f, object *op, object *arch)
1139{ 1050{
1140 static const keyword resist_save[NROFATTACKS] = { 1051 static const keyword resist_save[NROFATTACKS] = {
1141# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1052# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1142# include "attackinc.h" 1053# include "attackinc.h"
1143# undef def 1054# undef def
… …
1156 KW_NULL, 1067 KW_NULL,
1157 KW_applied, 1068 KW_applied,
1158 KW_unpaid, 1069 KW_unpaid,
1159 KW_can_use_shield, 1070 KW_can_use_shield,
1160 KW_no_pick, 1071 KW_no_pick,
1161 KW_NULL, // walk_on 1072 KW_is_transparent_floor,
1073 /* 10 */
1162 KW_NULL, // no_pass 1074 KW_NULL, // no_pass
1163 /* 10 */
1164 KW_is_animated, 1075 KW_is_animated,
1165 KW_NULL, // slow_move 1076 KW_NULL, // slow_move
1166 KW_NULL, // flying 1077 KW_NULL, // flying
1167 KW_monster, 1078 KW_monster,
1168 KW_friendly, 1079 KW_friendly,
1169 KW_generator, 1080 KW_generator,
1170 KW_is_thrown, 1081 KW_is_thrown,
1171 KW_auto_apply, 1082 KW_auto_apply,
1172 KW_treasure_env, 1083 KW_treasure_env,
1084 /* 20 */
1173 KW_player_sold, 1085 KW_player_sold,
1174 /* 20 */
1175 KW_see_invisible, 1086 KW_see_invisible,
1176 KW_can_roll, 1087 KW_can_roll,
1177 KW_overlay_floor, 1088 KW_overlay_floor,
1178 KW_is_turnable, 1089 KW_is_turnable,
1179 KW_NULL, // walk_off 1090 KW_NULL, // walk_off
1180 KW_NULL, // fly_on 1091 KW_NULL, // fly_on
1181 KW_NULL, // fly_off 1092 KW_NULL, // fly_off
1182 KW_is_used_up, 1093 KW_is_used_up,
1183 KW_identified, 1094 KW_identified,
1095 /* 30 */
1184 KW_reflecting, 1096 KW_reflecting,
1185 /* 30 */
1186 KW_changing, 1097 KW_changing,
1187 KW_splitting, 1098 KW_splitting,
1188 KW_hitback, 1099 KW_hitback,
1189 KW_startequip, 1100 KW_startequip,
1190 KW_blocksview, 1101 KW_blocksview,
1191 KW_undead, 1102 KW_undead,
1192 KW_scared, 1103 KW_scared,
1193 KW_unaggressive, 1104 KW_unaggressive,
1194 KW_reflect_missile, 1105 KW_reflect_missile,
1106 /* 40 */
1195 KW_reflect_spell, 1107 KW_reflect_spell,
1196 /* 40 */
1197 KW_no_magic, 1108 KW_no_magic,
1198 KW_no_fix_player, 1109 KW_NULL,
1199 KW_is_lightable, 1110 KW_is_lightable,
1200 KW_tear_down, 1111 KW_tear_down,
1201 KW_run_away, 1112 KW_run_away,
1202 KW_NULL, // pass_thru 1113 KW_NULL, // pass_thru
1203 KW_NULL, // an_pass_thru 1114 KW_NULL, // an_pass_thru
1204 KW_pick_up, 1115 KW_pick_up,
1205 KW_unique, 1116 KW_unique,
1117 /* 50 */
1206 KW_no_drop, 1118 KW_no_drop,
1207 /* 50 */
1208 KW_NULL, // wizcast 1119 KW_NULL, // wizcast
1209 KW_can_cast_spell, 1120 KW_can_cast_spell,
1210 KW_can_use_scroll, 1121 KW_can_use_scroll,
1211 KW_can_use_range, 1122 KW_can_use_range,
1212 KW_can_use_bow, 1123 KW_can_use_bow,
1213 KW_can_use_armour, 1124 KW_can_use_armour,
1214 KW_can_use_weapon, 1125 KW_can_use_weapon,
1215 KW_can_use_ring, 1126 KW_can_use_ring,
1216 KW_has_ready_range, 1127 KW_has_ready_range,
1128 /* 60 */
1217 KW_has_ready_bow, 1129 KW_has_ready_bow,
1218 /* 60 */
1219 KW_xrays, 1130 KW_xrays,
1220 KW_NULL, 1131 KW_NULL,
1221 KW_is_floor, 1132 KW_is_floor,
1222 KW_lifesave, 1133 KW_lifesave,
1223 KW_no_strength, 1134 KW_no_strength,
1224 KW_sleep, 1135 KW_sleep,
1225 KW_stand_still, 1136 KW_stand_still,
1226 KW_random_move, 1137 KW_random_move,
1227 KW_only_attack, 1138 KW_only_attack,
1139 /* 70 */
1228 KW_confused, 1140 KW_confused,
1229 /* 70 */
1230 KW_stealth, 1141 KW_stealth,
1231 KW_NULL, 1142 KW_NULL,
1232 KW_NULL, 1143 KW_NULL,
1233 KW_cursed, 1144 KW_cursed,
1234 KW_damned, 1145 KW_damned,
1235 KW_see_anywhere, 1146 KW_see_anywhere,
1236 KW_known_magical, 1147 KW_known_magical,
1237 KW_known_cursed, 1148 KW_known_cursed,
1238 KW_can_use_skill, 1149 KW_can_use_skill,
1150 /* 80 */
1239 KW_been_applied, 1151 KW_been_applied,
1240 /* 80 */
1241 KW_has_ready_scroll, 1152 KW_has_ready_scroll,
1242 KW_can_use_rod, 1153 KW_can_use_rod,
1243 KW_precious, 1154 KW_precious,
1244 KW_can_use_horn, 1155 KW_can_use_horn,
1245 KW_make_invisible, 1156 KW_make_invisible,
1246 KW_inv_locked, 1157 KW_inv_locked,
1247 KW_is_wooded, 1158 KW_is_wooded,
1248 KW_is_hilly, 1159 KW_is_hilly,
1249 KW_has_ready_skill, 1160 KW_has_ready_skill,
1161 /* 90 */
1250 KW_has_ready_weapon, 1162 KW_has_ready_weapon,
1251 /* 90 */
1252 KW_no_skill_ident, 1163 KW_no_skill_ident,
1253 KW_is_blind, 1164 KW_is_blind,
1254 KW_can_see_in_dark, 1165 KW_can_see_in_dark,
1255 KW_is_cauldron, 1166 KW_is_cauldron,
1256 KW_NULL, 1167 KW_NULL,
1257 KW_no_steal, 1168 KW_no_steal,
1258 KW_one_hit, 1169 KW_one_hit,
1259 KW_NULL, 1170 KW_NULL,
1260 KW_berserk, 1171 KW_berserk,
1172 /* 100 */
1261 KW_neutral, 1173 KW_neutral,
1262 /* 100 */
1263 KW_no_attack, 1174 KW_no_attack,
1264 KW_no_damage, 1175 KW_no_damage,
1265 KW_obj_original, 1176 KW_obj_original,
1266 KW_NULL, 1177 KW_random_speed,
1267 KW_activate_on_push, 1178 KW_activate_on_push,
1268 KW_activate_on_release, 1179 KW_activate_on_release,
1269 KW_is_water, 1180 KW_is_water,
1270 KW_use_content_on_gen, 1181 KW_use_content_on_gen,
1271 KW_NULL, 1182 KW_NULL,
1183 /* 110 */
1272 KW_is_buildable, 1184 KW_is_buildable,
1273 /* 110 */
1274 KW_destroy_on_death, 1185 KW_destroy_on_death,
1275 KW_NULL, 1186 KW_NULL,
1276 }; 1187 };
1277 1188
1189 // obj_original is the only commonly differing flag between archetype
1190 // and object, so special-case it here to be able to skip the loop
1191 static const struct flagmask : object::flags_t
1192 {
1193 flagmask ()
1194 {
1195 for (int i = 0; i < NUM_FLAGS; i++)
1196 if (flag_names [i])
1197 set (i);
1198 }
1199 } flagmask;
1200
1278 /* This saves the key/value lists. We do it first so that any 1201 /* This saves the key/value lists. We do it first so that any
1279 * keys that match field names will be overwritten by the loader. 1202 * keys that match field names will be overwritten by the loader.
1280 */ 1203 */
1281 for (key_value *kv = op->key_values; kv; kv = kv->next) 1204 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1282 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1205 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1283 f.put (kv->key, kv->value); 1206 f.put (kv->key, kv->value);
1284 1207
1285 /* We don't need to worry about the arch's extra fields - they 1208 if (op->uuid)
1286 * will get taken care of the copy_to method. 1209 {
1287 */ 1210 // highly optimised - this is often 25% of all data written
1211 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1212 char *ptr = cur;
1288 1213
1289 f.put (KW_uuid, op->uuid.c_str ()); 1214 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1215 ptr += sizeof ("uuid ") - 1;
1216 ptr = op->uuid.append (ptr);
1217 *ptr++ = '\n';
1290 1218
1219 f.alloc (ptr - cur);
1220 }
1221
1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1222#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1223#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1293 1224
1294 if (object *owner = op->owner) 1225 CMP_OUT (x);
1295 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1226 CMP_OUT (y);
1227
1228 CMP_OUT (type);
1229 CMP_OUT (subtype);
1230 CMP_OUT (direction);
1296 1231
1297 CMP_OUT (name); 1232 CMP_OUT (name);
1298 CMP_OUT (name_pl); 1233 CMP_OUT (name_pl);
1299 CMP_OUT (custom_name); 1234 CMP_OUT (speed);
1235
1236 // speed_left is a major time-burner, and has good locality, so
1237 // we use a simple lookup-cache to avoid the very slow printf.
1238 if (op->speed_left != arch->speed_left)
1239 {
1240 static double last_speed_left = 0.;
1241 static char last_speed_left_str [256] = "sl 0\n";
1242 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1243
1244 if (last_speed_left != op->speed_left)
1245 {
1246 last_speed_left = op->speed_left;
1247 last_speed_left_len = sizeof ("sl ") - 1
1248 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1249 }
1250
1251 f.add (last_speed_left_str, last_speed_left_len);
1252 }
1253
1300 CMP_OUT (title); 1254 CMP_OUT (title);
1301 CMP_OUT (race); 1255 CMP_OUT (race);
1256 CMP_OUT (slaying);
1302 CMP_OUT (skill); 1257 CMP_OUT (skill);
1303 CMP_OUT (slaying); 1258
1304 CMP_OUT (tag); 1259 CMP_OUT (tag);
1260 CMP_OUT (custom_name);
1261
1262 if (object *owner = op->owner)
1263 if (const char *ref = owner->ref ())
1264 f.put (KW(owner), ref);
1265
1266 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1267
1305 CMP_OUT (other_arch); 1268 CMP_OUT (other_arch);
1306 1269
1307 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1270 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1308 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1271 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1309 1272
1310 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1273 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1274 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1275 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313 1276
1314 if (op->animation_id != tmp->animation_id) 1277 if (op->animation_id != arch->animation_id)
1315 if (op->animation_id) 1278 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1279 f.put (KW(animation), op->anim ().name);
1317 else 1280 else
1318 { 1281 {
1319 f.put (KW_animation, (const char *)0); 1282 f.put (KW(animation));
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1283 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1284 }
1322 1285
1323 CMP_OUT2 (str, stats.Str); 1286 CMP_OUT2 (str, stats.Str);
1324 CMP_OUT2 (dex, stats.Dex); 1287 CMP_OUT2 (dex, stats.Dex);
… …
1335 CMP_OUT2 (grace, stats.grace); 1298 CMP_OUT2 (grace, stats.grace);
1336 CMP_OUT2 (maxgrace, stats.maxgrace); 1299 CMP_OUT2 (maxgrace, stats.maxgrace);
1337 CMP_OUT2 (exp, stats.exp); 1300 CMP_OUT2 (exp, stats.exp);
1338 1301
1339 CMP_OUT (perm_exp); 1302 CMP_OUT (perm_exp);
1340 CMP_OUT (expmul); 1303 //CMP_OUT (expmul);
1341 1304
1342 CMP_OUT2 (food, stats.food); 1305 CMP_OUT2 (food, stats.food);
1343 CMP_OUT2 (dam, stats.dam); 1306 CMP_OUT2 (dam, stats.dam);
1344 CMP_OUT2 (luck, stats.luck); 1307 CMP_OUT2 (luck, stats.luck);
1345 CMP_OUT2 (wc, stats.wc); 1308 CMP_OUT2 (wc, stats.wc);
1346 CMP_OUT2 (ac, stats.ac); 1309 CMP_OUT2 (ac, stats.ac);
1347 1310
1348 CMP_OUT (x);
1349 CMP_OUT (y);
1350 CMP_OUT (speed);
1351 CMP_OUT (speed_left);
1352 CMP_OUT2 (move_state, move_status); 1311 CMP_OUT2 (move_state, move_status);
1353 CMP_OUT (attack_movement); 1312 CMP_OUT (attack_movement);
1354 CMP_OUT (nrof); 1313 CMP_OUT (nrof);
1355 CMP_OUT (level); 1314 CMP_OUT (level);
1356 CMP_OUT (direction);
1357 CMP_OUT (type);
1358 CMP_OUT (subtype);
1359 CMP_OUT (attacktype); 1315 CMP_OUT (attacktype);
1360 1316
1317 // using memcmp here seems to be a loss - is gcc vectorising?
1361 for (int i = 0; i < NROFATTACKS; i++) 1318 for (int i = 0; i < NROFATTACKS; i++)
1362 if (expect_false (op->resist[i] != tmp->resist[i])) 1319 if (expect_false (op->resist[i] != arch->resist[i]))
1363 f.put (resist_save[i], op->resist[i]); 1320 f.put (resist_save[i], op->resist[i]);
1364 1321
1365 CMP_OUT (path_attuned); 1322 CMP_OUT (path_attuned);
1366 CMP_OUT (path_repelled); 1323 CMP_OUT (path_repelled);
1367 CMP_OUT (path_denied); 1324 CMP_OUT (path_denied);
1325
1368 CMP_OUT2 (material, materials);//TODO: nuke 1326 CMP_OUT2 (material, materials);//TODO: nuke
1369 CMP_OUT (materialname); 1327 if (op->material != arch->material)
1328 f.put (KW(materialname), op->material->name);
1329
1370 CMP_OUT (value); 1330 CMP_OUT (value);
1371 CMP_OUT (carrying); 1331 CMP_OUT (carrying);
1372 CMP_OUT (weight); 1332 CMP_OUT (weight);
1373 CMP_OUT (invisible); 1333 CMP_OUT (invisible);
1374 CMP_OUT (state); 1334 CMP_OUT (state);
… …
1378 CMP_OUT (last_grace); 1338 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1339 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1340 CMP_OUT (glow_radius);
1381 1341
1382 if (op->flag [FLAG_IS_LINKED]) 1342 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1343 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1344 f.put (KW(connected), ol->id);
1385 1345
1386 CMP_OUT (randomitems); 1346 CMP_OUT (randomitems);
1347
1387 CMP_OUT2 (container, weight_limit); 1348 CMP_OUT2 (container, weight_limit);
1388 1349
1389 CMP_OUT (run_away); 1350 CMP_OUT (run_away);
1390 CMP_OUT (pick_up); 1351 CMP_OUT (pick_up);
1391 CMP_OUT (will_apply); 1352 CMP_OUT (will_apply);
… …
1406 CMP_OUT (move_on); 1367 CMP_OUT (move_on);
1407 CMP_OUT (move_off); 1368 CMP_OUT (move_off);
1408 CMP_OUT (move_slow); 1369 CMP_OUT (move_slow);
1409 CMP_OUT (move_slow_penalty); 1370 CMP_OUT (move_slow_penalty);
1410 1371
1411 if (op->flag != tmp->flag) 1372 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1373
1374#if stdcpp // we need gcc, sorry
1375 if (diff [FLAG_OBJ_ORIGINAL])
1376 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1377
1378 diff.reset (FLAG_OBJ_ORIGINAL);
1379
1380 // quickly test whether any other flags differ
1381 if (expect_true (diff.any ()))
1412 for (int i = 0; i <= NUM_FLAGS; i++) 1382 for (int i = 0; i < NUM_FLAGS; i++)
1413 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1383 if (expect_false (diff [i]))
1414 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1384 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1385#else
1386 // use sgi extensions
1387 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1388 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1389#endif
1415 1390
1416 // save body locations 1391 // save body locations. gcc's memcmp does an abysmal job when used
1417 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1392 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1418 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1393 if (expect_false (op->slot[i].info != arch->slot[i].info))
1419 f.put (body_locations[i].save_name, op->slot[i].info); 1394 f.put (body_locations[i].kw, op->slot[i].info);
1420} 1395}
1421 1396
1422/* 1397/*
1423 * Dumps all variables in an object to a file. 1398 * Dumps all variables in an object to a file.
1424 * If bit 0 of flag is set, unpaid objects will be saved. As of now, 1399 * If bit 0 of flag is set, unpaid objects will be saved. As of now,
1425 * the only place this is not set is when saving the player. 1400 * the only place this is not set is when saving the player.
1426 */ 1401 */
1427bool 1402bool
1428object::write (object_freezer &f) 1403object::write (object_freezer &f)
1429{ 1404{
1430 archetype *at = arch ? arch : archetype::empty; 1405 if (expect_false (is_arch ()))
1431 1406 {
1407 f.put (KW(object), arch->archname);
1408 write_diff (f, this, archetype::empty);
1409 }
1410 else
1411 {
1432 f.put (KW_arch, at->archname); 1412 f.put (KW(arch), arch->archname);
1433 write_diff (f, this, at); 1413 write_diff (f, this, arch);
1414 }
1434 1415
1435 for (object *tmp = inv; tmp; tmp = tmp->below) 1416 for (object *tmp = inv; tmp; tmp = tmp->below)
1436 tmp->write (f); 1417 tmp->write (f);
1437 1418
1438 f.put (this); 1419 f.put (this);
1439 f.put (KW_end); 1420 f.put (KW(end));
1440 1421
1441 return true; 1422 return true;
1442} 1423}
1443 1424
1444///////////////////////////////////////////////////////////////////////////// 1425/////////////////////////////////////////////////////////////////////////////
… …
1450{ 1431{
1451 object_thawer f (filename); 1432 object_thawer f (filename);
1452 1433
1453 for (;;) 1434 for (;;)
1454 { 1435 {
1436 coroapi::cede_to_tick ();
1437
1455 switch (f.kw) 1438 switch (f.kw)
1456 { 1439 {
1457 case KW_region: 1440 case KW_region:
1458 if (!region::read (f)) 1441 if (!region::read (f))
1459 return false; 1442 return false;

Diff Legend

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