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.125 by root, Sun Nov 16 03:52:12 2008 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 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 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2005,2006,2007,2008,2009 Marc Alexander Lehmann / Robin Redeker / the Deliantra team
5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team 5 * Copyright (©) 2002,2007 Mark Wedel & Crossfire Development Team
6 * Copyright (©) 1992,2007 Frank Tore Johansen 6 * Copyright (©) 1992,2007 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>
… …
26#include <sproto.h> 27#include <sproto.h>
27 28
28///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
29 30
30extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
31 34
32/* This table is only necessary to convert objects that existed before the 35/* This table is only necessary to convert objects that existed before the
33 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
34 * to go through every mapping looking for every potion, rod, wand, etc 37 * 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 38 * that had a sp set and update to the new value. So this maps the
… …
327 330
328 if (!name_pl) 331 if (!name_pl)
329 name_pl = name; 332 name_pl = name;
330 333
331 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
332 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
333 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
334 337
335 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
336 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
337 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
338 * not in the ideal fashion. 341 * not in the ideal fashion.
339 */ 342 */
340 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND)) 343 if (loading_arch && (type == WEAPON || type == BOW || type == ROD || type == HORN || type == WAND))
341 { 344 {
342 if (!skill) 345 if (!skill)
343 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ()); 346 LOG (llevError, "ITEMBUG: weapon %s lacks a skill.\n", debug_desc ());
344 else if ((!strcmp (skill, "one handed weapons") && slot[body_arm].info != -1) || 347 else if ((skill == shstr_one_handed_weapons && slot[body_arm].info != -1) ||
345 (!strcmp (skill, "two handed weapons") && slot[body_arm].info != -2)) 348 (skill == shstr_two_handed_weapons && slot[body_arm].info != -2))
346 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill); 349 LOG (llevError, "ITEMBUG: weapon %s arm usage does not match skill: %d, %s\n", debug_desc (), slot[body_arm].info, &skill);
347 } 350 }
348 351
349 /* We changed last_heal to gen_sp_armour, which is what it 352 /* We changed last_heal to gen_sp_armour, which is what it
350 * really does for many objects. Need to catch any in maps 353 * really does for many objects. Need to catch any in maps
… …
461 } 464 }
462 else 465 else
463 move_type = MOVE_WALK; 466 move_type = MOVE_WALK;
464 } 467 }
465 } 468 }
469
470 // if the object has an animation, try to provide a default face
471 if (has_anim ())
472 {
473 const animation &anim_ob = anim ();
474
475 if (anim_speed)
476 // if this item is time-animated, force the last frame
477 animate_object (this, 0);
478 else if (flag [FLAG_MONSTER])
479 // if it is a monster, set appropriate facing
480 animate_object (this, direction);
481 }
466} 482}
467 483
468static void 484static void
469set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, object_thawer &f)
470{ 486{
471 static const struct flagstr { 487 static const struct flagstr {
472 const char *name; 488 const char *name;
473 MoveType flags; 489 MoveType flags;
474 } move_flags[] = { 490 } move_flags[] = {
… …
480 { "boat" , MOVE_BOAT }, 496 { "boat" , MOVE_BOAT },
481 { "ship" , MOVE_SHIP }, 497 { "ship" , MOVE_SHIP },
482 { "all" , MOVE_ALL }, 498 { "all" , MOVE_ALL },
483 }; 499 };
484 500
485 if (!str) 501 const char *str = f.get_str ();
486 {
487 mt = 0;
488 return;
489 }
490 502
491 if (isdigit (*str)) 503 if (!*str || isdigit (*str))
492 { 504 {
493 mt = atoi (str); 505 mt = atoi (str);
494 return; 506 return;
495 } 507 }
496 508
497 mt = 0; 509 mt = 0;
498 510
499 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
500 { 512 {
501 bool negate = 0; 513 bool negate = 0;
502 514
503 if (*str == '-') 515 if (*str == '-')
504 { 516 {
… …
523 535
524next: ; 536next: ;
525 } 537 }
526} 538}
527 539
540//-GPL
541
528#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
529 543
530bool 544bool
531object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
532{ 546{
… …
536 for (;;) 550 for (;;)
537 { 551 {
538 switch (f.kw) 552 switch (f.kw)
539 { 553 {
540 case KW_uuid: 554 case KW_uuid:
541 if (const char *s = f.get_str ())
542 if (!uuid.parse (s)) 555 if (!uuid.parse (f.get_str ()))
543 { 556 {
544 f.parse_warn ("unparseable uuid"); 557 f.parse_warn ("unparseable uuid");
545 uuid = UUID::gen (); 558 uuid = UUID::gen ();
546 } 559 }
547 break; 560 break;
548 561
549 case KW_oid: 562 case KW_oid:
550 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
551 break; 564 break;
… …
616 case KW_animation: 629 case KW_animation:
617 { 630 {
618 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
619 animation_id = 0; 632 animation_id = 0;
620 633
621 const char *str = f.get_str ();
622 if (str && (animation_id = find_animation (str))) 634 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
623 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
624 } 636 }
625 break; 637 break;
626 638
627 case KW_last_heal: f.get (last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
… …
644 move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
645 f.get (move_slow_penalty); 657 f.get (move_slow_penalty);
646 break; 658 break;
647 659
648 case KW_face: 660 case KW_face:
649 face = face_find (f.get_str ()); 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
650 break; 662 break;
651 663
652 case KW_sound: 664 case KW_sound:
665 if (f.has_value ())
666 {
653 sound = sound_find (f.get_str ()); 667 sound = sound_find (f.get_str ());
654 if (!sound) 668 if (!sound)
655 f.parse_warn ("sound not found"); 669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
671 else
672 sound = 0;
656 break; 673 break;
657 674
658 case KW_sound_destroy: 675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
659 sound_destroy = sound_find (f.get_str ()); 678 sound_destroy = sound_find (f.get_str ());
660 if (!sound_destroy) 679 if (!sound_destroy)
661 f.parse_warn ("sound not found"); 680 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
681 }
682 else
683 sound_destroy = 0;
662 break; 684 break;
663 685
664 case KW_x: f.get (x); break; 686 case KW_x: f.get (x); break;
665 case KW_y: f.get (y); break; 687 case KW_y: f.get (y); break;
666 688
… …
707 case KW_invisible: f.get (invisible); break; 729 case KW_invisible: f.get (invisible); break;
708 case KW_magic: f.get (magic); break; 730 case KW_magic: f.get (magic); break;
709 case KW_state: f.get (state); break; 731 case KW_state: f.get (state); break;
710 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 732 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
711 case KW_material: f.get (materials); break; //TODO: nuke 733 case KW_material: f.get (materials); break; //TODO: nuke
712 case KW_materialname: f.get (materialname); break; 734
735 case KW_materialname:
736 {
737 shstr sh;
738 f.get (sh);
739 material = name_to_material (sh);
740 }
741 break;
713 742
714 /* These are the new values */ 743 /* These are the new values */
715 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
716 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
717 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
718 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
719 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
720 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
721 750
722 /* 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 */
723 case KW_no_pass: 752 case KW_no_pass:
724 { 753 {
725 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
834 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
835 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
836 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
837 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
838 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 867 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
839 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
840 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
841 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
842 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;
843 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;
844 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;
… …
927 case KW_anim_speed: f.get (anim_speed); break; 955 case KW_anim_speed: f.get (anim_speed); break;
928 case KW_container: f.get (weight_limit); break; 956 case KW_container: f.get (weight_limit); break;
929 case KW_will_apply: f.get (will_apply); break; 957 case KW_will_apply: f.get (will_apply); break;
930 case KW_attack_movement: f.get (attack_movement); break; 958 case KW_attack_movement: f.get (attack_movement); break;
931 case KW_move_state: f.get (move_status); break; 959 case KW_move_state: f.get (move_status); break;
932 case KW_expmul: f.get (expmul); break; 960 //case KW_expmul: f.get (expmul); break;//D declared const for the time being
933 case KW_glow_radius: f.get (glow_radius); break; 961 case KW_glow_radius: f.get (glow_radius); break;
934 case KW_weapontype: f.get (weapontype); break; 962 case KW_weapontype: f.get (weapontype); break;
935 case KW_casting_time: f.get (casting_time); break; 963 case KW_casting_time: f.get (casting_time); break;
936 964
937 // elevation is deprecated 965 // elevation is deprecated
… …
963 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break; 991 case KW_body_waist: slot[body_waist] .info = f.get_sint32 (); break;
964 case KW_can_apply: 992 case KW_can_apply:
965 break; 993 break;
966 994
967 case KW_connected: 995 case KW_connected:
968 add_button_link (this, map, f.get_sint32 ()); 996 {
997 shstr connected;
998
999 f.get (connected);
1000 add_link (map, connected);
1001 }
969 break; 1002 break;
970 1003
971 case KW_randomitems: 1004 case KW_randomitems:
972 if (f.get_str ()) 1005 if (f.has_value ())
973 { 1006 {
974 randomitems = 1007 randomitems =
975 loading_arch 1008 loading_arch
976 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
977 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());
978 1011
979 if (!randomitems) 1012 if (!randomitems)
1013 {
980 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1014 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1015 randomitems = treasurelist::get (shstr_none); // avoid crashes
1016 }
981 } 1017 }
982 else 1018 else
983 randomitems = 0; 1019 randomitems = 0;
984 break; 1020 break;
985 1021
… …
1044 archetype *arch = archetype::find (f.get_str ()); 1080 archetype *arch = archetype::find (f.get_str ());
1045 1081
1046 if (!arch) 1082 if (!arch)
1047 { 1083 {
1048 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1084 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1049 arch = archetype::find ("earthwall"); 1085 arch = archetype::find (shstr_earthwall);
1050 } 1086 }
1051 1087
1052 assert (arch); //D maybe use exception handling of sorts? 1088 assert (arch); //D maybe use exception handling of sorts?
1053 1089
1054 f.next (); 1090 f.next ();
… …
1080 object_thawer f (buf, (AV *)0); 1116 object_thawer f (buf, (AV *)0);
1081 1117
1082 return op->parse_kv (f); 1118 return op->parse_kv (f);
1083} 1119}
1084 1120
1085/* This returns a string of the integer movement type */
1086#if 0
1087// unused function
1088static char *
1089get_string_move_type (MoveType mt)
1090{
1091 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1092 int i, all_count = 0, count;
1093
1094 strcpy (retbuf, "");
1095 strcpy (retbuf_all, " all");
1096
1097 /* Quick check, and probably fairly common */
1098 if (mt == MOVE_ALL)
1099 return retbuf_all + 1;
1100 if (mt == 0)
1101 {
1102 strcpy (retbuf, "0");
1103 return retbuf;
1104 }
1105
1106 /* We basically slide the bits down. Why look at MOVE_ALL?
1107 * because we may want to return a string like 'all -swim',
1108 * and if we just looked at mt, we couldn't get that.
1109 */
1110 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1111 {
1112 if (mt & (1 << count))
1113 {
1114 strcat (retbuf, " ");
1115 strcat (retbuf, move_name[count]);
1116 }
1117 else
1118 {
1119 strcat (retbuf_all, " -");
1120 strcat (retbuf_all, move_name[count]);
1121 all_count++;
1122 }
1123 }
1124 /* Basically, if there is a single negation, return it, eg
1125 * 'all -swim'. But more than that, just return the
1126 * enumerated values. It doesn't make sense to return
1127 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1128 */
1129 if (all_count <= 1)
1130 return retbuf_all + 1;
1131 else
1132 return retbuf + 1;
1133}
1134#endif
1135
1136// compare *op against *tmp and output differences 1121// compare *op against *arch and output differences
1137static void 1122static void
1138write_diff (object_freezer &f, object *op, object *tmp) 1123write_diff (object_freezer &f, object *op, object *arch)
1139{ 1124{
1140 static const keyword resist_save[NROFATTACKS] = { 1125 static const keyword resist_save[NROFATTACKS] = {
1141# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1126# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1142# include "attackinc.h" 1127# include "attackinc.h"
1143# undef def 1128# undef def
… …
1157 KW_applied, 1142 KW_applied,
1158 KW_unpaid, 1143 KW_unpaid,
1159 KW_can_use_shield, 1144 KW_can_use_shield,
1160 KW_no_pick, 1145 KW_no_pick,
1161 KW_NULL, // walk_on 1146 KW_NULL, // walk_on
1147 /* 10 */
1162 KW_NULL, // no_pass 1148 KW_NULL, // no_pass
1163 /* 10 */
1164 KW_is_animated, 1149 KW_is_animated,
1165 KW_NULL, // slow_move 1150 KW_NULL, // slow_move
1166 KW_NULL, // flying 1151 KW_NULL, // flying
1167 KW_monster, 1152 KW_monster,
1168 KW_friendly, 1153 KW_friendly,
1169 KW_generator, 1154 KW_generator,
1170 KW_is_thrown, 1155 KW_is_thrown,
1171 KW_auto_apply, 1156 KW_auto_apply,
1172 KW_treasure_env, 1157 KW_treasure_env,
1158 /* 20 */
1173 KW_player_sold, 1159 KW_player_sold,
1174 /* 20 */
1175 KW_see_invisible, 1160 KW_see_invisible,
1176 KW_can_roll, 1161 KW_can_roll,
1177 KW_overlay_floor, 1162 KW_overlay_floor,
1178 KW_is_turnable, 1163 KW_is_turnable,
1179 KW_NULL, // walk_off 1164 KW_NULL, // walk_off
1180 KW_NULL, // fly_on 1165 KW_NULL, // fly_on
1181 KW_NULL, // fly_off 1166 KW_NULL, // fly_off
1182 KW_is_used_up, 1167 KW_is_used_up,
1183 KW_identified, 1168 KW_identified,
1169 /* 30 */
1184 KW_reflecting, 1170 KW_reflecting,
1185 /* 30 */
1186 KW_changing, 1171 KW_changing,
1187 KW_splitting, 1172 KW_splitting,
1188 KW_hitback, 1173 KW_hitback,
1189 KW_startequip, 1174 KW_startequip,
1190 KW_blocksview, 1175 KW_blocksview,
1191 KW_undead, 1176 KW_undead,
1192 KW_scared, 1177 KW_scared,
1193 KW_unaggressive, 1178 KW_unaggressive,
1194 KW_reflect_missile, 1179 KW_reflect_missile,
1180 /* 40 */
1195 KW_reflect_spell, 1181 KW_reflect_spell,
1196 /* 40 */
1197 KW_no_magic, 1182 KW_no_magic,
1198 KW_no_fix_player, 1183 KW_NULL,
1199 KW_is_lightable, 1184 KW_is_lightable,
1200 KW_tear_down, 1185 KW_tear_down,
1201 KW_run_away, 1186 KW_run_away,
1202 KW_NULL, // pass_thru 1187 KW_NULL, // pass_thru
1203 KW_NULL, // an_pass_thru 1188 KW_NULL, // an_pass_thru
1204 KW_pick_up, 1189 KW_pick_up,
1205 KW_unique, 1190 KW_unique,
1191 /* 50 */
1206 KW_no_drop, 1192 KW_no_drop,
1207 /* 50 */
1208 KW_NULL, // wizcast 1193 KW_NULL, // wizcast
1209 KW_can_cast_spell, 1194 KW_can_cast_spell,
1210 KW_can_use_scroll, 1195 KW_can_use_scroll,
1211 KW_can_use_range, 1196 KW_can_use_range,
1212 KW_can_use_bow, 1197 KW_can_use_bow,
1213 KW_can_use_armour, 1198 KW_can_use_armour,
1214 KW_can_use_weapon, 1199 KW_can_use_weapon,
1215 KW_can_use_ring, 1200 KW_can_use_ring,
1216 KW_has_ready_range, 1201 KW_has_ready_range,
1202 /* 60 */
1217 KW_has_ready_bow, 1203 KW_has_ready_bow,
1218 /* 60 */
1219 KW_xrays, 1204 KW_xrays,
1220 KW_NULL, 1205 KW_NULL,
1221 KW_is_floor, 1206 KW_is_floor,
1222 KW_lifesave, 1207 KW_lifesave,
1223 KW_no_strength, 1208 KW_no_strength,
1224 KW_sleep, 1209 KW_sleep,
1225 KW_stand_still, 1210 KW_stand_still,
1226 KW_random_move, 1211 KW_random_move,
1227 KW_only_attack, 1212 KW_only_attack,
1213 /* 70 */
1228 KW_confused, 1214 KW_confused,
1229 /* 70 */
1230 KW_stealth, 1215 KW_stealth,
1231 KW_NULL, 1216 KW_NULL,
1232 KW_NULL, 1217 KW_NULL,
1233 KW_cursed, 1218 KW_cursed,
1234 KW_damned, 1219 KW_damned,
1235 KW_see_anywhere, 1220 KW_see_anywhere,
1236 KW_known_magical, 1221 KW_known_magical,
1237 KW_known_cursed, 1222 KW_known_cursed,
1238 KW_can_use_skill, 1223 KW_can_use_skill,
1224 /* 80 */
1239 KW_been_applied, 1225 KW_been_applied,
1240 /* 80 */
1241 KW_has_ready_scroll, 1226 KW_has_ready_scroll,
1242 KW_can_use_rod, 1227 KW_can_use_rod,
1243 KW_precious, 1228 KW_precious,
1244 KW_can_use_horn, 1229 KW_can_use_horn,
1245 KW_make_invisible, 1230 KW_make_invisible,
1246 KW_inv_locked, 1231 KW_inv_locked,
1247 KW_is_wooded, 1232 KW_is_wooded,
1248 KW_is_hilly, 1233 KW_is_hilly,
1249 KW_has_ready_skill, 1234 KW_has_ready_skill,
1235 /* 90 */
1250 KW_has_ready_weapon, 1236 KW_has_ready_weapon,
1251 /* 90 */
1252 KW_no_skill_ident, 1237 KW_no_skill_ident,
1253 KW_is_blind, 1238 KW_is_blind,
1254 KW_can_see_in_dark, 1239 KW_can_see_in_dark,
1255 KW_is_cauldron, 1240 KW_is_cauldron,
1256 KW_NULL, 1241 KW_NULL,
1257 KW_no_steal, 1242 KW_no_steal,
1258 KW_one_hit, 1243 KW_one_hit,
1259 KW_NULL, 1244 KW_NULL,
1260 KW_berserk, 1245 KW_berserk,
1246 /* 100 */
1261 KW_neutral, 1247 KW_neutral,
1262 /* 100 */
1263 KW_no_attack, 1248 KW_no_attack,
1264 KW_no_damage, 1249 KW_no_damage,
1265 KW_obj_original, 1250 KW_obj_original,
1266 KW_NULL, 1251 KW_NULL,
1267 KW_activate_on_push, 1252 KW_activate_on_push,
1268 KW_activate_on_release, 1253 KW_activate_on_release,
1269 KW_is_water, 1254 KW_is_water,
1270 KW_use_content_on_gen, 1255 KW_use_content_on_gen,
1271 KW_NULL, 1256 KW_NULL,
1257 /* 110 */
1272 KW_is_buildable, 1258 KW_is_buildable,
1273 /* 110 */
1274 KW_destroy_on_death, 1259 KW_destroy_on_death,
1275 KW_NULL, 1260 KW_NULL,
1276 }; 1261 };
1262
1263 // obj_original is the only commonly differing flag between archetype
1264 // and object, so special-case it here to be able to skip the loop
1265 static const struct flagmask : object::flags_t
1266 {
1267 flagmask ()
1268 {
1269 for (int i = 0; i < NUM_FLAGS; i++)
1270 if (flag_names [i])
1271 set (i);
1272 }
1273 } flagmask;
1277 1274
1278 /* This saves the key/value lists. We do it first so that any 1275 /* 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. 1276 * keys that match field names will be overwritten by the loader.
1280 */ 1277 */
1281 for (key_value *kv = op->key_values; kv; kv = kv->next) 1278 for (key_value *kv = op->key_values; kv; kv = kv->next)
1282 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1279 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1283 f.put (kv->key, kv->value); 1280 f.put (kv->key, kv->value);
1284 1281
1285 /* We don't need to worry about the arch's extra fields - they 1282 if (op->uuid)
1286 * will get taken care of the copy_to method. 1283 {
1287 */ 1284 // highly optimised - this is often 25% of all data written
1285 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1286 char *ptr = cur;
1288 1287
1289 f.put (KW_uuid, op->uuid.c_str ()); 1288 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1289 ptr += sizeof ("uuid ") - 1;
1290 ptr = op->uuid.append (ptr);
1291 *ptr++ = '\n';
1290 1292
1293 f.alloc (ptr - cur);
1294 }
1295
1291#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1296#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1292#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1297#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1293 1298
1294 if (object *owner = op->owner) 1299 CMP_OUT (x);
1295 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1300 CMP_OUT (y);
1301
1302 CMP_OUT (type);
1303 CMP_OUT (subtype);
1304 CMP_OUT (direction);
1296 1305
1297 CMP_OUT (name); 1306 CMP_OUT (name);
1298 CMP_OUT (name_pl); 1307 CMP_OUT (name_pl);
1299 CMP_OUT (custom_name); 1308
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] = "speed_left 0\n";
1317 static int last_speed_left_len = sizeof ("speed_left 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 ("speed_left ") - 1
1323 + sprintf (last_speed_left_str + sizeof ("speed_left ") - 1, "%.7g\n", last_speed_left);
1324 }
1325
1326 f.add (last_speed_left_str, last_speed_left_len);
1327 }
1328
1300 CMP_OUT (title); 1329 CMP_OUT (title);
1301 CMP_OUT (race); 1330 CMP_OUT (race);
1331 CMP_OUT (slaying);
1302 CMP_OUT (skill); 1332 CMP_OUT (skill);
1303 CMP_OUT (slaying); 1333
1304 CMP_OUT (tag); 1334 CMP_OUT (tag);
1335 CMP_OUT (custom_name);
1336
1337 if (object *owner = op->owner)
1338 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1339
1340 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1341
1305 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1306 1343
1307 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1344 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1308 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1345 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1309 1346
1310 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1347 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1311 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1348 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1312 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1349 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1313 1350
1314 if (op->animation_id != tmp->animation_id) 1351 if (op->animation_id != arch->animation_id)
1315 if (op->animation_id) 1352 if (op->has_anim ())
1316 f.put (KW_animation, animations[GET_ANIM_ID (op)].name); 1353 f.put (KW(animation), op->anim ().name);
1317 else 1354 else
1318 { 1355 {
1319 f.put (KW_animation, (const char *)0); 1356 f.put (KW(animation));
1320 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1321 } 1358 }
1322 1359
1323 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1324 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
… …
1335 CMP_OUT2 (grace, stats.grace); 1372 CMP_OUT2 (grace, stats.grace);
1336 CMP_OUT2 (maxgrace, stats.maxgrace); 1373 CMP_OUT2 (maxgrace, stats.maxgrace);
1337 CMP_OUT2 (exp, stats.exp); 1374 CMP_OUT2 (exp, stats.exp);
1338 1375
1339 CMP_OUT (perm_exp); 1376 CMP_OUT (perm_exp);
1340 CMP_OUT (expmul); 1377 //CMP_OUT (expmul);
1341 1378
1342 CMP_OUT2 (food, stats.food); 1379 CMP_OUT2 (food, stats.food);
1343 CMP_OUT2 (dam, stats.dam); 1380 CMP_OUT2 (dam, stats.dam);
1344 CMP_OUT2 (luck, stats.luck); 1381 CMP_OUT2 (luck, stats.luck);
1345 CMP_OUT2 (wc, stats.wc); 1382 CMP_OUT2 (wc, stats.wc);
1346 CMP_OUT2 (ac, stats.ac); 1383 CMP_OUT2 (ac, stats.ac);
1347 1384
1348 CMP_OUT (x);
1349 CMP_OUT (y);
1350 CMP_OUT (speed);
1351 CMP_OUT (speed_left);
1352 CMP_OUT2 (move_state, move_status); 1385 CMP_OUT2 (move_state, move_status);
1353 CMP_OUT (attack_movement); 1386 CMP_OUT (attack_movement);
1354 CMP_OUT (nrof); 1387 CMP_OUT (nrof);
1355 CMP_OUT (level); 1388 CMP_OUT (level);
1356 CMP_OUT (direction);
1357 CMP_OUT (type);
1358 CMP_OUT (subtype);
1359 CMP_OUT (attacktype); 1389 CMP_OUT (attacktype);
1360 1390
1391 // using memcmp here seems to be a loss - is gcc vectorising?
1361 for (int i = 0; i < NROFATTACKS; i++) 1392 for (int i = 0; i < NROFATTACKS; i++)
1362 if (expect_false (op->resist[i] != tmp->resist[i])) 1393 if (expect_false (op->resist[i] != arch->resist[i]))
1363 f.put (resist_save[i], op->resist[i]); 1394 f.put (resist_save[i], op->resist[i]);
1364 1395
1365 CMP_OUT (path_attuned); 1396 CMP_OUT (path_attuned);
1366 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1367 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1399
1368 CMP_OUT2 (material, materials);//TODO: nuke 1400 CMP_OUT2 (material, materials);//TODO: nuke
1369 CMP_OUT (materialname); 1401 if (op->material != arch->material)
1402 f.put (KW(materialname), op->material->name);
1403
1370 CMP_OUT (value); 1404 CMP_OUT (value);
1371 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1372 CMP_OUT (weight); 1406 CMP_OUT (weight);
1373 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
1374 CMP_OUT (state); 1408 CMP_OUT (state);
… …
1378 CMP_OUT (last_grace); 1412 CMP_OUT (last_grace);
1379 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1380 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1381 1415
1382 if (op->flag [FLAG_IS_LINKED]) 1416 if (op->flag [FLAG_IS_LINKED])
1383 if (int i = get_button_value (op)) 1417 if (auto (ol, op->find_link ()))
1384 f.put (KW_connected, i); 1418 f.put (KW(connected), ol->id);
1385 1419
1386 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1387 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1388 1422
1389 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
… …
1406 CMP_OUT (move_on); 1440 CMP_OUT (move_on);
1407 CMP_OUT (move_off); 1441 CMP_OUT (move_off);
1408 CMP_OUT (move_slow); 1442 CMP_OUT (move_slow);
1409 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1410 1444
1411 if (op->flag != tmp->flag) 1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1446
1447 if (diff [FLAG_OBJ_ORIGINAL])
1448 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1449
1450 diff.reset (FLAG_OBJ_ORIGINAL);
1451
1452 // quickly test whether any other flags differ
1453 if (expect_true (diff.any ()))
1412 for (int i = 0; i <= NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1413 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1455 if (expect_false (diff [i]))
1414 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1415 1457
1416 // save body locations 1458 // save body locations. gcc's memcmp does an abysmal job when used
1417 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1418 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1419 f.put (body_locations[i].save_name, op->slot[i].info); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
1420} 1462}
1421 1463
1422/* 1464/*
1423 * Dumps all variables in an object to a file. 1465 * Dumps all variables in an object to a file.
… …
1425 * the only place this is not set is when saving the player. 1467 * the only place this is not set is when saving the player.
1426 */ 1468 */
1427bool 1469bool
1428object::write (object_freezer &f) 1470object::write (object_freezer &f)
1429{ 1471{
1430 archetype *at = arch ? arch : archetype::empty; 1472 if (expect_false (is_arch ()))
1431 1473 {
1474 f.put (KW(object), arch->archname);
1475 write_diff (f, this, archetype::empty);
1476 }
1477 else
1478 {
1432 f.put (KW_arch, at->archname); 1479 f.put (KW(arch), arch->archname);
1433 write_diff (f, this, at); 1480 write_diff (f, this, arch);
1481 }
1434 1482
1435 for (object *tmp = inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1436 tmp->write (f); 1484 tmp->write (f);
1437 1485
1438 f.put (this); 1486 f.put (this);
1439 f.put (KW_end); 1487 f.put (KW(end));
1440 1488
1441 return true; 1489 return true;
1442} 1490}
1443 1491
1444///////////////////////////////////////////////////////////////////////////// 1492/////////////////////////////////////////////////////////////////////////////

Diff Legend

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