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.132 by root, Thu Sep 17 01:57:31 2009 UTC vs.
Revision 1.175 by root, Mon Oct 29 23:55:52 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 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 */
… …
465 } 475 }
466 476
467 // 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
468 if (has_anim ()) 478 if (has_anim ())
469 { 479 {
470 const animation &anim_ob = anim ();
471
472 if (anim_speed) 480 if (anim_speed)
473 // if this item is time-animated, force the last frame 481 // if this item is time-animated, force the last frame
474 animate_object (this, 0); 482 animate_object (this, 0);
475 else if (flag [FLAG_MONSTER]) 483 else if (flag [FLAG_MONSTER])
476 // if it is a monster, set appropriate facing 484 // if it is a monster, set appropriate facing
477 animate_object (this, direction); 485 animate_object (this, direction);
478 } 486 }
479} 487}
480 488
481static void 489static void
482set_move (MoveType &mt, const char *str) 490set_move (MoveType &mt, object_thawer &f)
483{ 491{
484 static const struct flagstr { 492 static const struct flagstr {
485 const char *name; 493 const char *name;
486 MoveType flags; 494 MoveType flags;
487 } move_flags[] = { 495 } move_flags[] = {
… …
493 { "boat" , MOVE_BOAT }, 501 { "boat" , MOVE_BOAT },
494 { "ship" , MOVE_SHIP }, 502 { "ship" , MOVE_SHIP },
495 { "all" , MOVE_ALL }, 503 { "all" , MOVE_ALL },
496 }; 504 };
497 505
498 if (!str) 506 const char *str = f.get_str ();
499 {
500 mt = 0;
501 return;
502 }
503 507
504 if (isdigit (*str)) 508 if (!*str || isdigit (*str))
505 { 509 {
506 mt = atoi (str); 510 mt = atoi (str);
507 return; 511 return;
508 } 512 }
509 513
510 mt = 0; 514 mt = 0;
511 515
512 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 516 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
513 { 517 {
514 bool negate = 0; 518 bool negate = 0;
515 519
516 if (*str == '-') 520 if (*str == '-')
517 { 521 {
518 negate = 1; 522 negate = 1;
519 str++; 523 str++;
520 } 524 }
521 525
522 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)
523 { 527 {
524 if (!strcmp (f->name, str)) 528 if (!strcmp (f->name, str))
525 { 529 {
526 if (negate) 530 if (negate)
527 mt &= ~f->flags; 531 mt &= ~f->flags;
… …
536 540
537next: ; 541next: ;
538 } 542 }
539} 543}
540 544
545//-GPL
546
541#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 547#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
542 548
543bool 549bool
544object::parse_kv (object_thawer &f) 550object::parse_kv (object_thawer &f)
545{ 551{
546 object *op_inv = inv; 552 object *op_inv = inv;
547 key_value *last_kv = key_values;
548 553
549 for (;;) 554 for (;;)
550 { 555 {
551 switch (f.kw) 556 switch (f.kw)
552 { 557 {
553 case KW_uuid: 558 case KW_uuid:
554 if (const char *s = f.get_str ())
555 if (!uuid.parse (s)) 559 if (!uuid.parse (f.get_str ()))
556 { 560 {
557 f.parse_warn ("unparseable uuid"); 561 f.parse_warn ("unparseable uuid");
558 uuid = UUID::gen (); 562 uuid = UUID::gen ();
559 } 563 }
560 break; 564 break;
561 565
562 case KW_oid: 566 case KW_oid:
563 f.get (this, f.get_sint32 ()); 567 f.get (this, f.get_sint32 ());
564 break; 568 break;
… …
582 // was: insert_ob_in_ob (tmp, op); 586 // was: insert_ob_in_ob (tmp, op);
583 // but manually adding it can improve map loading times a lot 587 // but manually adding it can improve map loading times a lot
584 // also, appending instead of prepending keeps the 588 // also, appending instead of prepending keeps the
585 // save ordering the same between repeated load/saves. 589 // save ordering the same between repeated load/saves.
586 // and finally we do not want any funny effects 590 // and finally we do not want any funny effects
587 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 591 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
588 CLEAR_FLAG (tmp, FLAG_REMOVED); 592 tmp->clr_flag (FLAG_REMOVED);
589 593
590 if (!op_inv) 594 if (!op_inv)
591 { 595 {
592 inv = tmp; 596 inv = tmp;
593 tmp->above = 0; 597 tmp->above = 0;
… …
626 f.delayed_deref (this, owner, f.get_str ()); 630 f.delayed_deref (this, owner, f.get_str ());
627 break; 631 break;
628 632
629 case KW_animation: 633 case KW_animation:
630 { 634 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 635 this->clr_flag (FLAG_ANIMATE);
632 animation_id = 0; 636 animation_id = 0;
633 637
634 const char *str = f.get_str ();
635 if (str && (animation_id = find_animation (str))) 638 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
636 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
637 } 640 }
638 break; 641 break;
639 642
640 case KW_last_heal: f.get (last_heal); break; 643 case KW_last_heal: f.get (last_heal); break;
641 case KW_last_sp: f.get (last_sp); break; 644 case KW_last_sp: f.get (last_sp); break;
642 case KW_last_grace: f.get (last_grace); break; 645 case KW_last_grace: f.get (last_grace); break;
643 case KW_last_eat: f.get (last_eat); break; 646 case KW_last_eat: f.get (last_eat); break;
647 case KW_sl:
644 case KW_speed_left: f.get (speed_left); break; 648 case KW_speed_left: f.get (speed_left); break;
645 649
646 case KW_speed: 650 case KW_speed:
647 f.get (speed); 651 f.get (speed);
648 652
… …
657 move_slow |= MOVE_WALK; 661 move_slow |= MOVE_WALK;
658 f.get (move_slow_penalty); 662 f.get (move_slow_penalty);
659 break; 663 break;
660 664
661 case KW_face: 665 case KW_face:
662 face = face_find (f.get_str ()); 666 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
663 break; 667 break;
664 668
665 case KW_sound: 669 case KW_sound:
670 if (f.has_value ())
671 {
666 sound = sound_find (f.get_str ()); 672 sound = sound_find (f.get_str ());
667 if (!sound) 673 if (!sound)
668 f.parse_warn ("sound not found"); 674 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
675 }
676 else
677 sound = 0;
669 break; 678 break;
670 679
671 case KW_sound_destroy: 680 case KW_sound_destroy:
681 if (f.has_value ())
682 {
672 sound_destroy = sound_find (f.get_str ()); 683 sound_destroy = sound_find (f.get_str ());
673 if (!sound_destroy) 684 if (!sound_destroy)
674 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;
675 break; 689 break;
676 690
677 case KW_x: f.get (x); break; 691 case KW_x: f.get (x); break;
678 case KW_y: f.get (y); break; 692 case KW_y: f.get (y); break;
679 693
… …
720 case KW_invisible: f.get (invisible); break; 734 case KW_invisible: f.get (invisible); break;
721 case KW_magic: f.get (magic); break; 735 case KW_magic: f.get (magic); break;
722 case KW_state: f.get (state); break; 736 case KW_state: f.get (state); break;
723 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 737 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
724 case KW_material: f.get (materials); break; //TODO: nuke 738 case KW_material: f.get (materials); break; //TODO: nuke
725 case KW_materialname: f.get (materialname); break; 739 case KW_materialname: f.get (material); break;
726 740
727 /* These are the new values */ 741 /* These are the new values */
728 case KW_move_block: set_move (move_block, f.get_str ()); break; 742 case KW_move_block: set_move (move_block, f); break;
729 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 743 case KW_move_allow: set_move (move_allow, f); break;
730 case KW_move_type: set_move (move_type, f.get_str ()); break; 744 case KW_move_type: set_move (move_type , f); break;
731 case KW_move_on: set_move (move_on, f.get_str ()); break; 745 case KW_move_on: set_move (move_on , f); break;
732 case KW_move_off: set_move (move_off, f.get_str ()); break; 746 case KW_move_off: set_move (move_off , f); break;
733 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 747 case KW_move_slow: set_move (move_slow , f); break;
734
735 /* These are all legacy - any new objects should use the move_ .. values */
736 case KW_no_pass:
737 {
738 if (f.get_sint32 ())
739 move_block = MOVE_ALL;
740 else
741 move_block = 0;
742 }
743
744 break;
745
746 /* These are all legacy - any new objects should use the move_ .. values */
747 case KW_walk_on:
748 {
749 if (f.get_sint32 ())
750 move_on |= MOVE_WALK;
751 else
752 move_on &= ~MOVE_WALK;
753 }
754
755 break;
756
757 /* These are all legacy - any new objects should use the move_ .. values */
758 case KW_walk_off:
759 {
760 if (f.get_sint32 ())
761 move_off |= MOVE_WALK;
762 else
763 move_off &= ~MOVE_WALK;
764 }
765 break;
766
767 /* These are all legacy - any new objects should use the move_ .. values */
768 case KW_fly_on:
769 {
770 if (f.get_sint32 ())
771 move_on |= MOVE_FLY_LOW;
772 else
773 move_on &= ~MOVE_FLY_LOW;
774 }
775 break;
776
777 /* These are all legacy - any new objects should use the move_ .. values */
778 case KW_fly_off:
779 {
780 if (f.get_sint32 ())
781 move_off |= MOVE_FLY_LOW;
782 else
783 move_off &= ~MOVE_FLY_LOW;
784 }
785 break;
786 748
787 //TODO: remove these after converting archetypes 749 //TODO: remove these after converting archetypes
788 case KW_can_use_wand: 750 case KW_can_use_wand:
789 GET_FLAG (this, FLAG_USE_RANGE); 751 GET_FLAG (this, FLAG_USE_RANGE);
790 break; 752 break;
791 753
792 /* These are all legacy - any new objects should use the move_ .. values */
793 case KW_flying:
794 {
795 if (f.get_sint32 ())
796 move_type |= MOVE_FLY_LOW;
797 else
798 move_type &= ~MOVE_FLY_LOW;
799 }
800 break;
801
802
803 case KW_identified: 754 case KW_identified:
804 GET_FLAG (this, FLAG_IDENTIFIED); 755 GET_FLAG (this, FLAG_IDENTIFIED);
805 //TODO: move to check_object or so 756 //TODO: move to check_object or so
806 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 757 if (this->flag [FLAG_IDENTIFIED])
807 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 758 this->clr_flag (FLAG_KNOWN_MAGICAL);
808 759
809 break; 760 break;
810 761
811 case KW_friendly: 762 case KW_friendly:
812 if (f.get_bool ()) 763 if (f.get_bool ())
… …
839 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 790 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
840 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 791 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
841 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 792 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
842 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 793 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
843 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;
844 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 796 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
845 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 797 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
846 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 798 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
847 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 799 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
848 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 800 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
849 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 801 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
850 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 802 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
851 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 803 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
852 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
853 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 804 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
854 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 805 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
855 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;
856 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;
857 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;
… …
901 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 852 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
902 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 853 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
903 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;
904 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 855 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
905 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;
906 859
907 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 860 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
908 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 861 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
909 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 862 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
910 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 863 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
985 add_link (map, connected); 938 add_link (map, connected);
986 } 939 }
987 break; 940 break;
988 941
989 case KW_randomitems: 942 case KW_randomitems:
990 if (f.get_str ()) 943 if (f.has_value ())
991 { 944 {
992 randomitems = 945 randomitems =
993 loading_arch 946 loading_arch
994 ? treasurelist::get (f.get_str ()) 947 ? treasurelist::get (f.get_str ())
995 : treasurelist::find (f.get_str ()); 948 : treasurelist::find (f.get_str ());
996 949
997 if (!randomitems) 950 if (!randomitems)
951 {
998 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 }
999 } 955 }
1000 else 956 else
1001 randomitems = 0; 957 randomitems = 0;
1002 break; 958 break;
1003 959
… …
1019 975
1020 f.next (); 976 f.next ();
1021 return true; 977 return true;
1022 978
1023 case KW_ERROR: 979 case KW_ERROR:
1024 // append as key value pair (do not use kv_set as it prepends)
1025 // 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
1026 { 981 // the list gets reversed after loading
1027 key_value *kv = new key_value; 982 kv.add (shstr (f.kw_str), shstr (f.value));
1028
1029 kv->next = 0;
1030 kv->key = shstr (f.kw_str);
1031 kv->value = shstr (f.value);
1032
1033 if (!last_kv)
1034 key_values = last_kv = kv;
1035 else
1036 {
1037 while (last_kv->next)
1038 last_kv = last_kv->next;
1039
1040 last_kv->next = kv;
1041 last_kv = kv;
1042 }
1043 }
1044 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1045 break; 983 break;
1046 984
1047 default: 985 default:
1048 if (!f.parse_error ("object", name)) 986 if (!f.parse_error ("object", name))
1049 return false; 987 return false;
… …
1061 999
1062 archetype *arch = archetype::find (f.get_str ()); 1000 archetype *arch = archetype::find (f.get_str ());
1063 1001
1064 if (!arch) 1002 if (!arch)
1065 { 1003 {
1066 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 ());
1067 arch = archetype::find ("earthwall"); 1005 arch = archetype::find (shstr_earthwall);
1068 } 1006 }
1069 1007
1070 assert (arch); //D maybe use exception handling of sorts? 1008 assert (arch); //D maybe use exception handling of sorts?
1071 1009
1072 f.next (); 1010 f.next ();
… …
1079 if (!op->parse_kv (f)) 1017 if (!op->parse_kv (f))
1080 { 1018 {
1081 op->destroy (); 1019 op->destroy ();
1082 return 0; 1020 return 0;
1083 } 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 ();
1084 1026
1085 op->post_load_check (); 1027 op->post_load_check ();
1086 return op; 1028 return op;
1087} 1029}
1088 1030
… …
1093 * override values and in c_wiz to mutate values. 1035 * override values and in c_wiz to mutate values.
1094 */ 1036 */
1095int 1037int
1096set_variable (object *op, char *buf) 1038set_variable (object *op, char *buf)
1097{ 1039{
1098 object_thawer f (buf, (AV *)0); 1040 object_thawer f (format ("%s\nend", buf), (AV *)0);
1099 1041
1100 return op->parse_kv (f); 1042 return op->parse_kv (f);
1101} 1043}
1102 1044
1103/* This returns a string of the integer movement type */
1104#if 0
1105// unused function
1106static char *
1107get_string_move_type (MoveType mt)
1108{
1109 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1110 int i, all_count = 0, count;
1111
1112 strcpy (retbuf, "");
1113 strcpy (retbuf_all, " all");
1114
1115 /* Quick check, and probably fairly common */
1116 if (mt == MOVE_ALL)
1117 return retbuf_all + 1;
1118 if (mt == 0)
1119 {
1120 strcpy (retbuf, "0");
1121 return retbuf;
1122 }
1123
1124 /* We basically slide the bits down. Why look at MOVE_ALL?
1125 * because we may want to return a string like 'all -swim',
1126 * and if we just looked at mt, we couldn't get that.
1127 */
1128 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1129 {
1130 if (mt & (1 << count))
1131 {
1132 strcat (retbuf, " ");
1133 strcat (retbuf, move_name[count]);
1134 }
1135 else
1136 {
1137 strcat (retbuf_all, " -");
1138 strcat (retbuf_all, move_name[count]);
1139 all_count++;
1140 }
1141 }
1142 /* Basically, if there is a single negation, return it, eg
1143 * 'all -swim'. But more than that, just return the
1144 * enumerated values. It doesn't make sense to return
1145 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1146 */
1147 if (all_count <= 1)
1148 return retbuf_all + 1;
1149 else
1150 return retbuf + 1;
1151}
1152#endif
1153
1154// compare *op against *tmp and output differences 1045// compare *op against *arch and output differences
1155static void 1046static void
1156write_diff (object_freezer &f, object *op, object *tmp) 1047write_diff (object_freezer &f, object *op, object *arch)
1157{ 1048{
1158 static const keyword resist_save[NROFATTACKS] = { 1049 static const keyword resist_save[NROFATTACKS] = {
1159# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1050# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1160# include "attackinc.h" 1051# include "attackinc.h"
1161# undef def 1052# undef def
… …
1174 KW_NULL, 1065 KW_NULL,
1175 KW_applied, 1066 KW_applied,
1176 KW_unpaid, 1067 KW_unpaid,
1177 KW_can_use_shield, 1068 KW_can_use_shield,
1178 KW_no_pick, 1069 KW_no_pick,
1179 KW_NULL, // walk_on 1070 KW_is_transparent_floor,
1071 /* 10 */
1180 KW_NULL, // no_pass 1072 KW_NULL, // no_pass
1181 /* 10 */
1182 KW_is_animated, 1073 KW_is_animated,
1183 KW_NULL, // slow_move 1074 KW_NULL, // slow_move
1184 KW_NULL, // flying 1075 KW_NULL, // flying
1185 KW_monster, 1076 KW_monster,
1186 KW_friendly, 1077 KW_friendly,
1187 KW_generator, 1078 KW_generator,
1188 KW_is_thrown, 1079 KW_is_thrown,
1189 KW_auto_apply, 1080 KW_auto_apply,
1190 KW_treasure_env, 1081 KW_treasure_env,
1082 /* 20 */
1191 KW_player_sold, 1083 KW_player_sold,
1192 /* 20 */
1193 KW_see_invisible, 1084 KW_see_invisible,
1194 KW_can_roll, 1085 KW_can_roll,
1195 KW_overlay_floor, 1086 KW_overlay_floor,
1196 KW_is_turnable, 1087 KW_is_turnable,
1197 KW_NULL, // walk_off 1088 KW_NULL, // walk_off
1198 KW_NULL, // fly_on 1089 KW_NULL, // fly_on
1199 KW_NULL, // fly_off 1090 KW_NULL, // fly_off
1200 KW_is_used_up, 1091 KW_is_used_up,
1201 KW_identified, 1092 KW_identified,
1093 /* 30 */
1202 KW_reflecting, 1094 KW_reflecting,
1203 /* 30 */
1204 KW_changing, 1095 KW_changing,
1205 KW_splitting, 1096 KW_splitting,
1206 KW_hitback, 1097 KW_hitback,
1207 KW_startequip, 1098 KW_startequip,
1208 KW_blocksview, 1099 KW_blocksview,
1209 KW_undead, 1100 KW_undead,
1210 KW_scared, 1101 KW_scared,
1211 KW_unaggressive, 1102 KW_unaggressive,
1212 KW_reflect_missile, 1103 KW_reflect_missile,
1104 /* 40 */
1213 KW_reflect_spell, 1105 KW_reflect_spell,
1214 /* 40 */
1215 KW_no_magic, 1106 KW_no_magic,
1216 KW_no_fix_player, 1107 KW_NULL,
1217 KW_is_lightable, 1108 KW_is_lightable,
1218 KW_tear_down, 1109 KW_tear_down,
1219 KW_run_away, 1110 KW_run_away,
1220 KW_NULL, // pass_thru 1111 KW_NULL, // pass_thru
1221 KW_NULL, // an_pass_thru 1112 KW_NULL, // an_pass_thru
1222 KW_pick_up, 1113 KW_pick_up,
1223 KW_unique, 1114 KW_unique,
1115 /* 50 */
1224 KW_no_drop, 1116 KW_no_drop,
1225 /* 50 */
1226 KW_NULL, // wizcast 1117 KW_NULL, // wizcast
1227 KW_can_cast_spell, 1118 KW_can_cast_spell,
1228 KW_can_use_scroll, 1119 KW_can_use_scroll,
1229 KW_can_use_range, 1120 KW_can_use_range,
1230 KW_can_use_bow, 1121 KW_can_use_bow,
1231 KW_can_use_armour, 1122 KW_can_use_armour,
1232 KW_can_use_weapon, 1123 KW_can_use_weapon,
1233 KW_can_use_ring, 1124 KW_can_use_ring,
1234 KW_has_ready_range, 1125 KW_has_ready_range,
1126 /* 60 */
1235 KW_has_ready_bow, 1127 KW_has_ready_bow,
1236 /* 60 */
1237 KW_xrays, 1128 KW_xrays,
1238 KW_NULL, 1129 KW_NULL,
1239 KW_is_floor, 1130 KW_is_floor,
1240 KW_lifesave, 1131 KW_lifesave,
1241 KW_no_strength, 1132 KW_no_strength,
1242 KW_sleep, 1133 KW_sleep,
1243 KW_stand_still, 1134 KW_stand_still,
1244 KW_random_move, 1135 KW_random_move,
1245 KW_only_attack, 1136 KW_only_attack,
1137 /* 70 */
1246 KW_confused, 1138 KW_confused,
1247 /* 70 */
1248 KW_stealth, 1139 KW_stealth,
1249 KW_NULL, 1140 KW_NULL,
1250 KW_NULL, 1141 KW_NULL,
1251 KW_cursed, 1142 KW_cursed,
1252 KW_damned, 1143 KW_damned,
1253 KW_see_anywhere, 1144 KW_see_anywhere,
1254 KW_known_magical, 1145 KW_known_magical,
1255 KW_known_cursed, 1146 KW_known_cursed,
1256 KW_can_use_skill, 1147 KW_can_use_skill,
1148 /* 80 */
1257 KW_been_applied, 1149 KW_been_applied,
1258 /* 80 */
1259 KW_has_ready_scroll, 1150 KW_has_ready_scroll,
1260 KW_can_use_rod, 1151 KW_can_use_rod,
1261 KW_precious, 1152 KW_precious,
1262 KW_can_use_horn, 1153 KW_can_use_horn,
1263 KW_make_invisible, 1154 KW_make_invisible,
1264 KW_inv_locked, 1155 KW_inv_locked,
1265 KW_is_wooded, 1156 KW_is_wooded,
1266 KW_is_hilly, 1157 KW_is_hilly,
1267 KW_has_ready_skill, 1158 KW_has_ready_skill,
1159 /* 90 */
1268 KW_has_ready_weapon, 1160 KW_has_ready_weapon,
1269 /* 90 */
1270 KW_no_skill_ident, 1161 KW_no_skill_ident,
1271 KW_is_blind, 1162 KW_is_blind,
1272 KW_can_see_in_dark, 1163 KW_can_see_in_dark,
1273 KW_is_cauldron, 1164 KW_is_cauldron,
1274 KW_NULL, 1165 KW_NULL,
1275 KW_no_steal, 1166 KW_no_steal,
1276 KW_one_hit, 1167 KW_one_hit,
1277 KW_NULL, 1168 KW_NULL,
1278 KW_berserk, 1169 KW_berserk,
1170 /* 100 */
1279 KW_neutral, 1171 KW_neutral,
1280 /* 100 */
1281 KW_no_attack, 1172 KW_no_attack,
1282 KW_no_damage, 1173 KW_no_damage,
1283 KW_obj_original, 1174 KW_obj_original,
1284 KW_NULL, 1175 KW_random_speed,
1285 KW_activate_on_push, 1176 KW_activate_on_push,
1286 KW_activate_on_release, 1177 KW_activate_on_release,
1287 KW_is_water, 1178 KW_is_water,
1288 KW_use_content_on_gen, 1179 KW_use_content_on_gen,
1289 KW_NULL, 1180 KW_NULL,
1181 /* 110 */
1290 KW_is_buildable, 1182 KW_is_buildable,
1291 /* 110 */
1292 KW_destroy_on_death, 1183 KW_destroy_on_death,
1293 KW_NULL, 1184 KW_NULL,
1294 }; 1185 };
1295 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
1296 /* 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
1297 * keys that match field names will be overwritten by the loader. 1200 * keys that match field names will be overwritten by the loader.
1298 */ 1201 */
1299 for (key_value *kv = op->key_values; kv; kv = kv->next) 1202 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1300 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1203 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1301 f.put (kv->key, kv->value); 1204 f.put (kv->key, kv->value);
1302 1205
1303 /* We don't need to worry about the arch's extra fields - they 1206 if (op->uuid)
1304 * will get taken care of the copy_to method. 1207 {
1305 */ 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;
1306 1211
1307 f.put (KW_uuid, op->uuid.c_str ()); 1212 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1213 ptr += sizeof ("uuid ") - 1;
1214 ptr = op->uuid.append (ptr);
1215 *ptr++ = '\n';
1308 1216
1217 f.alloc (ptr - cur);
1218 }
1219
1309#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)
1310#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)
1311 1222
1312 if (object *owner = op->owner) 1223 CMP_OUT (x);
1313 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);
1314 1229
1315 CMP_OUT (name); 1230 CMP_OUT (name);
1316 CMP_OUT (name_pl); 1231 CMP_OUT (name_pl);
1317 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
1318 CMP_OUT (title); 1252 CMP_OUT (title);
1319 CMP_OUT (race); 1253 CMP_OUT (race);
1254 CMP_OUT (slaying);
1320 CMP_OUT (skill); 1255 CMP_OUT (skill);
1321 CMP_OUT (slaying); 1256
1322 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
1323 CMP_OUT (other_arch); 1266 CMP_OUT (other_arch);
1324 1267
1325 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 );
1326 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);
1327 1270
1328 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);
1329 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);
1330 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);
1331 1274
1332 if (op->animation_id != tmp->animation_id) 1275 if (op->animation_id != arch->animation_id)
1333 if (op->has_anim ()) 1276 if (op->has_anim ())
1334 f.put (KW_animation, op->anim ().name); 1277 f.put (KW(animation), op->anim ().name);
1335 else 1278 else
1336 { 1279 {
1337 f.put (KW_animation, (const char *)0); 1280 f.put (KW(animation));
1338 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1281 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1339 } 1282 }
1340 1283
1341 CMP_OUT2 (str, stats.Str); 1284 CMP_OUT2 (str, stats.Str);
1342 CMP_OUT2 (dex, stats.Dex); 1285 CMP_OUT2 (dex, stats.Dex);
… …
1353 CMP_OUT2 (grace, stats.grace); 1296 CMP_OUT2 (grace, stats.grace);
1354 CMP_OUT2 (maxgrace, stats.maxgrace); 1297 CMP_OUT2 (maxgrace, stats.maxgrace);
1355 CMP_OUT2 (exp, stats.exp); 1298 CMP_OUT2 (exp, stats.exp);
1356 1299
1357 CMP_OUT (perm_exp); 1300 CMP_OUT (perm_exp);
1358 CMP_OUT (expmul); 1301 //CMP_OUT (expmul);
1359 1302
1360 CMP_OUT2 (food, stats.food); 1303 CMP_OUT2 (food, stats.food);
1361 CMP_OUT2 (dam, stats.dam); 1304 CMP_OUT2 (dam, stats.dam);
1362 CMP_OUT2 (luck, stats.luck); 1305 CMP_OUT2 (luck, stats.luck);
1363 CMP_OUT2 (wc, stats.wc); 1306 CMP_OUT2 (wc, stats.wc);
1364 CMP_OUT2 (ac, stats.ac); 1307 CMP_OUT2 (ac, stats.ac);
1365 1308
1366 CMP_OUT (x);
1367 CMP_OUT (y);
1368 CMP_OUT (speed);
1369 CMP_OUT (speed_left);
1370 CMP_OUT2 (move_state, move_status); 1309 CMP_OUT2 (move_state, move_status);
1371 CMP_OUT (attack_movement); 1310 CMP_OUT (attack_movement);
1372 CMP_OUT (nrof); 1311 CMP_OUT (nrof);
1373 CMP_OUT (level); 1312 CMP_OUT (level);
1374 CMP_OUT (direction);
1375 CMP_OUT (type);
1376 CMP_OUT (subtype);
1377 CMP_OUT (attacktype); 1313 CMP_OUT (attacktype);
1378 1314
1315 // using memcmp here seems to be a loss - is gcc vectorising?
1379 for (int i = 0; i < NROFATTACKS; i++) 1316 for (int i = 0; i < NROFATTACKS; i++)
1380 if (expect_false (op->resist[i] != tmp->resist[i])) 1317 if (expect_false (op->resist[i] != arch->resist[i]))
1381 f.put (resist_save[i], op->resist[i]); 1318 f.put (resist_save[i], op->resist[i]);
1382 1319
1383 CMP_OUT (path_attuned); 1320 CMP_OUT (path_attuned);
1384 CMP_OUT (path_repelled); 1321 CMP_OUT (path_repelled);
1385 CMP_OUT (path_denied); 1322 CMP_OUT (path_denied);
1323
1386 CMP_OUT2 (material, materials);//TODO: nuke 1324 CMP_OUT2 (material, materials);//TODO: nuke
1387 CMP_OUT (materialname); 1325 if (op->material != arch->material)
1326 f.put (KW(materialname), op->material->name);
1327
1388 CMP_OUT (value); 1328 CMP_OUT (value);
1389 CMP_OUT (carrying); 1329 CMP_OUT (carrying);
1390 CMP_OUT (weight); 1330 CMP_OUT (weight);
1391 CMP_OUT (invisible); 1331 CMP_OUT (invisible);
1392 CMP_OUT (state); 1332 CMP_OUT (state);
… …
1397 CMP_OUT (last_eat); 1337 CMP_OUT (last_eat);
1398 CMP_OUT (glow_radius); 1338 CMP_OUT (glow_radius);
1399 1339
1400 if (op->flag [FLAG_IS_LINKED]) 1340 if (op->flag [FLAG_IS_LINKED])
1401 if (auto (ol, op->find_link ())) 1341 if (auto (ol, op->find_link ()))
1402 f.put (KW_connected, ol->id); 1342 f.put (KW(connected), ol->id);
1403 1343
1404 CMP_OUT (randomitems); 1344 CMP_OUT (randomitems);
1345
1405 CMP_OUT2 (container, weight_limit); 1346 CMP_OUT2 (container, weight_limit);
1406 1347
1407 CMP_OUT (run_away); 1348 CMP_OUT (run_away);
1408 CMP_OUT (pick_up); 1349 CMP_OUT (pick_up);
1409 CMP_OUT (will_apply); 1350 CMP_OUT (will_apply);
… …
1424 CMP_OUT (move_on); 1365 CMP_OUT (move_on);
1425 CMP_OUT (move_off); 1366 CMP_OUT (move_off);
1426 CMP_OUT (move_slow); 1367 CMP_OUT (move_slow);
1427 CMP_OUT (move_slow_penalty); 1368 CMP_OUT (move_slow_penalty);
1428 1369
1429 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 ()))
1430 for (int i = 0; i <= NUM_FLAGS; i++) 1380 for (int i = 0; i < NUM_FLAGS; i++)
1431 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1381 if (expect_false (diff [i]))
1432 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
1433 1388
1434 // save body locations 1389 // save body locations. gcc's memcmp does an abysmal job when used
1435 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1390 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1436 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1391 if (expect_false (op->slot[i].info != arch->slot[i].info))
1437 f.put (body_locations[i].save_name, op->slot[i].info); 1392 f.put (body_locations[i].kw, op->slot[i].info);
1438} 1393}
1439 1394
1440/* 1395/*
1441 * Dumps all variables in an object to a file. 1396 * Dumps all variables in an object to a file.
1442 * 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,
1443 * 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.
1444 */ 1399 */
1445bool 1400bool
1446object::write (object_freezer &f) 1401object::write (object_freezer &f)
1447{ 1402{
1448 if (is_arch ()) 1403 if (expect_false (is_arch ()))
1449 { 1404 {
1450 f.put (KW_object, arch->archname); 1405 f.put (KW(object), arch->archname);
1451 write_diff (f, this, archetype::empty); 1406 write_diff (f, this, archetype::empty);
1452 } 1407 }
1453 else 1408 else
1454 { 1409 {
1455 f.put (KW_arch, arch->archname); 1410 f.put (KW(arch), arch->archname);
1456 write_diff (f, this, arch); 1411 write_diff (f, this, arch);
1457 } 1412 }
1458 1413
1459 for (object *tmp = inv; tmp; tmp = tmp->below) 1414 for (object *tmp = inv; tmp; tmp = tmp->below)
1460 tmp->write (f); 1415 tmp->write (f);
1461 1416
1462 f.put (this); 1417 f.put (this);
1463 f.put (KW_end); 1418 f.put (KW(end));
1464 1419
1465 return true; 1420 return true;
1466} 1421}
1467 1422
1468///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
… …
1474{ 1429{
1475 object_thawer f (filename); 1430 object_thawer f (filename);
1476 1431
1477 for (;;) 1432 for (;;)
1478 { 1433 {
1434 coroapi::cede_to_tick ();
1435
1479 switch (f.kw) 1436 switch (f.kw)
1480 { 1437 {
1481 case KW_region: 1438 case KW_region:
1482 if (!region::read (f)) 1439 if (!region::read (f))
1483 return false; 1440 return false;

Diff Legend

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