… | |
… | |
414 | // TODO: fix firewall object on map |
414 | // TODO: fix firewall object on map |
415 | /* 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' |
416 | * in that spell was stored in sp. |
416 | * in that spell was stored in sp. |
417 | */ |
417 | */ |
418 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
418 | //LOG (llevError, "old spellcasting object found: %s", debug_desc ()); |
419 | 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]); |
420 | insert_ob_in_ob (tmp, this); |
420 | insert_ob_in_ob (tmp, this); |
421 | randomitems = 0; |
421 | randomitems = 0; |
422 | } |
422 | } |
423 | |
423 | |
424 | /* 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 */ |
… | |
… | |
550 | |
550 | |
551 | bool |
551 | bool |
552 | object::parse_kv (object_thawer &f) |
552 | object::parse_kv (object_thawer &f) |
553 | { |
553 | { |
554 | object *op_inv = inv; |
554 | object *op_inv = inv; |
555 | key_value *last_kv = key_values; |
555 | key_value *last_kv = kv.first; |
556 | |
556 | |
557 | for (;;) |
557 | for (;;) |
558 | { |
558 | { |
559 | switch (f.kw) |
559 | switch (f.kw) |
560 | { |
560 | { |
… | |
… | |
747 | case KW_move_type: set_move (move_type , f); break; |
747 | case KW_move_type: set_move (move_type , f); break; |
748 | case KW_move_on: set_move (move_on , f); break; |
748 | case KW_move_on: set_move (move_on , f); break; |
749 | case KW_move_off: set_move (move_off , f); break; |
749 | case KW_move_off: set_move (move_off , f); break; |
750 | case KW_move_slow: set_move (move_slow , f); break; |
750 | case KW_move_slow: set_move (move_slow , f); break; |
751 | |
751 | |
752 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
753 | case KW_no_pass: |
|
|
754 | { |
|
|
755 | if (f.get_sint32 ()) |
|
|
756 | move_block = MOVE_ALL; |
|
|
757 | else |
|
|
758 | move_block = 0; |
|
|
759 | } |
|
|
760 | |
|
|
761 | break; |
|
|
762 | |
|
|
763 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
764 | case KW_walk_on: |
|
|
765 | { |
|
|
766 | if (f.get_sint32 ()) |
|
|
767 | move_on |= MOVE_WALK; |
|
|
768 | else |
|
|
769 | move_on &= ~MOVE_WALK; |
|
|
770 | } |
|
|
771 | |
|
|
772 | break; |
|
|
773 | |
|
|
774 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
775 | case KW_walk_off: |
|
|
776 | { |
|
|
777 | if (f.get_sint32 ()) |
|
|
778 | move_off |= MOVE_WALK; |
|
|
779 | else |
|
|
780 | move_off &= ~MOVE_WALK; |
|
|
781 | } |
|
|
782 | break; |
|
|
783 | |
|
|
784 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
785 | case KW_fly_on: |
|
|
786 | { |
|
|
787 | if (f.get_sint32 ()) |
|
|
788 | move_on |= MOVE_FLY_LOW; |
|
|
789 | else |
|
|
790 | move_on &= ~MOVE_FLY_LOW; |
|
|
791 | } |
|
|
792 | break; |
|
|
793 | |
|
|
794 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
795 | case KW_fly_off: |
|
|
796 | { |
|
|
797 | if (f.get_sint32 ()) |
|
|
798 | move_off |= MOVE_FLY_LOW; |
|
|
799 | else |
|
|
800 | move_off &= ~MOVE_FLY_LOW; |
|
|
801 | } |
|
|
802 | break; |
|
|
803 | |
|
|
804 | //TODO: remove these after converting archetypes |
752 | //TODO: remove these after converting archetypes |
805 | case KW_can_use_wand: |
753 | case KW_can_use_wand: |
806 | GET_FLAG (this, FLAG_USE_RANGE); |
754 | GET_FLAG (this, FLAG_USE_RANGE); |
807 | break; |
755 | break; |
808 | |
|
|
809 | /* These are all legacy - any new objects should use the move_ .. values */ |
|
|
810 | case KW_flying: |
|
|
811 | { |
|
|
812 | if (f.get_sint32 ()) |
|
|
813 | move_type |= MOVE_FLY_LOW; |
|
|
814 | else |
|
|
815 | move_type &= ~MOVE_FLY_LOW; |
|
|
816 | } |
|
|
817 | break; |
|
|
818 | |
|
|
819 | |
756 | |
820 | case KW_identified: |
757 | case KW_identified: |
821 | GET_FLAG (this, FLAG_IDENTIFIED); |
758 | GET_FLAG (this, FLAG_IDENTIFIED); |
822 | //TODO: move to check_object or so |
759 | //TODO: move to check_object or so |
823 | if (this->flag [FLAG_IDENTIFIED]) |
760 | if (this->flag [FLAG_IDENTIFIED]) |
… | |
… | |
856 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
793 | case KW_changing: GET_FLAG (this, FLAG_CHANGING); break; |
857 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
794 | case KW_splitting: GET_FLAG (this, FLAG_SPLITTING); break; |
858 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
795 | case KW_hitback: GET_FLAG (this, FLAG_HITBACK); break; |
859 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
796 | case KW_startequip: GET_FLAG (this, FLAG_STARTEQUIP); break; |
860 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
797 | case KW_blocksview: GET_FLAG (this, FLAG_BLOCKSVIEW); break; |
|
|
798 | case KW_is_transparent_floor: GET_FLAG (this, FLAG_IS_TRANSPARENT_FLOOR); break; |
861 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
799 | case KW_undead: GET_FLAG (this, FLAG_UNDEAD); break; |
862 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
800 | case KW_scared: GET_FLAG (this, FLAG_SCARED); break; |
863 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
801 | case KW_unaggressive: GET_FLAG (this, FLAG_UNAGGRESSIVE); break; |
864 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
802 | case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; |
865 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
803 | case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; |
… | |
… | |
1040 | |
978 | |
1041 | f.next (); |
979 | f.next (); |
1042 | return true; |
980 | return true; |
1043 | |
981 | |
1044 | case KW_ERROR: |
982 | case KW_ERROR: |
1045 | // append as key value pair (do not use kv_set as it prepends) |
|
|
1046 | // we also do not even try to find old values, duplicate keys stay duplicate |
983 | // we do not even try to find old values, duplicate keys stay duplicate |
1047 | { |
984 | // the list gets reversed after loading |
1048 | key_value *kv = new key_value; |
985 | kv.add (shstr (f.kw_str), shstr (f.value)); |
1049 | |
|
|
1050 | kv->next = 0; |
|
|
1051 | kv->key = shstr (f.kw_str); |
|
|
1052 | kv->value = shstr (f.value); |
|
|
1053 | |
|
|
1054 | if (!last_kv) |
|
|
1055 | key_values = last_kv = kv; |
|
|
1056 | else |
|
|
1057 | { |
|
|
1058 | while (last_kv->next) |
|
|
1059 | last_kv = last_kv->next; |
|
|
1060 | |
|
|
1061 | last_kv->next = kv; |
|
|
1062 | last_kv = kv; |
|
|
1063 | } |
|
|
1064 | } |
|
|
1065 | //fprintf (stderr, "addkv(%s,%s)\n", f.kw_str, f.value);//D |
|
|
1066 | break; |
986 | break; |
1067 | |
987 | |
1068 | default: |
988 | default: |
1069 | if (!f.parse_error ("object", name)) |
989 | if (!f.parse_error ("object", name)) |
1070 | return false; |
990 | return false; |
… | |
… | |
1100 | if (!op->parse_kv (f)) |
1020 | if (!op->parse_kv (f)) |
1101 | { |
1021 | { |
1102 | op->destroy (); |
1022 | op->destroy (); |
1103 | return 0; |
1023 | return 0; |
1104 | } |
1024 | } |
|
|
1025 | |
|
|
1026 | // the loader reverses the ordering of kv-pairs, so we reverse it again after loading |
|
|
1027 | // that greatly simplifies the loading code. |
|
|
1028 | op->kv.reverse (); |
1105 | |
1029 | |
1106 | op->post_load_check (); |
1030 | op->post_load_check (); |
1107 | return op; |
1031 | return op; |
1108 | } |
1032 | } |
1109 | |
1033 | |
… | |
… | |
1144 | KW_NULL, |
1068 | KW_NULL, |
1145 | KW_applied, |
1069 | KW_applied, |
1146 | KW_unpaid, |
1070 | KW_unpaid, |
1147 | KW_can_use_shield, |
1071 | KW_can_use_shield, |
1148 | KW_no_pick, |
1072 | KW_no_pick, |
1149 | KW_NULL, // walk_on |
1073 | KW_is_transparent_floor, |
1150 | /* 10 */ |
1074 | /* 10 */ |
1151 | KW_NULL, // no_pass |
1075 | KW_NULL, // no_pass |
1152 | KW_is_animated, |
1076 | KW_is_animated, |
1153 | KW_NULL, // slow_move |
1077 | KW_NULL, // slow_move |
1154 | KW_NULL, // flying |
1078 | KW_NULL, // flying |
… | |
… | |
1276 | } flagmask; |
1200 | } flagmask; |
1277 | |
1201 | |
1278 | /* This saves the key/value lists. We do it first so that any |
1202 | /* This saves the key/value lists. We do it first so that any |
1279 | * keys that match field names will be overwritten by the loader. |
1203 | * keys that match field names will be overwritten by the loader. |
1280 | */ |
1204 | */ |
1281 | for (key_value *kv = op->key_values; kv; kv = kv->next) |
1205 | for (key_value *kv = op->kv.first; kv; kv = kv->next) |
1282 | if (!arch->key_values || arch->kv (kv->key) != kv->value) |
1206 | if (arch->kv.empty () || arch->kv [kv->key] != kv->value) |
1283 | f.put (kv->key, kv->value); |
1207 | f.put (kv->key, kv->value); |
1284 | |
1208 | |
1285 | if (op->uuid) |
1209 | if (op->uuid) |
1286 | { |
1210 | { |
1287 | // highly optimised - this is often 25% of all data written |
1211 | // highly optimised - this is often 25% of all data written |