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.170 by root, Sat May 7 17:14:41 2011 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992 Frank Tore Johansen
7 * 7 *
8 * Deliantra is free software: you can redistribute it and/or modify it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
21 * 21 *
22 * The authors can be reached via e-mail to <support@deliantra.net> 22 * The authors can be reached via e-mail to <support@deliantra.net>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
… …
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)
… …
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 */
… …
480 animate_object (this, direction); 487 animate_object (this, direction);
481 } 488 }
482} 489}
483 490
484static void 491static void
485set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
486{ 493{
487 static const struct flagstr { 494 static const struct flagstr {
488 const char *name; 495 const char *name;
489 MoveType flags; 496 MoveType flags;
490 } move_flags[] = { 497 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
499 }; 506 };
500 507
501 if (!str) 508 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 509
507 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
508 { 511 {
509 mt = atoi (str); 512 mt = atoi (str);
510 return; 513 return;
511 } 514 }
512 515
513 mt = 0; 516 mt = 0;
514 517
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 519 {
517 bool negate = 0; 520 bool negate = 0;
518 521
519 if (*str == '-') 522 if (*str == '-')
520 { 523 {
521 negate = 1; 524 negate = 1;
522 str++; 525 str++;
523 } 526 }
524 527
525 for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) 528 for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f)
526 { 529 {
527 if (!strcmp (f->name, str)) 530 if (!strcmp (f->name, str))
528 { 531 {
529 if (negate) 532 if (negate)
530 mt &= ~f->flags; 533 mt &= ~f->flags;
… …
547 550
548bool 551bool
549object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
550{ 553{
551 object *op_inv = inv; 554 object *op_inv = inv;
552 key_value *last_kv = key_values; 555 key_value *last_kv = kv.first;
553 556
554 for (;;) 557 for (;;)
555 { 558 {
556 switch (f.kw) 559 switch (f.kw)
557 { 560 {
558 case KW_uuid: 561 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 562 if (!uuid.parse (f.get_str ()))
561 { 563 {
562 f.parse_warn ("unparseable uuid"); 564 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 565 uuid = UUID::gen ();
564 } 566 }
565 break; 567 break;
566 568
567 case KW_oid: 569 case KW_oid:
568 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
569 break; 571 break;
… …
587 // was: insert_ob_in_ob (tmp, op); 589 // was: insert_ob_in_ob (tmp, op);
588 // but manually adding it can improve map loading times a lot 590 // but manually adding it can improve map loading times a lot
589 // also, appending instead of prepending keeps the 591 // also, appending instead of prepending keeps the
590 // save ordering the same between repeated load/saves. 592 // save ordering the same between repeated load/saves.
591 // and finally we do not want any funny effects 593 // and finally we do not want any funny effects
592 CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); 594 tmp->clr_flag (FLAG_OBJ_ORIGINAL);
593 CLEAR_FLAG (tmp, FLAG_REMOVED); 595 tmp->clr_flag (FLAG_REMOVED);
594 596
595 if (!op_inv) 597 if (!op_inv)
596 { 598 {
597 inv = tmp; 599 inv = tmp;
598 tmp->above = 0; 600 tmp->above = 0;
… …
631 f.delayed_deref (this, owner, f.get_str ()); 633 f.delayed_deref (this, owner, f.get_str ());
632 break; 634 break;
633 635
634 case KW_animation: 636 case KW_animation:
635 { 637 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 638 this->clr_flag (FLAG_ANIMATE);
637 animation_id = 0; 639 animation_id = 0;
638 640
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 642 this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here
642 } 643 }
643 break; 644 break;
644 645
645 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
646 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
647 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
648 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
649 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
650 652
651 case KW_speed: 653 case KW_speed:
652 f.get (speed); 654 f.get (speed);
653 655
… …
662 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
664 break; 666 break;
665 667
666 case KW_face: 668 case KW_face:
667 face = face_find (f.get_str ()); 669 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 670 break;
669 671
670 case KW_sound: 672 case KW_sound:
673 if (f.has_value ())
674 {
671 sound = sound_find (f.get_str ()); 675 sound = sound_find (f.get_str ());
672 if (!sound) 676 if (!sound)
673 f.parse_warn ("sound not found"); 677 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
678 }
679 else
680 sound = 0;
674 break; 681 break;
675 682
676 case KW_sound_destroy: 683 case KW_sound_destroy:
684 if (f.has_value ())
685 {
677 sound_destroy = sound_find (f.get_str ()); 686 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 687 if (!sound_destroy)
679 f.parse_warn ("sound not found"); 688 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
689 }
690 else
691 sound_destroy = 0;
680 break; 692 break;
681 693
682 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
684 696
… …
725 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
730 case KW_materialname: f.get (materialname); break; 742 case KW_materialname: f.get (material); break;
731 743
732 /* These are the new values */ 744 /* These are the new values */
733 case KW_move_block: set_move (move_block, f.get_str ()); break; 745 case KW_move_block: set_move (move_block, f); break;
734 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 746 case KW_move_allow: set_move (move_allow, f); break;
735 case KW_move_type: set_move (move_type, f.get_str ()); break; 747 case KW_move_type: set_move (move_type , f); break;
736 case KW_move_on: set_move (move_on, f.get_str ()); break; 748 case KW_move_on: set_move (move_on , f); break;
737 case KW_move_off: set_move (move_off, f.get_str ()); break; 749 case KW_move_off: set_move (move_off , f); break;
738 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 750 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 751
792 //TODO: remove these after converting archetypes 752 //TODO: remove these after converting archetypes
793 case KW_can_use_wand: 753 case KW_can_use_wand:
794 GET_FLAG (this, FLAG_USE_RANGE); 754 GET_FLAG (this, FLAG_USE_RANGE);
795 break; 755 break;
796 756
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: 757 case KW_identified:
809 GET_FLAG (this, FLAG_IDENTIFIED); 758 GET_FLAG (this, FLAG_IDENTIFIED);
810 //TODO: move to check_object or so 759 //TODO: move to check_object or so
811 if (QUERY_FLAG (this, FLAG_IDENTIFIED)) 760 if (this->flag [FLAG_IDENTIFIED])
812 CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); 761 this->clr_flag (FLAG_KNOWN_MAGICAL);
813 762
814 break; 763 break;
815 764
816 case KW_friendly: 765 case KW_friendly:
817 if (f.get_bool ()) 766 if (f.get_bool ())
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 801 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 802 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 803 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 804 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 805 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; 806 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 807 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 808 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
861 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 809 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
862 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 810 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
906 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 854 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
907 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 855 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; 856 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; 857 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
910 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 858 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
859 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
860 case KW_is_quad: GET_FLAG (this, FLAG_IS_QUAD); break;
911 861
912 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 862 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
913 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 863 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
914 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 864 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
915 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 865 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
990 add_link (map, connected); 940 add_link (map, connected);
991 } 941 }
992 break; 942 break;
993 943
994 case KW_randomitems: 944 case KW_randomitems:
995 if (f.get_str ()) 945 if (f.has_value ())
996 { 946 {
997 randomitems = 947 randomitems =
998 loading_arch 948 loading_arch
999 ? treasurelist::get (f.get_str ()) 949 ? treasurelist::get (f.get_str ())
1000 : treasurelist::find (f.get_str ()); 950 : treasurelist::find (f.get_str ());
… …
1027 977
1028 f.next (); 978 f.next ();
1029 return true; 979 return true;
1030 980
1031 case KW_ERROR: 981 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 982 // we do not even try to find old values, duplicate keys stay duplicate
1034 { 983 // the list gets reversed after loading
1035 key_value *kv = new key_value; 984 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; 985 break;
1054 986
1055 default: 987 default:
1056 if (!f.parse_error ("object", name)) 988 if (!f.parse_error ("object", name))
1057 return false; 989 return false;
… …
1069 1001
1070 archetype *arch = archetype::find (f.get_str ()); 1002 archetype *arch = archetype::find (f.get_str ());
1071 1003
1072 if (!arch) 1004 if (!arch)
1073 { 1005 {
1074 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1006 LOG (llevError, "object referring to nonexistent archetype '%s'.\n", f.get_str ());
1075 arch = archetype::find (shstr_earthwall); 1007 arch = archetype::find (shstr_earthwall);
1076 } 1008 }
1077 1009
1078 assert (arch); //D maybe use exception handling of sorts? 1010 assert (arch); //D maybe use exception handling of sorts?
1079 1011
… …
1087 if (!op->parse_kv (f)) 1019 if (!op->parse_kv (f))
1088 { 1020 {
1089 op->destroy (); 1021 op->destroy ();
1090 return 0; 1022 return 0;
1091 } 1023 }
1024
1025 // the loader reverses the ordering of kv-pairs, so we reverse it again after loading
1026 // that greatly simplifies the loading code.
1027 op->kv.reverse ();
1092 1028
1093 op->post_load_check (); 1029 op->post_load_check ();
1094 return op; 1030 return op;
1095} 1031}
1096 1032
… …
1101 * override values and in c_wiz to mutate values. 1037 * override values and in c_wiz to mutate values.
1102 */ 1038 */
1103int 1039int
1104set_variable (object *op, char *buf) 1040set_variable (object *op, char *buf)
1105{ 1041{
1106 object_thawer f (buf, (AV *)0); 1042 object_thawer f (format ("%s\nend", buf), (AV *)0);
1107 1043
1108 return op->parse_kv (f); 1044 return op->parse_kv (f);
1109} 1045}
1110 1046
1111// compare *op against *tmp and output differences 1047// compare *op against *arch and output differences
1112static void 1048static void
1113write_diff (object_freezer &f, object *op, object *tmp) 1049write_diff (object_freezer &f, object *op, object *arch)
1114{ 1050{
1115 static const keyword resist_save[NROFATTACKS] = { 1051 static const keyword resist_save[NROFATTACKS] = {
1116# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1052# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1117# include "attackinc.h" 1053# include "attackinc.h"
1118# undef def 1054# undef def
… …
1132 KW_applied, 1068 KW_applied,
1133 KW_unpaid, 1069 KW_unpaid,
1134 KW_can_use_shield, 1070 KW_can_use_shield,
1135 KW_no_pick, 1071 KW_no_pick,
1136 KW_NULL, // walk_on 1072 KW_NULL, // walk_on
1073 /* 10 */
1137 KW_NULL, // no_pass 1074 KW_NULL, // no_pass
1138 /* 10 */
1139 KW_is_animated, 1075 KW_is_animated,
1140 KW_NULL, // slow_move 1076 KW_NULL, // slow_move
1141 KW_NULL, // flying 1077 KW_NULL, // flying
1142 KW_monster, 1078 KW_monster,
1143 KW_friendly, 1079 KW_friendly,
1144 KW_generator, 1080 KW_generator,
1145 KW_is_thrown, 1081 KW_is_thrown,
1146 KW_auto_apply, 1082 KW_auto_apply,
1147 KW_treasure_env, 1083 KW_treasure_env,
1084 /* 20 */
1148 KW_player_sold, 1085 KW_player_sold,
1149 /* 20 */
1150 KW_see_invisible, 1086 KW_see_invisible,
1151 KW_can_roll, 1087 KW_can_roll,
1152 KW_overlay_floor, 1088 KW_overlay_floor,
1153 KW_is_turnable, 1089 KW_is_turnable,
1154 KW_NULL, // walk_off 1090 KW_NULL, // walk_off
1155 KW_NULL, // fly_on 1091 KW_NULL, // fly_on
1156 KW_NULL, // fly_off 1092 KW_NULL, // fly_off
1157 KW_is_used_up, 1093 KW_is_used_up,
1158 KW_identified, 1094 KW_identified,
1095 /* 30 */
1159 KW_reflecting, 1096 KW_reflecting,
1160 /* 30 */
1161 KW_changing, 1097 KW_changing,
1162 KW_splitting, 1098 KW_splitting,
1163 KW_hitback, 1099 KW_hitback,
1164 KW_startequip, 1100 KW_startequip,
1165 KW_blocksview, 1101 KW_blocksview,
1166 KW_undead, 1102 KW_undead,
1167 KW_scared, 1103 KW_scared,
1168 KW_unaggressive, 1104 KW_unaggressive,
1169 KW_reflect_missile, 1105 KW_reflect_missile,
1106 /* 40 */
1170 KW_reflect_spell, 1107 KW_reflect_spell,
1171 /* 40 */
1172 KW_no_magic, 1108 KW_no_magic,
1173 KW_no_fix_player, 1109 KW_NULL,
1174 KW_is_lightable, 1110 KW_is_lightable,
1175 KW_tear_down, 1111 KW_tear_down,
1176 KW_run_away, 1112 KW_run_away,
1177 KW_NULL, // pass_thru 1113 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1114 KW_NULL, // an_pass_thru
1179 KW_pick_up, 1115 KW_pick_up,
1180 KW_unique, 1116 KW_unique,
1117 /* 50 */
1181 KW_no_drop, 1118 KW_no_drop,
1182 /* 50 */
1183 KW_NULL, // wizcast 1119 KW_NULL, // wizcast
1184 KW_can_cast_spell, 1120 KW_can_cast_spell,
1185 KW_can_use_scroll, 1121 KW_can_use_scroll,
1186 KW_can_use_range, 1122 KW_can_use_range,
1187 KW_can_use_bow, 1123 KW_can_use_bow,
1188 KW_can_use_armour, 1124 KW_can_use_armour,
1189 KW_can_use_weapon, 1125 KW_can_use_weapon,
1190 KW_can_use_ring, 1126 KW_can_use_ring,
1191 KW_has_ready_range, 1127 KW_has_ready_range,
1128 /* 60 */
1192 KW_has_ready_bow, 1129 KW_has_ready_bow,
1193 /* 60 */
1194 KW_xrays, 1130 KW_xrays,
1195 KW_NULL, 1131 KW_NULL,
1196 KW_is_floor, 1132 KW_is_floor,
1197 KW_lifesave, 1133 KW_lifesave,
1198 KW_no_strength, 1134 KW_no_strength,
1199 KW_sleep, 1135 KW_sleep,
1200 KW_stand_still, 1136 KW_stand_still,
1201 KW_random_move, 1137 KW_random_move,
1202 KW_only_attack, 1138 KW_only_attack,
1139 /* 70 */
1203 KW_confused, 1140 KW_confused,
1204 /* 70 */
1205 KW_stealth, 1141 KW_stealth,
1206 KW_NULL, 1142 KW_NULL,
1207 KW_NULL, 1143 KW_NULL,
1208 KW_cursed, 1144 KW_cursed,
1209 KW_damned, 1145 KW_damned,
1210 KW_see_anywhere, 1146 KW_see_anywhere,
1211 KW_known_magical, 1147 KW_known_magical,
1212 KW_known_cursed, 1148 KW_known_cursed,
1213 KW_can_use_skill, 1149 KW_can_use_skill,
1150 /* 80 */
1214 KW_been_applied, 1151 KW_been_applied,
1215 /* 80 */
1216 KW_has_ready_scroll, 1152 KW_has_ready_scroll,
1217 KW_can_use_rod, 1153 KW_can_use_rod,
1218 KW_precious, 1154 KW_precious,
1219 KW_can_use_horn, 1155 KW_can_use_horn,
1220 KW_make_invisible, 1156 KW_make_invisible,
1221 KW_inv_locked, 1157 KW_inv_locked,
1222 KW_is_wooded, 1158 KW_is_wooded,
1223 KW_is_hilly, 1159 KW_is_hilly,
1224 KW_has_ready_skill, 1160 KW_has_ready_skill,
1161 /* 90 */
1225 KW_has_ready_weapon, 1162 KW_has_ready_weapon,
1226 /* 90 */
1227 KW_no_skill_ident, 1163 KW_no_skill_ident,
1228 KW_is_blind, 1164 KW_is_blind,
1229 KW_can_see_in_dark, 1165 KW_can_see_in_dark,
1230 KW_is_cauldron, 1166 KW_is_cauldron,
1231 KW_NULL, 1167 KW_NULL,
1232 KW_no_steal, 1168 KW_no_steal,
1233 KW_one_hit, 1169 KW_one_hit,
1234 KW_NULL, 1170 KW_NULL,
1235 KW_berserk, 1171 KW_berserk,
1172 /* 100 */
1236 KW_neutral, 1173 KW_neutral,
1237 /* 100 */
1238 KW_no_attack, 1174 KW_no_attack,
1239 KW_no_damage, 1175 KW_no_damage,
1240 KW_obj_original, 1176 KW_obj_original,
1241 KW_NULL, 1177 KW_random_speed,
1242 KW_activate_on_push, 1178 KW_activate_on_push,
1243 KW_activate_on_release, 1179 KW_activate_on_release,
1244 KW_is_water, 1180 KW_is_water,
1245 KW_use_content_on_gen, 1181 KW_use_content_on_gen,
1246 KW_NULL, 1182 KW_NULL,
1183 /* 110 */
1247 KW_is_buildable, 1184 KW_is_buildable,
1248 /* 110 */
1249 KW_destroy_on_death, 1185 KW_destroy_on_death,
1250 KW_NULL, 1186 KW_NULL,
1251 }; 1187 };
1252 1188
1189 // obj_original is the only commonly differing flag between archetype
1190 // and object, so special-case it here to be able to skip the loop
1191 static const struct flagmask : object::flags_t
1192 {
1193 flagmask ()
1194 {
1195 for (int i = 0; i < NUM_FLAGS; i++)
1196 if (flag_names [i])
1197 set (i);
1198 }
1199 } flagmask;
1200
1253 /* This saves the key/value lists. We do it first so that any 1201 /* This saves the key/value lists. We do it first so that any
1254 * keys that match field names will be overwritten by the loader. 1202 * keys that match field names will be overwritten by the loader.
1255 */ 1203 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1204 for (key_value *kv = op->kv.first; kv; kv = kv->next)
1257 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1205 if (arch->kv.empty () || arch->kv [kv->key] != kv->value)
1258 f.put (kv->key, kv->value); 1206 f.put (kv->key, kv->value);
1259 1207
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) 1208 if (op->uuid)
1265 f.put (KW_uuid, op->uuid.c_str ()); 1209 {
1210 // highly optimised - this is often 25% of all data written
1211 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1212 char *ptr = cur;
1266 1213
1214 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1215 ptr += sizeof ("uuid ") - 1;
1216 ptr = op->uuid.append (ptr);
1217 *ptr++ = '\n';
1218
1219 f.alloc (ptr - cur);
1220 }
1221
1267#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1222#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1268#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1223#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1269 1224
1270 if (object *owner = op->owner) 1225 CMP_OUT (x);
1271 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1226 CMP_OUT (y);
1227
1228 CMP_OUT (type);
1229 CMP_OUT (subtype);
1230 CMP_OUT (direction);
1272 1231
1273 CMP_OUT (name); 1232 CMP_OUT (name);
1274 CMP_OUT (name_pl); 1233 CMP_OUT (name_pl);
1275 CMP_OUT (custom_name); 1234 CMP_OUT (speed);
1235
1236 // speed_left is a major time-burner, and has good locality, so
1237 // we use a simple lookup-cache to avoid the very slow printf.
1238 if (op->speed_left != arch->speed_left)
1239 {
1240 static double last_speed_left = 0.;
1241 static char last_speed_left_str [256] = "sl 0\n";
1242 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1243
1244 if (last_speed_left != op->speed_left)
1245 {
1246 last_speed_left = op->speed_left;
1247 last_speed_left_len = sizeof ("sl ") - 1
1248 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1249 }
1250
1251 f.add (last_speed_left_str, last_speed_left_len);
1252 }
1253
1276 CMP_OUT (title); 1254 CMP_OUT (title);
1277 CMP_OUT (race); 1255 CMP_OUT (race);
1256 CMP_OUT (slaying);
1278 CMP_OUT (skill); 1257 CMP_OUT (skill);
1279 CMP_OUT (slaying); 1258
1280 CMP_OUT (tag); 1259 CMP_OUT (tag);
1260 CMP_OUT (custom_name);
1261
1262 if (object *owner = op->owner)
1263 if (const char *ref = owner->ref ())
1264 f.put (KW(owner), ref);
1265
1266 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1267
1281 CMP_OUT (other_arch); 1268 CMP_OUT (other_arch);
1282 1269
1283 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1270 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1284 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1271 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1285 1272
1286 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1273 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1287 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1274 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1288 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1275 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1289 1276
1290 if (op->animation_id != tmp->animation_id) 1277 if (op->animation_id != arch->animation_id)
1291 if (op->has_anim ()) 1278 if (op->has_anim ())
1292 f.put (KW_animation, op->anim ().name); 1279 f.put (KW(animation), op->anim ().name);
1293 else 1280 else
1294 { 1281 {
1295 f.put (KW_animation, (const char *)0); 1282 f.put (KW(animation));
1296 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1283 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1297 } 1284 }
1298 1285
1299 CMP_OUT2 (str, stats.Str); 1286 CMP_OUT2 (str, stats.Str);
1300 CMP_OUT2 (dex, stats.Dex); 1287 CMP_OUT2 (dex, stats.Dex);
… …
1311 CMP_OUT2 (grace, stats.grace); 1298 CMP_OUT2 (grace, stats.grace);
1312 CMP_OUT2 (maxgrace, stats.maxgrace); 1299 CMP_OUT2 (maxgrace, stats.maxgrace);
1313 CMP_OUT2 (exp, stats.exp); 1300 CMP_OUT2 (exp, stats.exp);
1314 1301
1315 CMP_OUT (perm_exp); 1302 CMP_OUT (perm_exp);
1316 CMP_OUT (expmul); 1303 //CMP_OUT (expmul);
1317 1304
1318 CMP_OUT2 (food, stats.food); 1305 CMP_OUT2 (food, stats.food);
1319 CMP_OUT2 (dam, stats.dam); 1306 CMP_OUT2 (dam, stats.dam);
1320 CMP_OUT2 (luck, stats.luck); 1307 CMP_OUT2 (luck, stats.luck);
1321 CMP_OUT2 (wc, stats.wc); 1308 CMP_OUT2 (wc, stats.wc);
1322 CMP_OUT2 (ac, stats.ac); 1309 CMP_OUT2 (ac, stats.ac);
1323 1310
1324 CMP_OUT (x);
1325 CMP_OUT (y);
1326 CMP_OUT (speed);
1327 CMP_OUT (speed_left);
1328 CMP_OUT2 (move_state, move_status); 1311 CMP_OUT2 (move_state, move_status);
1329 CMP_OUT (attack_movement); 1312 CMP_OUT (attack_movement);
1330 CMP_OUT (nrof); 1313 CMP_OUT (nrof);
1331 CMP_OUT (level); 1314 CMP_OUT (level);
1332 CMP_OUT (direction);
1333 CMP_OUT (type);
1334 CMP_OUT (subtype);
1335 CMP_OUT (attacktype); 1315 CMP_OUT (attacktype);
1336 1316
1317 // using memcmp here seems to be a loss - is gcc vectorising?
1337 for (int i = 0; i < NROFATTACKS; i++) 1318 for (int i = 0; i < NROFATTACKS; i++)
1338 if (expect_false (op->resist[i] != tmp->resist[i])) 1319 if (expect_false (op->resist[i] != arch->resist[i]))
1339 f.put (resist_save[i], op->resist[i]); 1320 f.put (resist_save[i], op->resist[i]);
1340 1321
1341 CMP_OUT (path_attuned); 1322 CMP_OUT (path_attuned);
1342 CMP_OUT (path_repelled); 1323 CMP_OUT (path_repelled);
1343 CMP_OUT (path_denied); 1324 CMP_OUT (path_denied);
1325
1344 CMP_OUT2 (material, materials);//TODO: nuke 1326 CMP_OUT2 (material, materials);//TODO: nuke
1345 CMP_OUT (materialname); 1327 if (op->material != arch->material)
1328 f.put (KW(materialname), op->material->name);
1329
1346 CMP_OUT (value); 1330 CMP_OUT (value);
1347 CMP_OUT (carrying); 1331 CMP_OUT (carrying);
1348 CMP_OUT (weight); 1332 CMP_OUT (weight);
1349 CMP_OUT (invisible); 1333 CMP_OUT (invisible);
1350 CMP_OUT (state); 1334 CMP_OUT (state);
… …
1355 CMP_OUT (last_eat); 1339 CMP_OUT (last_eat);
1356 CMP_OUT (glow_radius); 1340 CMP_OUT (glow_radius);
1357 1341
1358 if (op->flag [FLAG_IS_LINKED]) 1342 if (op->flag [FLAG_IS_LINKED])
1359 if (auto (ol, op->find_link ())) 1343 if (auto (ol, op->find_link ()))
1360 f.put (KW_connected, ol->id); 1344 f.put (KW(connected), ol->id);
1361 1345
1362 CMP_OUT (randomitems); 1346 CMP_OUT (randomitems);
1347
1363 CMP_OUT2 (container, weight_limit); 1348 CMP_OUT2 (container, weight_limit);
1364 1349
1365 CMP_OUT (run_away); 1350 CMP_OUT (run_away);
1366 CMP_OUT (pick_up); 1351 CMP_OUT (pick_up);
1367 CMP_OUT (will_apply); 1352 CMP_OUT (will_apply);
… …
1382 CMP_OUT (move_on); 1367 CMP_OUT (move_on);
1383 CMP_OUT (move_off); 1368 CMP_OUT (move_off);
1384 CMP_OUT (move_slow); 1369 CMP_OUT (move_slow);
1385 CMP_OUT (move_slow_penalty); 1370 CMP_OUT (move_slow_penalty);
1386 1371
1387 if (op->flag != tmp->flag) 1372 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1373
1374#if stdcpp // we need gcc, sorry
1375 if (diff [FLAG_OBJ_ORIGINAL])
1376 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1377
1378 diff.reset (FLAG_OBJ_ORIGINAL);
1379
1380 // quickly test whether any other flags differ
1381 if (expect_true (diff.any ()))
1388 for (int i = 0; i <= NUM_FLAGS; i++) 1382 for (int i = 0; i < NUM_FLAGS; i++)
1389 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1383 if (expect_false (diff [i]))
1390 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1384 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1385#else
1386 // use sgi extensions
1387 for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i))
1388 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1389#endif
1391 1390
1392 // save body locations 1391 // save body locations. gcc's memcmp does an abysmal job when used
1393 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1392 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1394 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1393 if (expect_false (op->slot[i].info != arch->slot[i].info))
1395 f.put (body_locations[i].save_name, op->slot[i].info); 1394 f.put (body_locations[i].kw, op->slot[i].info);
1396} 1395}
1397 1396
1398/* 1397/*
1399 * Dumps all variables in an object to a file. 1398 * 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, 1399 * 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. 1400 * the only place this is not set is when saving the player.
1402 */ 1401 */
1403bool 1402bool
1404object::write (object_freezer &f) 1403object::write (object_freezer &f)
1405{ 1404{
1406 if (is_arch ()) 1405 if (expect_false (is_arch ()))
1407 { 1406 {
1408 f.put (KW_object, arch->archname); 1407 f.put (KW(object), arch->archname);
1409 write_diff (f, this, archetype::empty); 1408 write_diff (f, this, archetype::empty);
1410 } 1409 }
1411 else 1410 else
1412 { 1411 {
1413 f.put (KW_arch, arch->archname); 1412 f.put (KW(arch), arch->archname);
1414 write_diff (f, this, arch); 1413 write_diff (f, this, arch);
1415 } 1414 }
1416 1415
1417 for (object *tmp = inv; tmp; tmp = tmp->below) 1416 for (object *tmp = inv; tmp; tmp = tmp->below)
1418 tmp->write (f); 1417 tmp->write (f);
1419 1418
1420 f.put (this); 1419 f.put (this);
1421 f.put (KW_end); 1420 f.put (KW(end));
1422 1421
1423 return true; 1422 return true;
1424} 1423}
1425 1424
1426///////////////////////////////////////////////////////////////////////////// 1425/////////////////////////////////////////////////////////////////////////////
… …
1432{ 1431{
1433 object_thawer f (filename); 1432 object_thawer f (filename);
1434 1433
1435 for (;;) 1434 for (;;)
1436 { 1435 {
1436 coroapi::cede_to_tick ();
1437
1437 switch (f.kw) 1438 switch (f.kw)
1438 { 1439 {
1439 case KW_region: 1440 case KW_region:
1440 if (!region::read (f)) 1441 if (!region::read (f))
1441 return false; 1442 return false;

Diff Legend

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