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

Diff Legend

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