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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team |
5 | * Copyright (©) 2002 Mark Wedel & Crossfire Development Team |
6 | * Copyright (©) 1992,2007 Frank Tore Johansen |
6 | * Copyright (©) 1992 Frank Tore Johansen |
7 | * |
7 | * |
8 | * Deliantra is free software: you can redistribute it and/or modify |
8 | * Deliantra is free software: you can redistribute it and/or modify it under |
9 | * it under the terms of the GNU General Public License as published by |
9 | * the terms of the Affero GNU General Public License as published by the |
10 | * the Free Software Foundation, either version 3 of the License, or |
10 | * Free Software Foundation, either version 3 of the License, or (at your |
11 | * (at your option) any later version. |
11 | * option) any later version. |
12 | * |
12 | * |
13 | * This program is distributed in the hope that it will be useful, |
13 | * This program is distributed in the hope that it will be useful, |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
14 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
15 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
16 | * GNU General Public License for more details. |
16 | * GNU General Public License for more details. |
17 | * |
17 | * |
18 | * You should have received a copy of the GNU General Public License |
18 | * You should have received a copy of the Affero GNU General Public License |
19 | * along with this program. If not, see <http://www.gnu.org/licenses/>. |
19 | * and the GNU General Public License along with this program. If not, see |
|
|
20 | * <http://www.gnu.org/licenses/>. |
20 | * |
21 | * |
21 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | * The authors can be reached via e-mail to <support@deliantra.net> |
22 | */ |
23 | */ |
23 | |
24 | |
24 | #include <global.h> |
25 | #include <global.h> |
25 | #include <loader.h> |
|
|
26 | #include <sproto.h> |
26 | #include <sproto.h> |
27 | |
27 | |
28 | ///////////////////////////////////////////////////////////////////////////// |
28 | ///////////////////////////////////////////////////////////////////////////// |
29 | |
29 | |
30 | extern archetype *loading_arch; |
30 | extern archetype *loading_arch; |
|
|
31 | |
|
|
32 | //+GPL |
31 | |
33 | |
32 | /* This table is only necessary to convert objects that existed before the |
34 | /* This table is only necessary to convert objects that existed before the |
33 | * spell object conversion to the new object. It was not practical |
35 | * spell object conversion to the new object. It was not practical |
34 | * to go through every mapping looking for every potion, rod, wand, etc |
36 | * to go through every mapping looking for every potion, rod, wand, etc |
35 | * that had a sp set and update to the new value. So this maps the |
37 | * that had a sp set and update to the new value. So this maps the |
… | |
… | |
327 | |
329 | |
328 | if (!name_pl) |
330 | if (!name_pl) |
329 | name_pl = name; |
331 | name_pl = name; |
330 | |
332 | |
331 | /* objects now have a materialname. try to patch it in */ |
333 | /* objects now have a materialname. try to patch it in */ |
332 | if (!(is_weapon () && level > 0)) |
334 | if (material == MATERIAL_NULL && !(is_weapon () && level > 0)) |
333 | set_materialname (this, map ? map->difficulty : 5, 0); |
335 | select_material (this, map ? map->difficulty : 5); |
|
|
336 | |
|
|
337 | if (speed < 0.) |
|
|
338 | { |
|
|
339 | flag [FLAG_RANDOM_SPEED] = true; |
|
|
340 | speed = -speed; |
|
|
341 | // speed_left will be randomised in instantiate () and copy_to () |
|
|
342 | } |
334 | |
343 | |
335 | /* only do these when program is first run - a bit |
344 | /* only do these when program is first run - a bit |
336 | * excessive to do this at every run - most of this is |
345 | * excessive to do this at every run - most of this is |
337 | * really just to catch any errors - program will still run, but |
346 | * really just to catch any errors - program will still run, but |
338 | * not in the ideal fashion. |
347 | * not in the ideal fashion. |
… | |
… | |
385 | if (ip > 2 * item_power && ip > (item_power + 3)) |
394 | if (ip > 2 * item_power && ip > (item_power + 3)) |
386 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
395 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
387 | #endif |
396 | #endif |
388 | } |
397 | } |
389 | |
398 | |
390 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
399 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
391 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
400 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
392 | if ((type == ROD |
401 | if ((type == ROD |
393 | || type == WAND |
402 | || type == WAND |
394 | || type == SCROLL |
403 | || type == SCROLL |
395 | || type == HORN |
404 | || type == HORN |
… | |
… | |
420 | randomitems = 0; /* So another spell isn't created for this object */ |
429 | randomitems = 0; /* So another spell isn't created for this object */ |
421 | /* without this, value is all screwed up */ |
430 | /* without this, value is all screwed up */ |
422 | value = arch->value * inv->value; |
431 | value = arch->value * inv->value; |
423 | } |
432 | } |
424 | |
433 | |
425 | if (QUERY_FLAG (this, FLAG_MONSTER)) |
434 | if (this->flag [FLAG_MONSTER]) |
426 | { |
435 | { |
427 | if (stats.hp > stats.maxhp) |
436 | if (stats.hp > stats.maxhp) |
428 | { |
437 | { |
429 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
438 | LOG (llevInfo, "ITEMBUG: monster %s has hp set higher than maxhp (%d>%d)\n", debug_desc (), stats.hp, stats.maxhp); |
430 | stats.maxhp = stats.hp; |
439 | stats.maxhp = stats.hp; |
… | |
… | |
433 | /* The archs just need to be updated for this */ |
442 | /* The archs just need to be updated for this */ |
434 | if (move_type == 0) |
443 | if (move_type == 0) |
435 | move_type = MOVE_WALK; |
444 | move_type = MOVE_WALK; |
436 | } |
445 | } |
437 | |
446 | |
438 | if ((QUERY_FLAG (this, FLAG_GENERATOR) && QUERY_FLAG (this, FLAG_CONTENT_ON_GEN)) || type == CREATOR || type == CONVERTER) |
447 | if ((this->flag [FLAG_GENERATOR] && this->flag [FLAG_CONTENT_ON_GEN]) || type == CREATOR || type == CONVERTER) |
439 | /* Object will duplicate it's content as part of the |
448 | /* Object will duplicate it's content as part of the |
440 | * generation process. To do this, we must flag inventory |
449 | * generation process. To do this, we must flag inventory |
441 | * so it remains unevaluated concerning the randomitems and |
450 | * so it remains unevaluated concerning the randomitems and |
442 | * the living (a demonlord shouldn't cast from inside generator!) |
451 | * the living (a demonlord shouldn't cast from inside generator!) |
443 | */ |
452 | */ |
… | |
… | |
477 | animate_object (this, direction); |
486 | animate_object (this, direction); |
478 | } |
487 | } |
479 | } |
488 | } |
480 | |
489 | |
481 | static void |
490 | static void |
482 | set_move (MoveType &mt, const char *str) |
491 | set_move (MoveType &mt, object_thawer &f) |
483 | { |
492 | { |
484 | static const struct flagstr { |
493 | static const struct flagstr { |
485 | const char *name; |
494 | const char *name; |
486 | MoveType flags; |
495 | MoveType flags; |
487 | } move_flags[] = { |
496 | } move_flags[] = { |
… | |
… | |
493 | { "boat" , MOVE_BOAT }, |
502 | { "boat" , MOVE_BOAT }, |
494 | { "ship" , MOVE_SHIP }, |
503 | { "ship" , MOVE_SHIP }, |
495 | { "all" , MOVE_ALL }, |
504 | { "all" , MOVE_ALL }, |
496 | }; |
505 | }; |
497 | |
506 | |
498 | if (!str) |
507 | const char *str = f.get_str (); |
499 | { |
|
|
500 | mt = 0; |
|
|
501 | return; |
|
|
502 | } |
|
|
503 | |
508 | |
504 | if (isdigit (*str)) |
509 | if (!*str || isdigit (*str)) |
505 | { |
510 | { |
506 | mt = atoi (str); |
511 | mt = atoi (str); |
507 | return; |
512 | return; |
508 | } |
513 | } |
509 | |
514 | |
510 | mt = 0; |
515 | mt = 0; |
511 | |
516 | |
512 | for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) |
517 | for (str = strtok ((char *)str, " "); str; str = strtok (0, " ")) |
513 | { |
518 | { |
514 | bool negate = 0; |
519 | bool negate = 0; |
515 | |
520 | |
516 | if (*str == '-') |
521 | if (*str == '-') |
517 | { |
522 | { |
518 | negate = 1; |
523 | negate = 1; |
519 | str++; |
524 | str++; |
520 | } |
525 | } |
521 | |
526 | |
522 | for (const flagstr *f = move_flags; f < move_flags + sizeof (move_flags) / sizeof (move_flags [0]); ++f) |
527 | for (const flagstr *f = move_flags; f < move_flags + array_length (move_flags); ++f) |
523 | { |
528 | { |
524 | if (!strcmp (f->name, str)) |
529 | if (!strcmp (f->name, str)) |
525 | { |
530 | { |
526 | if (negate) |
531 | if (negate) |
527 | mt &= ~f->flags; |
532 | mt &= ~f->flags; |
… | |
… | |
536 | |
541 | |
537 | next: ; |
542 | next: ; |
538 | } |
543 | } |
539 | } |
544 | } |
540 | |
545 | |
|
|
546 | //-GPL |
|
|
547 | |
541 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
548 | #define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () |
542 | |
549 | |
543 | bool |
550 | bool |
544 | object::parse_kv (object_thawer &f) |
551 | object::parse_kv (object_thawer &f) |
545 | { |
552 | { |
… | |
… | |
549 | for (;;) |
556 | for (;;) |
550 | { |
557 | { |
551 | switch (f.kw) |
558 | switch (f.kw) |
552 | { |
559 | { |
553 | case KW_uuid: |
560 | case KW_uuid: |
554 | if (const char *s = f.get_str ()) |
|
|
555 | if (!uuid.parse (s)) |
561 | if (!uuid.parse (f.get_str ())) |
556 | { |
562 | { |
557 | f.parse_warn ("unparseable uuid"); |
563 | f.parse_warn ("unparseable uuid"); |
558 | uuid = UUID::gen (); |
564 | uuid = UUID::gen (); |
559 | } |
565 | } |
560 | break; |
566 | break; |
561 | |
567 | |
562 | case KW_oid: |
568 | case KW_oid: |
563 | f.get (this, f.get_sint32 ()); |
569 | f.get (this, f.get_sint32 ()); |
564 | break; |
570 | break; |
… | |
… | |
582 | // was: insert_ob_in_ob (tmp, op); |
588 | // was: insert_ob_in_ob (tmp, op); |
583 | // but manually adding it can improve map loading times a lot |
589 | // but manually adding it can improve map loading times a lot |
584 | // also, appending instead of prepending keeps the |
590 | // also, appending instead of prepending keeps the |
585 | // save ordering the same between repeated load/saves. |
591 | // save ordering the same between repeated load/saves. |
586 | // and finally we do not want any funny effects |
592 | // and finally we do not want any funny effects |
587 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
593 | tmp->clr_flag (FLAG_OBJ_ORIGINAL); |
588 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
594 | tmp->clr_flag (FLAG_REMOVED); |
589 | |
595 | |
590 | if (!op_inv) |
596 | if (!op_inv) |
591 | { |
597 | { |
592 | inv = tmp; |
598 | inv = tmp; |
593 | tmp->above = 0; |
599 | tmp->above = 0; |
… | |
… | |
626 | f.delayed_deref (this, owner, f.get_str ()); |
632 | f.delayed_deref (this, owner, f.get_str ()); |
627 | break; |
633 | break; |
628 | |
634 | |
629 | case KW_animation: |
635 | case KW_animation: |
630 | { |
636 | { |
631 | CLEAR_FLAG (this, FLAG_ANIMATE); |
637 | this->clr_flag (FLAG_ANIMATE); |
632 | animation_id = 0; |
638 | animation_id = 0; |
633 | |
639 | |
634 | const char *str = f.get_str (); |
|
|
635 | if (str && (animation_id = find_animation (str))) |
640 | if (f.has_value () && (animation_id = find_animation (f.get_str ()))) |
636 | SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here |
641 | this->set_flag (FLAG_ANIMATE); //TODO: should not be forced to true here |
637 | } |
642 | } |
638 | break; |
643 | break; |
639 | |
644 | |
640 | case KW_last_heal: f.get (last_heal); break; |
645 | case KW_last_heal: f.get (last_heal); break; |
641 | case KW_last_sp: f.get (last_sp); break; |
646 | case KW_last_sp: f.get (last_sp); break; |
642 | case KW_last_grace: f.get (last_grace); break; |
647 | case KW_last_grace: f.get (last_grace); break; |
643 | case KW_last_eat: f.get (last_eat); break; |
648 | case KW_last_eat: f.get (last_eat); break; |
|
|
649 | case KW_sl: |
644 | case KW_speed_left: f.get (speed_left); break; |
650 | case KW_speed_left: f.get (speed_left); break; |
645 | |
651 | |
646 | case KW_speed: |
652 | case KW_speed: |
647 | f.get (speed); |
653 | f.get (speed); |
648 | |
654 | |
… | |
… | |
657 | move_slow |= MOVE_WALK; |
663 | move_slow |= MOVE_WALK; |
658 | f.get (move_slow_penalty); |
664 | f.get (move_slow_penalty); |
659 | break; |
665 | break; |
660 | |
666 | |
661 | case KW_face: |
667 | case KW_face: |
662 | face = face_find (f.get_str ()); |
668 | face = f.has_value () ? face_find (f.get_str ()) : blank_face; |
663 | break; |
669 | break; |
664 | |
670 | |
665 | case KW_sound: |
671 | case KW_sound: |
|
|
672 | if (f.has_value ()) |
|
|
673 | { |
666 | sound = sound_find (f.get_str ()); |
674 | sound = sound_find (f.get_str ()); |
667 | if (!sound) |
675 | if (!sound) |
668 | f.parse_warn ("sound not found"); |
676 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
677 | } |
|
|
678 | else |
|
|
679 | sound = 0; |
669 | break; |
680 | break; |
670 | |
681 | |
671 | case KW_sound_destroy: |
682 | case KW_sound_destroy: |
|
|
683 | if (f.has_value ()) |
|
|
684 | { |
672 | sound_destroy = sound_find (f.get_str ()); |
685 | sound_destroy = sound_find (f.get_str ()); |
673 | if (!sound_destroy) |
686 | if (!sound_destroy) |
674 | f.parse_warn ("sound not found"); |
687 | f.parse_warn (format ("sound '%s' not found", f.get_str ())); |
|
|
688 | } |
|
|
689 | else |
|
|
690 | sound_destroy = 0; |
675 | break; |
691 | break; |
676 | |
692 | |
677 | case KW_x: f.get (x); break; |
693 | case KW_x: f.get (x); break; |
678 | case KW_y: f.get (y); break; |
694 | case KW_y: f.get (y); break; |
679 | |
695 | |
… | |
… | |
720 | case KW_invisible: f.get (invisible); break; |
736 | case KW_invisible: f.get (invisible); break; |
721 | case KW_magic: f.get (magic); break; |
737 | case KW_magic: f.get (magic); break; |
722 | case KW_state: f.get (state); break; |
738 | case KW_state: f.get (state); break; |
723 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
724 | case KW_material: f.get (materials); break; //TODO: nuke |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
725 | case KW_materialname: f.get (materialname); break; |
741 | case KW_materialname: f.get (material); break; |
726 | |
742 | |
727 | /* These are the new values */ |
743 | /* These are the new values */ |
728 | case KW_move_block: set_move (move_block, f.get_str ()); break; |
744 | case KW_move_block: set_move (move_block, f); break; |
729 | case KW_move_allow: set_move (move_allow, f.get_str ()); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
730 | case KW_move_type: set_move (move_type, f.get_str ()); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
731 | case KW_move_on: set_move (move_on, f.get_str ()); break; |
747 | case KW_move_on: set_move (move_on , f); break; |
732 | case KW_move_off: set_move (move_off, f.get_str ()); break; |
748 | case KW_move_off: set_move (move_off , f); break; |
733 | case KW_move_slow: set_move (move_slow, f.get_str ()); break; |
749 | case KW_move_slow: set_move (move_slow , f); break; |
734 | |
750 | |
735 | /* These are all legacy - any new objects should use the move_ .. values */ |
751 | /* These are all legacy - any new objects should use the move_ .. values */ |
736 | case KW_no_pass: |
752 | case KW_no_pass: |
737 | { |
753 | { |
738 | if (f.get_sint32 ()) |
754 | if (f.get_sint32 ()) |
… | |
… | |
801 | |
817 | |
802 | |
818 | |
803 | case KW_identified: |
819 | case KW_identified: |
804 | GET_FLAG (this, FLAG_IDENTIFIED); |
820 | GET_FLAG (this, FLAG_IDENTIFIED); |
805 | //TODO: move to check_object or so |
821 | //TODO: move to check_object or so |
806 | if (QUERY_FLAG (this, FLAG_IDENTIFIED)) |
822 | if (this->flag [FLAG_IDENTIFIED]) |
807 | CLEAR_FLAG (this, FLAG_KNOWN_MAGICAL); |
823 | this->clr_flag (FLAG_KNOWN_MAGICAL); |
808 | |
824 | |
809 | break; |
825 | break; |
810 | |
826 | |
811 | case KW_friendly: |
827 | case KW_friendly: |
812 | if (f.get_bool ()) |
828 | if (f.get_bool ()) |
… | |
… | |
847 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
863 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
848 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
864 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
849 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
865 | case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; |
850 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
866 | case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; |
851 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
867 | case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; |
852 | case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break; |
|
|
853 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
868 | case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; |
854 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
869 | case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; |
855 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
870 | case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; |
856 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
871 | case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; |
857 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
872 | case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; |
… | |
… | |
901 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
916 | case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; |
902 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
917 | case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; |
903 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
918 | case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; |
904 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
919 | case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; |
905 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
920 | case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; |
|
|
921 | case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break; |
906 | |
922 | |
907 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
923 | case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; |
908 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
924 | case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; |
909 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
925 | case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; |
910 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
926 | case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; |
… | |
… | |
985 | add_link (map, connected); |
1001 | add_link (map, connected); |
986 | } |
1002 | } |
987 | break; |
1003 | break; |
988 | |
1004 | |
989 | case KW_randomitems: |
1005 | case KW_randomitems: |
990 | if (f.get_str ()) |
1006 | if (f.has_value ()) |
991 | { |
1007 | { |
992 | randomitems = |
1008 | randomitems = |
993 | loading_arch |
1009 | loading_arch |
994 | ? treasurelist::get (f.get_str ()) |
1010 | ? treasurelist::get (f.get_str ()) |
995 | : treasurelist::find (f.get_str ()); |
1011 | : treasurelist::find (f.get_str ()); |
996 | |
1012 | |
997 | if (!randomitems) |
1013 | if (!randomitems) |
|
|
1014 | { |
998 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
1015 | LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); |
|
|
1016 | randomitems = treasurelist::get (shstr_none); // avoid crashes |
|
|
1017 | } |
999 | } |
1018 | } |
1000 | else |
1019 | else |
1001 | randomitems = 0; |
1020 | randomitems = 0; |
1002 | break; |
1021 | break; |
1003 | |
1022 | |
… | |
… | |
1062 | archetype *arch = archetype::find (f.get_str ()); |
1081 | archetype *arch = archetype::find (f.get_str ()); |
1063 | |
1082 | |
1064 | if (!arch) |
1083 | if (!arch) |
1065 | { |
1084 | { |
1066 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1085 | LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); |
1067 | arch = archetype::find ("earthwall"); |
1086 | arch = archetype::find (shstr_earthwall); |
1068 | } |
1087 | } |
1069 | |
1088 | |
1070 | assert (arch); //D maybe use exception handling of sorts? |
1089 | assert (arch); //D maybe use exception handling of sorts? |
1071 | |
1090 | |
1072 | f.next (); |
1091 | f.next (); |
… | |
… | |
1098 | object_thawer f (buf, (AV *)0); |
1117 | object_thawer f (buf, (AV *)0); |
1099 | |
1118 | |
1100 | return op->parse_kv (f); |
1119 | return op->parse_kv (f); |
1101 | } |
1120 | } |
1102 | |
1121 | |
1103 | /* This returns a string of the integer movement type */ |
|
|
1104 | #if 0 |
|
|
1105 | // unused function |
|
|
1106 | static char * |
|
|
1107 | get_string_move_type (MoveType mt) |
|
|
1108 | { |
|
|
1109 | static char retbuf[MAX_BUF], retbuf_all[MAX_BUF]; |
|
|
1110 | int i, all_count = 0, count; |
|
|
1111 | |
|
|
1112 | strcpy (retbuf, ""); |
|
|
1113 | strcpy (retbuf_all, " all"); |
|
|
1114 | |
|
|
1115 | /* Quick check, and probably fairly common */ |
|
|
1116 | if (mt == MOVE_ALL) |
|
|
1117 | return retbuf_all + 1; |
|
|
1118 | if (mt == 0) |
|
|
1119 | { |
|
|
1120 | strcpy (retbuf, "0"); |
|
|
1121 | return retbuf; |
|
|
1122 | } |
|
|
1123 | |
|
|
1124 | /* We basically slide the bits down. Why look at MOVE_ALL? |
|
|
1125 | * because we may want to return a string like 'all -swim', |
|
|
1126 | * and if we just looked at mt, we couldn't get that. |
|
|
1127 | */ |
|
|
1128 | for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++) |
|
|
1129 | { |
|
|
1130 | if (mt & (1 << count)) |
|
|
1131 | { |
|
|
1132 | strcat (retbuf, " "); |
|
|
1133 | strcat (retbuf, move_name[count]); |
|
|
1134 | } |
|
|
1135 | else |
|
|
1136 | { |
|
|
1137 | strcat (retbuf_all, " -"); |
|
|
1138 | strcat (retbuf_all, move_name[count]); |
|
|
1139 | all_count++; |
|
|
1140 | } |
|
|
1141 | } |
|
|
1142 | /* Basically, if there is a single negation, return it, eg |
|
|
1143 | * 'all -swim'. But more than that, just return the |
|
|
1144 | * enumerated values. It doesn't make sense to return |
|
|
1145 | * 'all -walk -fly_low' - it is shorter to return 'fly_high swim' |
|
|
1146 | */ |
|
|
1147 | if (all_count <= 1) |
|
|
1148 | return retbuf_all + 1; |
|
|
1149 | else |
|
|
1150 | return retbuf + 1; |
|
|
1151 | } |
|
|
1152 | #endif |
|
|
1153 | |
|
|
1154 | // compare *op against *tmp and output differences |
1122 | // compare *op against *arch and output differences |
1155 | static void |
1123 | static void |
1156 | write_diff (object_freezer &f, object *op, object *tmp) |
1124 | write_diff (object_freezer &f, object *op, object *arch) |
1157 | { |
1125 | { |
1158 | static const keyword resist_save[NROFATTACKS] = { |
1126 | static const keyword resist_save[NROFATTACKS] = { |
1159 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1127 | # define def(uc, lc, name, plus, change) KW_resist_ ## lc, |
1160 | # include "attackinc.h" |
1128 | # include "attackinc.h" |
1161 | # undef def |
1129 | # undef def |
… | |
… | |
1175 | KW_applied, |
1143 | KW_applied, |
1176 | KW_unpaid, |
1144 | KW_unpaid, |
1177 | KW_can_use_shield, |
1145 | KW_can_use_shield, |
1178 | KW_no_pick, |
1146 | KW_no_pick, |
1179 | KW_NULL, // walk_on |
1147 | KW_NULL, // walk_on |
|
|
1148 | /* 10 */ |
1180 | KW_NULL, // no_pass |
1149 | KW_NULL, // no_pass |
1181 | /* 10 */ |
|
|
1182 | KW_is_animated, |
1150 | KW_is_animated, |
1183 | KW_NULL, // slow_move |
1151 | KW_NULL, // slow_move |
1184 | KW_NULL, // flying |
1152 | KW_NULL, // flying |
1185 | KW_monster, |
1153 | KW_monster, |
1186 | KW_friendly, |
1154 | KW_friendly, |
1187 | KW_generator, |
1155 | KW_generator, |
1188 | KW_is_thrown, |
1156 | KW_is_thrown, |
1189 | KW_auto_apply, |
1157 | KW_auto_apply, |
1190 | KW_treasure_env, |
1158 | KW_treasure_env, |
|
|
1159 | /* 20 */ |
1191 | KW_player_sold, |
1160 | KW_player_sold, |
1192 | /* 20 */ |
|
|
1193 | KW_see_invisible, |
1161 | KW_see_invisible, |
1194 | KW_can_roll, |
1162 | KW_can_roll, |
1195 | KW_overlay_floor, |
1163 | KW_overlay_floor, |
1196 | KW_is_turnable, |
1164 | KW_is_turnable, |
1197 | KW_NULL, // walk_off |
1165 | KW_NULL, // walk_off |
1198 | KW_NULL, // fly_on |
1166 | KW_NULL, // fly_on |
1199 | KW_NULL, // fly_off |
1167 | KW_NULL, // fly_off |
1200 | KW_is_used_up, |
1168 | KW_is_used_up, |
1201 | KW_identified, |
1169 | KW_identified, |
|
|
1170 | /* 30 */ |
1202 | KW_reflecting, |
1171 | KW_reflecting, |
1203 | /* 30 */ |
|
|
1204 | KW_changing, |
1172 | KW_changing, |
1205 | KW_splitting, |
1173 | KW_splitting, |
1206 | KW_hitback, |
1174 | KW_hitback, |
1207 | KW_startequip, |
1175 | KW_startequip, |
1208 | KW_blocksview, |
1176 | KW_blocksview, |
1209 | KW_undead, |
1177 | KW_undead, |
1210 | KW_scared, |
1178 | KW_scared, |
1211 | KW_unaggressive, |
1179 | KW_unaggressive, |
1212 | KW_reflect_missile, |
1180 | KW_reflect_missile, |
|
|
1181 | /* 40 */ |
1213 | KW_reflect_spell, |
1182 | KW_reflect_spell, |
1214 | /* 40 */ |
|
|
1215 | KW_no_magic, |
1183 | KW_no_magic, |
1216 | KW_no_fix_player, |
1184 | KW_NULL, |
1217 | KW_is_lightable, |
1185 | KW_is_lightable, |
1218 | KW_tear_down, |
1186 | KW_tear_down, |
1219 | KW_run_away, |
1187 | KW_run_away, |
1220 | KW_NULL, // pass_thru |
1188 | KW_NULL, // pass_thru |
1221 | KW_NULL, // an_pass_thru |
1189 | KW_NULL, // an_pass_thru |
1222 | KW_pick_up, |
1190 | KW_pick_up, |
1223 | KW_unique, |
1191 | KW_unique, |
|
|
1192 | /* 50 */ |
1224 | KW_no_drop, |
1193 | KW_no_drop, |
1225 | /* 50 */ |
|
|
1226 | KW_NULL, // wizcast |
1194 | KW_NULL, // wizcast |
1227 | KW_can_cast_spell, |
1195 | KW_can_cast_spell, |
1228 | KW_can_use_scroll, |
1196 | KW_can_use_scroll, |
1229 | KW_can_use_range, |
1197 | KW_can_use_range, |
1230 | KW_can_use_bow, |
1198 | KW_can_use_bow, |
1231 | KW_can_use_armour, |
1199 | KW_can_use_armour, |
1232 | KW_can_use_weapon, |
1200 | KW_can_use_weapon, |
1233 | KW_can_use_ring, |
1201 | KW_can_use_ring, |
1234 | KW_has_ready_range, |
1202 | KW_has_ready_range, |
|
|
1203 | /* 60 */ |
1235 | KW_has_ready_bow, |
1204 | KW_has_ready_bow, |
1236 | /* 60 */ |
|
|
1237 | KW_xrays, |
1205 | KW_xrays, |
1238 | KW_NULL, |
1206 | KW_NULL, |
1239 | KW_is_floor, |
1207 | KW_is_floor, |
1240 | KW_lifesave, |
1208 | KW_lifesave, |
1241 | KW_no_strength, |
1209 | KW_no_strength, |
1242 | KW_sleep, |
1210 | KW_sleep, |
1243 | KW_stand_still, |
1211 | KW_stand_still, |
1244 | KW_random_move, |
1212 | KW_random_move, |
1245 | KW_only_attack, |
1213 | KW_only_attack, |
|
|
1214 | /* 70 */ |
1246 | KW_confused, |
1215 | KW_confused, |
1247 | /* 70 */ |
|
|
1248 | KW_stealth, |
1216 | KW_stealth, |
1249 | KW_NULL, |
1217 | KW_NULL, |
1250 | KW_NULL, |
1218 | KW_NULL, |
1251 | KW_cursed, |
1219 | KW_cursed, |
1252 | KW_damned, |
1220 | KW_damned, |
1253 | KW_see_anywhere, |
1221 | KW_see_anywhere, |
1254 | KW_known_magical, |
1222 | KW_known_magical, |
1255 | KW_known_cursed, |
1223 | KW_known_cursed, |
1256 | KW_can_use_skill, |
1224 | KW_can_use_skill, |
|
|
1225 | /* 80 */ |
1257 | KW_been_applied, |
1226 | KW_been_applied, |
1258 | /* 80 */ |
|
|
1259 | KW_has_ready_scroll, |
1227 | KW_has_ready_scroll, |
1260 | KW_can_use_rod, |
1228 | KW_can_use_rod, |
1261 | KW_precious, |
1229 | KW_precious, |
1262 | KW_can_use_horn, |
1230 | KW_can_use_horn, |
1263 | KW_make_invisible, |
1231 | KW_make_invisible, |
1264 | KW_inv_locked, |
1232 | KW_inv_locked, |
1265 | KW_is_wooded, |
1233 | KW_is_wooded, |
1266 | KW_is_hilly, |
1234 | KW_is_hilly, |
1267 | KW_has_ready_skill, |
1235 | KW_has_ready_skill, |
|
|
1236 | /* 90 */ |
1268 | KW_has_ready_weapon, |
1237 | KW_has_ready_weapon, |
1269 | /* 90 */ |
|
|
1270 | KW_no_skill_ident, |
1238 | KW_no_skill_ident, |
1271 | KW_is_blind, |
1239 | KW_is_blind, |
1272 | KW_can_see_in_dark, |
1240 | KW_can_see_in_dark, |
1273 | KW_is_cauldron, |
1241 | KW_is_cauldron, |
1274 | KW_NULL, |
1242 | KW_NULL, |
1275 | KW_no_steal, |
1243 | KW_no_steal, |
1276 | KW_one_hit, |
1244 | KW_one_hit, |
1277 | KW_NULL, |
1245 | KW_NULL, |
1278 | KW_berserk, |
1246 | KW_berserk, |
|
|
1247 | /* 100 */ |
1279 | KW_neutral, |
1248 | KW_neutral, |
1280 | /* 100 */ |
|
|
1281 | KW_no_attack, |
1249 | KW_no_attack, |
1282 | KW_no_damage, |
1250 | KW_no_damage, |
1283 | KW_obj_original, |
1251 | KW_obj_original, |
1284 | KW_NULL, |
1252 | KW_random_speed, |
1285 | KW_activate_on_push, |
1253 | KW_activate_on_push, |
1286 | KW_activate_on_release, |
1254 | KW_activate_on_release, |
1287 | KW_is_water, |
1255 | KW_is_water, |
1288 | KW_use_content_on_gen, |
1256 | KW_use_content_on_gen, |
1289 | KW_NULL, |
1257 | KW_NULL, |
|
|
1258 | /* 110 */ |
1290 | KW_is_buildable, |
1259 | KW_is_buildable, |
1291 | /* 110 */ |
|
|
1292 | KW_destroy_on_death, |
1260 | KW_destroy_on_death, |
1293 | KW_NULL, |
1261 | KW_NULL, |
1294 | }; |
1262 | }; |
|
|
1263 | |
|
|
1264 | // obj_original is the only commonly differing flag between archetype |
|
|
1265 | // and object, so special-case it here to be able to skip the loop |
|
|
1266 | static const struct flagmask : object::flags_t |
|
|
1267 | { |
|
|
1268 | flagmask () |
|
|
1269 | { |
|
|
1270 | for (int i = 0; i < NUM_FLAGS; i++) |
|
|
1271 | if (flag_names [i]) |
|
|
1272 | set (i); |
|
|
1273 | } |
|
|
1274 | } flagmask; |
1295 | |
1275 | |
1296 | /* This saves the key/value lists. We do it first so that any |
1276 | /* This saves the key/value lists. We do it first so that any |
1297 | * keys that match field names will be overwritten by the loader. |
1277 | * keys that match field names will be overwritten by the loader. |
1298 | */ |
1278 | */ |
1299 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1279 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1300 | if (!tmp->key_values || tmp->kv (kv->key) != kv->value) |
1280 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1301 | f.put (kv->key, kv->value); |
1281 | f.put (kv->key, kv->value); |
1302 | |
1282 | |
1303 | /* We don't need to worry about the arch's extra fields - they |
1283 | if (op->uuid) |
1304 | * will get taken care of the copy_to method. |
1284 | { |
1305 | */ |
1285 | // highly optimised - this is often 25% of all data written |
|
|
1286 | char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1); |
|
|
1287 | char *ptr = cur; |
1306 | |
1288 | |
1307 | f.put (KW_uuid, op->uuid.c_str ()); |
1289 | memcpy (ptr, "uuid ", sizeof ("uuid ") - 1); |
|
|
1290 | ptr += sizeof ("uuid ") - 1; |
|
|
1291 | ptr = op->uuid.append (ptr); |
|
|
1292 | *ptr++ = '\n'; |
1308 | |
1293 | |
|
|
1294 | f.alloc (ptr - cur); |
|
|
1295 | } |
|
|
1296 | |
1309 | #define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) |
1297 | #define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v) |
1310 | #define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) |
1298 | #define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v) |
1311 | |
1299 | |
1312 | if (object *owner = op->owner) |
1300 | CMP_OUT (x); |
1313 | f.put (KW_owner, static_cast<const char *>(owner->ref ())); |
1301 | CMP_OUT (y); |
|
|
1302 | |
|
|
1303 | CMP_OUT (type); |
|
|
1304 | CMP_OUT (subtype); |
|
|
1305 | CMP_OUT (direction); |
1314 | |
1306 | |
1315 | CMP_OUT (name); |
1307 | CMP_OUT (name); |
1316 | CMP_OUT (name_pl); |
1308 | CMP_OUT (name_pl); |
1317 | CMP_OUT (custom_name); |
1309 | CMP_OUT (speed); |
|
|
1310 | |
|
|
1311 | // speed_left is a major time-burner, and has good locality, so |
|
|
1312 | // we use a simple lookup-cache to avoid the very slow printf. |
|
|
1313 | if (op->speed_left != arch->speed_left) |
|
|
1314 | { |
|
|
1315 | static double last_speed_left = 0.; |
|
|
1316 | static char last_speed_left_str [256] = "sl 0\n"; |
|
|
1317 | static int last_speed_left_len = sizeof ("sl 0\n") - 1; |
|
|
1318 | |
|
|
1319 | if (last_speed_left != op->speed_left) |
|
|
1320 | { |
|
|
1321 | last_speed_left = op->speed_left; |
|
|
1322 | last_speed_left_len = sizeof ("sl ") - 1 |
|
|
1323 | + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left); |
|
|
1324 | } |
|
|
1325 | |
|
|
1326 | f.add (last_speed_left_str, last_speed_left_len); |
|
|
1327 | } |
|
|
1328 | |
1318 | CMP_OUT (title); |
1329 | CMP_OUT (title); |
1319 | CMP_OUT (race); |
1330 | CMP_OUT (race); |
|
|
1331 | CMP_OUT (slaying); |
1320 | CMP_OUT (skill); |
1332 | CMP_OUT (skill); |
1321 | CMP_OUT (slaying); |
1333 | |
1322 | CMP_OUT (tag); |
1334 | CMP_OUT (tag); |
|
|
1335 | CMP_OUT (custom_name); |
|
|
1336 | |
|
|
1337 | if (object *owner = op->owner) |
|
|
1338 | if (const char *ref = owner->ref ()) |
|
|
1339 | f.put (KW(owner), ref); |
|
|
1340 | |
|
|
1341 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
|
|
1342 | |
1323 | CMP_OUT (other_arch); |
1343 | CMP_OUT (other_arch); |
1324 | |
1344 | |
1325 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1345 | if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg ); |
1326 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1346 | if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore); |
1327 | |
1347 | |
1328 | if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); |
1348 | if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0); |
1329 | if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); |
1349 | if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0); |
1330 | if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1350 | if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0); |
1331 | |
1351 | |
1332 | if (op->animation_id != tmp->animation_id) |
1352 | if (op->animation_id != arch->animation_id) |
1333 | if (op->has_anim ()) |
1353 | if (op->has_anim ()) |
1334 | f.put (KW_animation, op->anim ().name); |
1354 | f.put (KW(animation), op->anim ().name); |
1335 | else |
1355 | else |
1336 | { |
1356 | { |
1337 | f.put (KW_animation, (const char *)0); |
1357 | f.put (KW(animation)); |
1338 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1358 | op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? |
1339 | } |
1359 | } |
1340 | |
1360 | |
1341 | CMP_OUT2 (str, stats.Str); |
1361 | CMP_OUT2 (str, stats.Str); |
1342 | CMP_OUT2 (dex, stats.Dex); |
1362 | CMP_OUT2 (dex, stats.Dex); |
… | |
… | |
1353 | CMP_OUT2 (grace, stats.grace); |
1373 | CMP_OUT2 (grace, stats.grace); |
1354 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1374 | CMP_OUT2 (maxgrace, stats.maxgrace); |
1355 | CMP_OUT2 (exp, stats.exp); |
1375 | CMP_OUT2 (exp, stats.exp); |
1356 | |
1376 | |
1357 | CMP_OUT (perm_exp); |
1377 | CMP_OUT (perm_exp); |
1358 | CMP_OUT (expmul); |
1378 | //CMP_OUT (expmul); |
1359 | |
1379 | |
1360 | CMP_OUT2 (food, stats.food); |
1380 | CMP_OUT2 (food, stats.food); |
1361 | CMP_OUT2 (dam, stats.dam); |
1381 | CMP_OUT2 (dam, stats.dam); |
1362 | CMP_OUT2 (luck, stats.luck); |
1382 | CMP_OUT2 (luck, stats.luck); |
1363 | CMP_OUT2 (wc, stats.wc); |
1383 | CMP_OUT2 (wc, stats.wc); |
1364 | CMP_OUT2 (ac, stats.ac); |
1384 | CMP_OUT2 (ac, stats.ac); |
1365 | |
1385 | |
1366 | CMP_OUT (x); |
|
|
1367 | CMP_OUT (y); |
|
|
1368 | CMP_OUT (speed); |
|
|
1369 | CMP_OUT (speed_left); |
|
|
1370 | CMP_OUT2 (move_state, move_status); |
1386 | CMP_OUT2 (move_state, move_status); |
1371 | CMP_OUT (attack_movement); |
1387 | CMP_OUT (attack_movement); |
1372 | CMP_OUT (nrof); |
1388 | CMP_OUT (nrof); |
1373 | CMP_OUT (level); |
1389 | CMP_OUT (level); |
1374 | CMP_OUT (direction); |
|
|
1375 | CMP_OUT (type); |
|
|
1376 | CMP_OUT (subtype); |
|
|
1377 | CMP_OUT (attacktype); |
1390 | CMP_OUT (attacktype); |
1378 | |
1391 | |
|
|
1392 | // using memcmp here seems to be a loss - is gcc vectorising? |
1379 | for (int i = 0; i < NROFATTACKS; i++) |
1393 | for (int i = 0; i < NROFATTACKS; i++) |
1380 | if (expect_false (op->resist[i] != tmp->resist[i])) |
1394 | if (expect_false (op->resist[i] != arch->resist[i])) |
1381 | f.put (resist_save[i], op->resist[i]); |
1395 | f.put (resist_save[i], op->resist[i]); |
1382 | |
1396 | |
1383 | CMP_OUT (path_attuned); |
1397 | CMP_OUT (path_attuned); |
1384 | CMP_OUT (path_repelled); |
1398 | CMP_OUT (path_repelled); |
1385 | CMP_OUT (path_denied); |
1399 | CMP_OUT (path_denied); |
|
|
1400 | |
1386 | CMP_OUT2 (material, materials);//TODO: nuke |
1401 | CMP_OUT2 (material, materials);//TODO: nuke |
1387 | CMP_OUT (materialname); |
1402 | if (op->material != arch->material) |
|
|
1403 | f.put (KW(materialname), op->material->name); |
|
|
1404 | |
1388 | CMP_OUT (value); |
1405 | CMP_OUT (value); |
1389 | CMP_OUT (carrying); |
1406 | CMP_OUT (carrying); |
1390 | CMP_OUT (weight); |
1407 | CMP_OUT (weight); |
1391 | CMP_OUT (invisible); |
1408 | CMP_OUT (invisible); |
1392 | CMP_OUT (state); |
1409 | CMP_OUT (state); |
… | |
… | |
1397 | CMP_OUT (last_eat); |
1414 | CMP_OUT (last_eat); |
1398 | CMP_OUT (glow_radius); |
1415 | CMP_OUT (glow_radius); |
1399 | |
1416 | |
1400 | if (op->flag [FLAG_IS_LINKED]) |
1417 | if (op->flag [FLAG_IS_LINKED]) |
1401 | if (auto (ol, op->find_link ())) |
1418 | if (auto (ol, op->find_link ())) |
1402 | f.put (KW_connected, ol->id); |
1419 | f.put (KW(connected), ol->id); |
1403 | |
1420 | |
1404 | CMP_OUT (randomitems); |
1421 | CMP_OUT (randomitems); |
|
|
1422 | |
1405 | CMP_OUT2 (container, weight_limit); |
1423 | CMP_OUT2 (container, weight_limit); |
1406 | |
1424 | |
1407 | CMP_OUT (run_away); |
1425 | CMP_OUT (run_away); |
1408 | CMP_OUT (pick_up); |
1426 | CMP_OUT (pick_up); |
1409 | CMP_OUT (will_apply); |
1427 | CMP_OUT (will_apply); |
… | |
… | |
1424 | CMP_OUT (move_on); |
1442 | CMP_OUT (move_on); |
1425 | CMP_OUT (move_off); |
1443 | CMP_OUT (move_off); |
1426 | CMP_OUT (move_slow); |
1444 | CMP_OUT (move_slow); |
1427 | CMP_OUT (move_slow_penalty); |
1445 | CMP_OUT (move_slow_penalty); |
1428 | |
1446 | |
1429 | if (op->flag != tmp->flag) |
1447 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
|
|
1448 | |
|
|
1449 | #if stdcpp // we need gcc, sorry |
|
|
1450 | if (diff [FLAG_OBJ_ORIGINAL]) |
|
|
1451 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
|
|
1452 | |
|
|
1453 | diff.reset (FLAG_OBJ_ORIGINAL); |
|
|
1454 | |
|
|
1455 | // quickly test whether any other flags differ |
|
|
1456 | if (expect_true (diff.any ())) |
1430 | for (int i = 0; i <= NUM_FLAGS; i++) |
1457 | for (int i = 0; i < NUM_FLAGS; i++) |
1431 | if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) |
1458 | if (expect_false (diff [i])) |
1432 | f.put (flag_names [i], op->flag [i] ? "1" : "0"); |
1459 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1460 | #else |
|
|
1461 | // use sgi extensions |
|
|
1462 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1463 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1464 | #endif |
1433 | |
1465 | |
1434 | // save body locations |
1466 | // save body locations. gcc's memcmp does an abysmal job when used |
1435 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1467 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1436 | if (expect_false (op->slot[i].info != tmp->slot[i].info)) |
1468 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1437 | f.put (body_locations[i].save_name, op->slot[i].info); |
1469 | f.put (body_locations[i].save_name, op->slot[i].info); |
1438 | } |
1470 | } |
1439 | |
1471 | |
1440 | /* |
1472 | /* |
1441 | * Dumps all variables in an object to a file. |
1473 | * Dumps all variables in an object to a file. |
… | |
… | |
1443 | * the only place this is not set is when saving the player. |
1475 | * the only place this is not set is when saving the player. |
1444 | */ |
1476 | */ |
1445 | bool |
1477 | bool |
1446 | object::write (object_freezer &f) |
1478 | object::write (object_freezer &f) |
1447 | { |
1479 | { |
1448 | if (is_arch ()) |
1480 | if (expect_false (is_arch ())) |
1449 | { |
1481 | { |
1450 | f.put (KW_object, arch->archname); |
1482 | f.put (KW(object), arch->archname); |
1451 | write_diff (f, this, archetype::empty); |
1483 | write_diff (f, this, archetype::empty); |
1452 | } |
1484 | } |
1453 | else |
1485 | else |
1454 | { |
1486 | { |
1455 | f.put (KW_arch, arch->archname); |
1487 | f.put (KW(arch), arch->archname); |
1456 | write_diff (f, this, arch); |
1488 | write_diff (f, this, arch); |
1457 | } |
1489 | } |
1458 | |
1490 | |
1459 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1491 | for (object *tmp = inv; tmp; tmp = tmp->below) |
1460 | tmp->write (f); |
1492 | tmp->write (f); |
1461 | |
1493 | |
1462 | f.put (this); |
1494 | f.put (this); |
1463 | f.put (KW_end); |
1495 | f.put (KW(end)); |
1464 | |
1496 | |
1465 | return true; |
1497 | return true; |
1466 | } |
1498 | } |
1467 | |
1499 | |
1468 | ///////////////////////////////////////////////////////////////////////////// |
1500 | ///////////////////////////////////////////////////////////////////////////// |
… | |
… | |
1474 | { |
1506 | { |
1475 | object_thawer f (filename); |
1507 | object_thawer f (filename); |
1476 | |
1508 | |
1477 | for (;;) |
1509 | for (;;) |
1478 | { |
1510 | { |
|
|
1511 | coroapi::cede_to_tick (); |
|
|
1512 | |
1479 | switch (f.kw) |
1513 | switch (f.kw) |
1480 | { |
1514 | { |
1481 | case KW_region: |
1515 | case KW_region: |
1482 | if (!region::read (f)) |
1516 | if (!region::read (f)) |
1483 | return false; |
1517 | return false; |