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

Diff Legend

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