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.146 by root, Wed Nov 11 04:45:22 2009 UTC vs.
Revision 1.177 by root, Wed Nov 16 23:41:59 2016 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;
… …
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)
… …
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 (material == MATERIAL_NULL && !(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 select_material (this, map ? map->difficulty : 5); 336 select_material (this, map ? map->difficulty : 5);
337 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 }
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.
342 */ 349 */
… …
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 739 case KW_materialname: f.get (material); break;
731 case KW_materialname:
732 {
733 shstr sh;
734 f.get (sh);
735 material = name_to_material (sh);
736 }
737 break;
738 740
739 /* These are the new values */ 741 /* These are the new values */
740 case KW_move_block: set_move (move_block, f.get_str ()); break; 742 case KW_move_block: set_move (move_block, f); break;
741 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 743 case KW_move_allow: set_move (move_allow, f); break;
742 case KW_move_type: set_move (move_type, f.get_str ()); break; 744 case KW_move_type: set_move (move_type , f); break;
743 case KW_move_on: set_move (move_on, f.get_str ()); break; 745 case KW_move_on: set_move (move_on , f); break;
744 case KW_move_off: set_move (move_off, f.get_str ()); break; 746 case KW_move_off: set_move (move_off , f); break;
745 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 747 case KW_move_slow: set_move (move_slow , f); break;
746
747 /* These are all legacy - any new objects should use the move_ .. values */
748 case KW_no_pass:
749 {
750 if (f.get_sint32 ())
751 move_block = MOVE_ALL;
752 else
753 move_block = 0;
754 }
755
756 break;
757
758 /* These are all legacy - any new objects should use the move_ .. values */
759 case KW_walk_on:
760 {
761 if (f.get_sint32 ())
762 move_on |= MOVE_WALK;
763 else
764 move_on &= ~MOVE_WALK;
765 }
766
767 break;
768
769 /* These are all legacy - any new objects should use the move_ .. values */
770 case KW_walk_off:
771 {
772 if (f.get_sint32 ())
773 move_off |= MOVE_WALK;
774 else
775 move_off &= ~MOVE_WALK;
776 }
777 break;
778
779 /* These are all legacy - any new objects should use the move_ .. values */
780 case KW_fly_on:
781 {
782 if (f.get_sint32 ())
783 move_on |= MOVE_FLY_LOW;
784 else
785 move_on &= ~MOVE_FLY_LOW;
786 }
787 break;
788
789 /* These are all legacy - any new objects should use the move_ .. values */
790 case KW_fly_off:
791 {
792 if (f.get_sint32 ())
793 move_off |= MOVE_FLY_LOW;
794 else
795 move_off &= ~MOVE_FLY_LOW;
796 }
797 break;
798 748
799 //TODO: remove these after converting archetypes 749 //TODO: remove these after converting archetypes
800 case KW_can_use_wand: 750 case KW_can_use_wand:
801 GET_FLAG (this, FLAG_USE_RANGE); 751 GET_FLAG (this, FLAG_USE_RANGE);
802 break; 752 break;
803 753
804 /* These are all legacy - any new objects should use the move_ .. values */
805 case KW_flying:
806 {
807 if (f.get_sint32 ())
808 move_type |= MOVE_FLY_LOW;
809 else
810 move_type &= ~MOVE_FLY_LOW;
811 }
812 break;
813
814
815 case KW_identified: 754 case KW_identified:
816 GET_FLAG (this, FLAG_IDENTIFIED); 755 GET_FLAG (this, FLAG_IDENTIFIED);
817 //TODO: move to check_object or so 756 //TODO: move to check_object or so
818 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 757 if (this->flag [FLAG_IDENTIFIED])
819 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 758 this->clr_flag (FLAG_KNOWN_MAGICAL);
820 759
821 break; 760 break;
822 761
823 case KW_friendly: 762 case KW_friendly:
824 if (f.get_bool ()) 763 if (f.get_bool ())
… …
851 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; 790 case KW_changing: GET_FLAG (this, FLAG_CHANGING); break;
852 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; 791 case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break;
853 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; 792 case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break;
854 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; 793 case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break;
855 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;
856 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; 796 case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break;
857 case KW_scared: GET_FLAG (this, FLAG_SCARED); break; 797 case KW_scared: GET_FLAG (this, FLAG_SCARED); break;
858 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; 798 case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break;
859 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 799 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
860 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 800 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
… …
912 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 852 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
913 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 853 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
914 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;
915 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 855 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
916 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;
917 859
918 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 860 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
919 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 861 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
920 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 862 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
921 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 863 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
996 add_link (map, connected); 938 add_link (map, connected);
997 } 939 }
998 break; 940 break;
999 941
1000 case KW_randomitems: 942 case KW_randomitems:
1001 if (f.get_str ()) 943 if (f.has_value ())
1002 { 944 {
1003 randomitems = 945 randomitems =
1004 loading_arch 946 loading_arch
1005 ? treasurelist::get (f.get_str ()) 947 ? treasurelist::get (f.get_str ())
1006 : treasurelist::find (f.get_str ()); 948 : treasurelist::find (f.get_str ());
… …
1033 975
1034 f.next (); 976 f.next ();
1035 return true; 977 return true;
1036 978
1037 case KW_ERROR: 979 case KW_ERROR:
1038 // append as key value pair (do not use kv_set as it prepends)
1039 // 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
1040 { 981 // the list gets reversed after loading
1041 key_value *kv = new key_value; 982 kv.add (shstr (f.kw_str), shstr (f.value));
1042
1043 kv->next = 0;
1044 kv->key = shstr (f.kw_str);
1045 kv->value = shstr (f.value);
1046
1047 if (!last_kv)
1048 key_values = last_kv = kv;
1049 else
1050 {
1051 while (last_kv->next)
1052 last_kv = last_kv->next;
1053
1054 last_kv->next = kv;
1055 last_kv = kv;
1056 }
1057 }
1058 //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D
1059 break; 983 break;
1060 984
1061 default: 985 default:
1062 if (!f.parse_error ("object", name)) 986 if (!f.parse_error ("object", name))
1063 return false; 987 return false;
… …
1075 999
1076 archetype *arch = archetype::find (f.get_str ()); 1000 archetype *arch = archetype::find (f.get_str ());
1077 1001
1078 if (!arch) 1002 if (!arch)
1079 { 1003 {
1080 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 ());
1081 arch = archetype::find (shstr_earthwall); 1005 arch = archetype::find (shstr_earthwall);
1082 } 1006 }
1083 1007
1084 assert (arch); //D maybe use exception handling of sorts? 1008 assert (arch); //D maybe use exception handling of sorts?
1085 1009
… …
1093 if (!op->parse_kv (f)) 1017 if (!op->parse_kv (f))
1094 { 1018 {
1095 op->destroy (); 1019 op->destroy ();
1096 return 0; 1020 return 0;
1097 } 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 ();
1098 1026
1099 op->post_load_check (); 1027 op->post_load_check ();
1100 return op; 1028 return op;
1101} 1029}
1102 1030
… …
1107 * override values and in c_wiz to mutate values. 1035 * override values and in c_wiz to mutate values.
1108 */ 1036 */
1109int 1037int
1110set_variable (object *op, char *buf) 1038set_variable (object *op, char *buf)
1111{ 1039{
1112 object_thawer f (buf, (AV *)0); 1040 object_thawer f (format ("%s\nend", buf), (AV *)0);
1113 1041
1114 return op->parse_kv (f); 1042 return op->parse_kv (f);
1115} 1043}
1116 1044
1117// compare *op against *arch and output differences 1045// compare *op against *arch and output differences
… …
1137 KW_NULL, 1065 KW_NULL,
1138 KW_applied, 1066 KW_applied,
1139 KW_unpaid, 1067 KW_unpaid,
1140 KW_can_use_shield, 1068 KW_can_use_shield,
1141 KW_no_pick, 1069 KW_no_pick,
1142 KW_NULL, // walk_on 1070 KW_is_transparent_floor,
1143 /* 10 */ 1071 /* 10 */
1144 KW_NULL, // no_pass 1072 KW_NULL, // no_pass
1145 KW_is_animated, 1073 KW_is_animated,
1146 KW_NULL, // slow_move 1074 KW_NULL, // slow_move
1147 KW_NULL, // flying 1075 KW_NULL, // flying
… …
1242 /* 100 */ 1170 /* 100 */
1243 KW_neutral, 1171 KW_neutral,
1244 KW_no_attack, 1172 KW_no_attack,
1245 KW_no_damage, 1173 KW_no_damage,
1246 KW_obj_original, 1174 KW_obj_original,
1247 KW_NULL, 1175 KW_random_speed,
1248 KW_activate_on_push, 1176 KW_activate_on_push,
1249 KW_activate_on_release, 1177 KW_activate_on_release,
1250 KW_is_water, 1178 KW_is_water,
1251 KW_use_content_on_gen, 1179 KW_use_content_on_gen,
1252 KW_NULL, 1180 KW_NULL,
… …
1269 } flagmask; 1197 } flagmask;
1270 1198
1271 /* 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
1272 * keys that match field names will be overwritten by the loader. 1200 * keys that match field names will be overwritten by the loader.
1273 */ 1201 */
1274 for (key_value *kv = op->key_values; kv; kv = kv->next) 1202 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1275 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1203 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1276 f.put (kv->key, kv->value); 1204 f.put (kv->key, kv->value);
1277 1205
1278 if (op->uuid) 1206 if (op->uuid)
1279 { 1207 {
1280 // highly optimised - this is often 25% of all data written 1208 // highly optimised - this is often 25% of all data written
… …
1287 *ptr++ = '\n'; 1215 *ptr++ = '\n';
1288 1216
1289 f.alloc (ptr - cur); 1217 f.alloc (ptr - cur);
1290 } 1218 }
1291 1219
1292#define CMP_OUT(v) if (expect_false (op->v != arch->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)
1293#define CMP_OUT2(k,v) if (expect_false (op->v != arch->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)
1294 1222
1295 CMP_OUT (x); 1223 CMP_OUT (x);
1296 CMP_OUT (y); 1224 CMP_OUT (y);
1297 1225
1298 CMP_OUT (type); 1226 CMP_OUT (type);
1299 CMP_OUT (subtype); 1227 CMP_OUT (subtype);
1300 CMP_OUT (direction); 1228 CMP_OUT (direction);
1301 1229
1302 CMP_OUT (name); 1230 CMP_OUT (name);
1303 CMP_OUT (name_pl); 1231 CMP_OUT (name_pl);
1304
1305 CMP_OUT (speed); 1232 CMP_OUT (speed);
1306 CMP_OUT (speed_left); 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 }
1307 1251
1308 CMP_OUT (title); 1252 CMP_OUT (title);
1309 CMP_OUT (race); 1253 CMP_OUT (race);
1310 CMP_OUT (slaying); 1254 CMP_OUT (slaying);
1311 CMP_OUT (skill); 1255 CMP_OUT (skill);
1312 1256
1313 CMP_OUT (tag); 1257 CMP_OUT (tag);
1314 CMP_OUT (custom_name); 1258 CMP_OUT (custom_name);
1315 1259
1316 if (object *owner = op->owner) 1260 if (object *owner = op->owner)
1317 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1261 if (const char *ref = owner->ref ())
1262 f.put (KW(owner), ref);
1318 1263
1319 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1264 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1320 1265
1321 CMP_OUT (other_arch); 1266 CMP_OUT (other_arch);
1322 1267
1323 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1268 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1324 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1269 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1325 1270
1326 if (op->face != arch->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);
1327 if (op->sound != arch->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);
1328 if (op->sound_destroy != arch->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);
1329 1274
1330 if (op->animation_id != arch->animation_id) 1275 if (op->animation_id != arch->animation_id)
1331 if (op->has_anim ()) 1276 if (op->has_anim ())
1332 f.put (KW_animation, op->anim ().name); 1277 f.put (KW(animation), op->anim ().name);
1333 else 1278 else
1334 { 1279 {
1335 f.put (KW_animation, (const char *)0); 1280 f.put (KW(animation));
1336 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1281 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1337 } 1282 }
1338 1283
1339 CMP_OUT2 (str, stats.Str); 1284 CMP_OUT2 (str, stats.Str);
1340 CMP_OUT2 (dex, stats.Dex); 1285 CMP_OUT2 (dex, stats.Dex);
… …
1376 CMP_OUT (path_repelled); 1321 CMP_OUT (path_repelled);
1377 CMP_OUT (path_denied); 1322 CMP_OUT (path_denied);
1378 1323
1379 CMP_OUT2 (material, materials);//TODO: nuke 1324 CMP_OUT2 (material, materials);//TODO: nuke
1380 if (op->material != arch->material) 1325 if (op->material != arch->material)
1381 f.put (KW_materialname, op->material->name); 1326 f.put (KW(materialname), op->material->name);
1382 1327
1383 CMP_OUT (value); 1328 CMP_OUT (value);
1384 CMP_OUT (carrying); 1329 CMP_OUT (carrying);
1385 CMP_OUT (weight); 1330 CMP_OUT (weight);
1386 CMP_OUT (invisible); 1331 CMP_OUT (invisible);
… …
1392 CMP_OUT (last_eat); 1337 CMP_OUT (last_eat);
1393 CMP_OUT (glow_radius); 1338 CMP_OUT (glow_radius);
1394 1339
1395 if (op->flag [FLAG_IS_LINKED]) 1340 if (op->flag [FLAG_IS_LINKED])
1396 if (auto (ol, op->find_link ())) 1341 if (auto (ol, op->find_link ()))
1397 f.put (KW_connected, ol->id); 1342 f.put (KW(connected), ol->id);
1398 1343
1399 CMP_OUT (randomitems); 1344 CMP_OUT (randomitems);
1345
1400 CMP_OUT2 (container, weight_limit); 1346 CMP_OUT2 (container, weight_limit);
1401 1347
1402 CMP_OUT (run_away); 1348 CMP_OUT (run_away);
1403 CMP_OUT (pick_up); 1349 CMP_OUT (pick_up);
1404 CMP_OUT (will_apply); 1350 CMP_OUT (will_apply);
… …
1421 CMP_OUT (move_slow); 1367 CMP_OUT (move_slow);
1422 CMP_OUT (move_slow_penalty); 1368 CMP_OUT (move_slow_penalty);
1423 1369
1424 object::flags_t diff = (op->flag ^ arch->flag) & flagmask; 1370 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1425 1371
1372#if stdcpp // we need gcc, sorry
1426 if (diff [FLAG_OBJ_ORIGINAL]) 1373 if (diff [FLAG_OBJ_ORIGINAL])
1427 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0"); 1374 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1428 1375
1429 diff.reset (FLAG_OBJ_ORIGINAL); 1376 diff.reset (FLAG_OBJ_ORIGINAL);
1430 1377
1431 // quickly test whether any other flags differ 1378 // quickly test whether any other flags differ
1432 if (expect_true (diff.any ())) 1379 if (expect_true (diff.any ()))
1433 for (int i = 0; i < NUM_FLAGS; i++) 1380 for (int i = 0; i < NUM_FLAGS; i++)
1434 if (expect_false (diff [i])) 1381 if (expect_false (diff [i]))
1435 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
1436 1388
1437 // save body locations. gcc's memcmp does an abysmal job when used 1389 // save body locations. gcc's memcmp does an abysmal job when used
1438 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1390 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1439 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1391 if (expect_false (op->slot[i].info != arch->slot[i].info))
1440 f.put (body_locations[i].save_name, op->slot[i].info); 1392 f.put (body_locations[i].kw, op->slot[i].info);
1441} 1393}
1442 1394
1443/* 1395/*
1444 * Dumps all variables in an object to a file. 1396 * Dumps all variables in an object to a file.
1445 * 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,
1446 * 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.
1447 */ 1399 */
1448bool 1400bool
1449object::write (object_freezer &f) 1401object::write (object_freezer &f)
1450{ 1402{
1451 if (is_arch ()) 1403 if (expect_false (is_arch ()))
1452 { 1404 {
1453 f.put (KW_object, arch->archname); 1405 f.put (KW(object), arch->archname);
1454 write_diff (f, this, archetype::empty); 1406 write_diff (f, this, archetype::empty);
1455 } 1407 }
1456 else 1408 else
1457 { 1409 {
1458 f.put (KW_arch, arch->archname); 1410 f.put (KW(arch), arch->archname);
1459 write_diff (f, this, arch); 1411 write_diff (f, this, arch);
1460 } 1412 }
1461 1413
1462 for (object *tmp = inv; tmp; tmp = tmp->below) 1414 for (object *tmp = inv; tmp; tmp = tmp->below)
1463 tmp->write (f); 1415 tmp->write (f);
1464 1416
1465 f.put (this); 1417 f.put (this);
1466 f.put (KW_end); 1418 f.put (KW(end));
1467 1419
1468 return true; 1420 return true;
1469} 1421}
1470 1422
1471///////////////////////////////////////////////////////////////////////////// 1423/////////////////////////////////////////////////////////////////////////////
… …
1477{ 1429{
1478 object_thawer f (filename); 1430 object_thawer f (filename);
1479 1431
1480 for (;;) 1432 for (;;)
1481 { 1433 {
1434 coroapi::cede_to_tick ();
1435
1482 switch (f.kw) 1436 switch (f.kw)
1483 { 1437 {
1484 case KW_region: 1438 case KW_region:
1485 if (!region::read (f)) 1439 if (!region::read (f))
1486 return false; 1440 return false;

Diff Legend

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