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.133 by root, Wed Sep 23 04:07:52 2009 UTC vs.
Revision 1.152 by root, Fri Mar 26 00:59:20 2010 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 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
30extern archetype *loading_arch; 30extern 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.
… …
477 animate_object (this, direction); 486 animate_object (this, direction);
478 } 487 }
479} 488}
480 489
481static void 490static void
482set_move (MoveType &mt, const char *str) 491set_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 {
… …
536 541
537next: ; 542next: ;
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
543bool 550bool
544object::parse_kv (object_thawer &f) 551object::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;
… …
629 case KW_animation: 635 case KW_animation:
630 { 636 {
631 CLEAR_FLAG (this, FLAG_ANIMATE); 637 CLEAR_FLAG (this, 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 SET_FLAG (this, 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
742 case KW_materialname:
743 {
744 shstr sh;
745 f.get (sh);
746 material = name_to_material (sh);
747 }
748 break;
726 749
727 /* These are the new values */ 750 /* These are the new values */
728 case KW_move_block: set_move (move_block, f.get_str ()); break; 751 case KW_move_block: set_move (move_block, f); break;
729 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 752 case KW_move_allow: set_move (move_allow, f); break;
730 case KW_move_type: set_move (move_type, f.get_str ()); break; 753 case KW_move_type: set_move (move_type , f); break;
731 case KW_move_on: set_move (move_on, f.get_str ()); break; 754 case KW_move_on: set_move (move_on , f); break;
732 case KW_move_off: set_move (move_off, f.get_str ()); break; 755 case KW_move_off: set_move (move_off , f); break;
733 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 756 case KW_move_slow: set_move (move_slow , f); break;
734 757
735 /* These are all legacy - any new objects should use the move_ .. values */ 758 /* These are all legacy - any new objects should use the move_ .. values */
736 case KW_no_pass: 759 case KW_no_pass:
737 { 760 {
738 if (f.get_sint32 ()) 761 if (f.get_sint32 ())
… …
847 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 870 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
848 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 871 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
849 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 872 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
850 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 873 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
851 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 874 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; 875 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
854 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 876 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
855 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 877 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; 878 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; 879 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
901 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 923 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
902 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 924 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; 925 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; 926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
905 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 927 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
928 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
906 929
907 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
908 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
909 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
910 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
985 add_link (map, connected); 1008 add_link (map, connected);
986 } 1009 }
987 break; 1010 break;
988 1011
989 case KW_randomitems: 1012 case KW_randomitems:
990 if (f.get_str ()) 1013 if (f.has_value ())
991 { 1014 {
992 randomitems = 1015 randomitems =
993 loading_arch 1016 loading_arch
994 ? treasurelist::get (f.get_str ()) 1017 ? treasurelist::get (f.get_str ())
995 : treasurelist::find (f.get_str ()); 1018 : treasurelist::find (f.get_str ());
996 1019
997 if (!randomitems) 1020 if (!randomitems)
1021 {
998 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ()); 1022 LOG (llevError, "%s uses unknown randomitems '%s'.\n", debug_desc (), f.get_str ());
1023 randomitems = treasurelist::get (shstr_none); // avoid crashes
1024 }
999 } 1025 }
1000 else 1026 else
1001 randomitems = 0; 1027 randomitems = 0;
1002 break; 1028 break;
1003 1029
… …
1062 archetype *arch = archetype::find (f.get_str ()); 1088 archetype *arch = archetype::find (f.get_str ());
1063 1089
1064 if (!arch) 1090 if (!arch)
1065 { 1091 {
1066 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1092 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1067 arch = archetype::find ("earthwall"); 1093 arch = archetype::find (shstr_earthwall);
1068 } 1094 }
1069 1095
1070 assert (arch); //D maybe use exception handling of sorts? 1096 assert (arch); //D maybe use exception handling of sorts?
1071 1097
1072 f.next (); 1098 f.next ();
… …
1098 object_thawer f (buf, (AV *)0); 1124 object_thawer f (buf, (AV *)0);
1099 1125
1100 return op->parse_kv (f); 1126 return op->parse_kv (f);
1101} 1127}
1102 1128
1103/* This returns a string of the integer movement type */
1104#if 0
1105// unused function
1106static char *
1107get_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 1129// compare *op against *arch and output differences
1155static void 1130static void
1156write_diff (object_freezer &f, object *op, object *tmp) 1131write_diff (object_freezer &f, object *op, object *arch)
1157{ 1132{
1158 static const keyword resist_save[NROFATTACKS] = { 1133 static const keyword resist_save[NROFATTACKS] = {
1159# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1134# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1160# include "attackinc.h" 1135# include "attackinc.h"
1161# undef def 1136# undef def
… …
1175 KW_applied, 1150 KW_applied,
1176 KW_unpaid, 1151 KW_unpaid,
1177 KW_can_use_shield, 1152 KW_can_use_shield,
1178 KW_no_pick, 1153 KW_no_pick,
1179 KW_NULL, // walk_on 1154 KW_NULL, // walk_on
1155 /* 10 */
1180 KW_NULL, // no_pass 1156 KW_NULL, // no_pass
1181 /* 10 */
1182 KW_is_animated, 1157 KW_is_animated,
1183 KW_NULL, // slow_move 1158 KW_NULL, // slow_move
1184 KW_NULL, // flying 1159 KW_NULL, // flying
1185 KW_monster, 1160 KW_monster,
1186 KW_friendly, 1161 KW_friendly,
1187 KW_generator, 1162 KW_generator,
1188 KW_is_thrown, 1163 KW_is_thrown,
1189 KW_auto_apply, 1164 KW_auto_apply,
1190 KW_treasure_env, 1165 KW_treasure_env,
1166 /* 20 */
1191 KW_player_sold, 1167 KW_player_sold,
1192 /* 20 */
1193 KW_see_invisible, 1168 KW_see_invisible,
1194 KW_can_roll, 1169 KW_can_roll,
1195 KW_overlay_floor, 1170 KW_overlay_floor,
1196 KW_is_turnable, 1171 KW_is_turnable,
1197 KW_NULL, // walk_off 1172 KW_NULL, // walk_off
1198 KW_NULL, // fly_on 1173 KW_NULL, // fly_on
1199 KW_NULL, // fly_off 1174 KW_NULL, // fly_off
1200 KW_is_used_up, 1175 KW_is_used_up,
1201 KW_identified, 1176 KW_identified,
1177 /* 30 */
1202 KW_reflecting, 1178 KW_reflecting,
1203 /* 30 */
1204 KW_changing, 1179 KW_changing,
1205 KW_splitting, 1180 KW_splitting,
1206 KW_hitback, 1181 KW_hitback,
1207 KW_startequip, 1182 KW_startequip,
1208 KW_blocksview, 1183 KW_blocksview,
1209 KW_undead, 1184 KW_undead,
1210 KW_scared, 1185 KW_scared,
1211 KW_unaggressive, 1186 KW_unaggressive,
1212 KW_reflect_missile, 1187 KW_reflect_missile,
1188 /* 40 */
1213 KW_reflect_spell, 1189 KW_reflect_spell,
1214 /* 40 */
1215 KW_no_magic, 1190 KW_no_magic,
1216 KW_no_fix_player, 1191 KW_NULL,
1217 KW_is_lightable, 1192 KW_is_lightable,
1218 KW_tear_down, 1193 KW_tear_down,
1219 KW_run_away, 1194 KW_run_away,
1220 KW_NULL, // pass_thru 1195 KW_NULL, // pass_thru
1221 KW_NULL, // an_pass_thru 1196 KW_NULL, // an_pass_thru
1222 KW_pick_up, 1197 KW_pick_up,
1223 KW_unique, 1198 KW_unique,
1199 /* 50 */
1224 KW_no_drop, 1200 KW_no_drop,
1225 /* 50 */
1226 KW_NULL, // wizcast 1201 KW_NULL, // wizcast
1227 KW_can_cast_spell, 1202 KW_can_cast_spell,
1228 KW_can_use_scroll, 1203 KW_can_use_scroll,
1229 KW_can_use_range, 1204 KW_can_use_range,
1230 KW_can_use_bow, 1205 KW_can_use_bow,
1231 KW_can_use_armour, 1206 KW_can_use_armour,
1232 KW_can_use_weapon, 1207 KW_can_use_weapon,
1233 KW_can_use_ring, 1208 KW_can_use_ring,
1234 KW_has_ready_range, 1209 KW_has_ready_range,
1210 /* 60 */
1235 KW_has_ready_bow, 1211 KW_has_ready_bow,
1236 /* 60 */
1237 KW_xrays, 1212 KW_xrays,
1238 KW_NULL, 1213 KW_NULL,
1239 KW_is_floor, 1214 KW_is_floor,
1240 KW_lifesave, 1215 KW_lifesave,
1241 KW_no_strength, 1216 KW_no_strength,
1242 KW_sleep, 1217 KW_sleep,
1243 KW_stand_still, 1218 KW_stand_still,
1244 KW_random_move, 1219 KW_random_move,
1245 KW_only_attack, 1220 KW_only_attack,
1221 /* 70 */
1246 KW_confused, 1222 KW_confused,
1247 /* 70 */
1248 KW_stealth, 1223 KW_stealth,
1249 KW_NULL, 1224 KW_NULL,
1250 KW_NULL, 1225 KW_NULL,
1251 KW_cursed, 1226 KW_cursed,
1252 KW_damned, 1227 KW_damned,
1253 KW_see_anywhere, 1228 KW_see_anywhere,
1254 KW_known_magical, 1229 KW_known_magical,
1255 KW_known_cursed, 1230 KW_known_cursed,
1256 KW_can_use_skill, 1231 KW_can_use_skill,
1232 /* 80 */
1257 KW_been_applied, 1233 KW_been_applied,
1258 /* 80 */
1259 KW_has_ready_scroll, 1234 KW_has_ready_scroll,
1260 KW_can_use_rod, 1235 KW_can_use_rod,
1261 KW_precious, 1236 KW_precious,
1262 KW_can_use_horn, 1237 KW_can_use_horn,
1263 KW_make_invisible, 1238 KW_make_invisible,
1264 KW_inv_locked, 1239 KW_inv_locked,
1265 KW_is_wooded, 1240 KW_is_wooded,
1266 KW_is_hilly, 1241 KW_is_hilly,
1267 KW_has_ready_skill, 1242 KW_has_ready_skill,
1243 /* 90 */
1268 KW_has_ready_weapon, 1244 KW_has_ready_weapon,
1269 /* 90 */
1270 KW_no_skill_ident, 1245 KW_no_skill_ident,
1271 KW_is_blind, 1246 KW_is_blind,
1272 KW_can_see_in_dark, 1247 KW_can_see_in_dark,
1273 KW_is_cauldron, 1248 KW_is_cauldron,
1274 KW_NULL, 1249 KW_NULL,
1275 KW_no_steal, 1250 KW_no_steal,
1276 KW_one_hit, 1251 KW_one_hit,
1277 KW_NULL, 1252 KW_NULL,
1278 KW_berserk, 1253 KW_berserk,
1254 /* 100 */
1279 KW_neutral, 1255 KW_neutral,
1280 /* 100 */
1281 KW_no_attack, 1256 KW_no_attack,
1282 KW_no_damage, 1257 KW_no_damage,
1283 KW_obj_original, 1258 KW_obj_original,
1284 KW_NULL, 1259 KW_random_speed,
1285 KW_activate_on_push, 1260 KW_activate_on_push,
1286 KW_activate_on_release, 1261 KW_activate_on_release,
1287 KW_is_water, 1262 KW_is_water,
1288 KW_use_content_on_gen, 1263 KW_use_content_on_gen,
1289 KW_NULL, 1264 KW_NULL,
1265 /* 110 */
1290 KW_is_buildable, 1266 KW_is_buildable,
1291 /* 110 */
1292 KW_destroy_on_death, 1267 KW_destroy_on_death,
1293 KW_NULL, 1268 KW_NULL,
1294 }; 1269 };
1270
1271 // obj_original is the only commonly differing flag between archetype
1272 // and object, so special-case it here to be able to skip the loop
1273 static const struct flagmask : object::flags_t
1274 {
1275 flagmask ()
1276 {
1277 for (int i = 0; i < NUM_FLAGS; i++)
1278 if (flag_names [i])
1279 set (i);
1280 }
1281 } flagmask;
1295 1282
1296 /* This saves the key/value lists. We do it first so that any 1283 /* 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. 1284 * keys that match field names will be overwritten by the loader.
1298 */ 1285 */
1299 for (key_value *kv = op->key_values; kv; kv = kv->next) 1286 for (key_value *kv = op->key_values; kv; kv = kv->next)
1300 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1287 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1301 f.put (kv->key, kv->value); 1288 f.put (kv->key, kv->value);
1302 1289
1303 /* We don't need to worry about the arch's extra fields - they
1304 * will get taken care of the copy_to method.
1305 */
1306
1307 if (op->uuid) 1290 if (op->uuid)
1308 f.put (KW_uuid, op->uuid.c_str ()); 1291 {
1292 // highly optimised - this is often 25% of all data written
1293 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1294 char *ptr = cur;
1309 1295
1296 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1297 ptr += sizeof ("uuid ") - 1;
1298 ptr = op->uuid.append (ptr);
1299 *ptr++ = '\n';
1300
1301 f.alloc (ptr - cur);
1302 }
1303
1310#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1304#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1311#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1305#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1312 1306
1313 if (object *owner = op->owner) 1307 CMP_OUT (x);
1314 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1308 CMP_OUT (y);
1309
1310 CMP_OUT (type);
1311 CMP_OUT (subtype);
1312 CMP_OUT (direction);
1315 1313
1316 CMP_OUT (name); 1314 CMP_OUT (name);
1317 CMP_OUT (name_pl); 1315 CMP_OUT (name_pl);
1318 CMP_OUT (custom_name); 1316 CMP_OUT (speed);
1317
1318 // speed_left is a major time-burner, and has good locality, so
1319 // we use a simple lookup-cache to avoid the very slow printf.
1320 if (op->speed_left != arch->speed_left)
1321 {
1322 static double last_speed_left = 0.;
1323 static char last_speed_left_str [256] = "sl 0\n";
1324 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1325
1326 if (last_speed_left != op->speed_left)
1327 {
1328 last_speed_left = op->speed_left;
1329 last_speed_left_len = sizeof ("sl ") - 1
1330 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1331 }
1332
1333 f.add (last_speed_left_str, last_speed_left_len);
1334 }
1335
1319 CMP_OUT (title); 1336 CMP_OUT (title);
1320 CMP_OUT (race); 1337 CMP_OUT (race);
1338 CMP_OUT (slaying);
1321 CMP_OUT (skill); 1339 CMP_OUT (skill);
1322 CMP_OUT (slaying); 1340
1323 CMP_OUT (tag); 1341 CMP_OUT (tag);
1342 CMP_OUT (custom_name);
1343
1344 if (object *owner = op->owner)
1345 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1346
1347 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1348
1324 CMP_OUT (other_arch); 1349 CMP_OUT (other_arch);
1325 1350
1326 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1351 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1327 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1352 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1328 1353
1329 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1354 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1330 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1355 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1331 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1356 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1332 1357
1333 if (op->animation_id != tmp->animation_id) 1358 if (op->animation_id != arch->animation_id)
1334 if (op->has_anim ()) 1359 if (op->has_anim ())
1335 f.put (KW_animation, op->anim ().name); 1360 f.put (KW(animation), op->anim ().name);
1336 else 1361 else
1337 { 1362 {
1338 f.put (KW_animation, (const char *)0); 1363 f.put (KW(animation));
1339 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1364 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1340 } 1365 }
1341 1366
1342 CMP_OUT2 (str, stats.Str); 1367 CMP_OUT2 (str, stats.Str);
1343 CMP_OUT2 (dex, stats.Dex); 1368 CMP_OUT2 (dex, stats.Dex);
… …
1354 CMP_OUT2 (grace, stats.grace); 1379 CMP_OUT2 (grace, stats.grace);
1355 CMP_OUT2 (maxgrace, stats.maxgrace); 1380 CMP_OUT2 (maxgrace, stats.maxgrace);
1356 CMP_OUT2 (exp, stats.exp); 1381 CMP_OUT2 (exp, stats.exp);
1357 1382
1358 CMP_OUT (perm_exp); 1383 CMP_OUT (perm_exp);
1359 CMP_OUT (expmul); 1384 //CMP_OUT (expmul);
1360 1385
1361 CMP_OUT2 (food, stats.food); 1386 CMP_OUT2 (food, stats.food);
1362 CMP_OUT2 (dam, stats.dam); 1387 CMP_OUT2 (dam, stats.dam);
1363 CMP_OUT2 (luck, stats.luck); 1388 CMP_OUT2 (luck, stats.luck);
1364 CMP_OUT2 (wc, stats.wc); 1389 CMP_OUT2 (wc, stats.wc);
1365 CMP_OUT2 (ac, stats.ac); 1390 CMP_OUT2 (ac, stats.ac);
1366 1391
1367 CMP_OUT (x);
1368 CMP_OUT (y);
1369 CMP_OUT (speed);
1370 CMP_OUT (speed_left);
1371 CMP_OUT2 (move_state, move_status); 1392 CMP_OUT2 (move_state, move_status);
1372 CMP_OUT (attack_movement); 1393 CMP_OUT (attack_movement);
1373 CMP_OUT (nrof); 1394 CMP_OUT (nrof);
1374 CMP_OUT (level); 1395 CMP_OUT (level);
1375 CMP_OUT (direction);
1376 CMP_OUT (type);
1377 CMP_OUT (subtype);
1378 CMP_OUT (attacktype); 1396 CMP_OUT (attacktype);
1379 1397
1398 // using memcmp here seems to be a loss - is gcc vectorising?
1380 for (int i = 0; i < NROFATTACKS; i++) 1399 for (int i = 0; i < NROFATTACKS; i++)
1381 if (expect_false (op->resist[i] != tmp->resist[i])) 1400 if (expect_false (op->resist[i] != arch->resist[i]))
1382 f.put (resist_save[i], op->resist[i]); 1401 f.put (resist_save[i], op->resist[i]);
1383 1402
1384 CMP_OUT (path_attuned); 1403 CMP_OUT (path_attuned);
1385 CMP_OUT (path_repelled); 1404 CMP_OUT (path_repelled);
1386 CMP_OUT (path_denied); 1405 CMP_OUT (path_denied);
1406
1387 CMP_OUT2 (material, materials);//TODO: nuke 1407 CMP_OUT2 (material, materials);//TODO: nuke
1388 CMP_OUT (materialname); 1408 if (op->material != arch->material)
1409 f.put (KW(materialname), op->material->name);
1410
1389 CMP_OUT (value); 1411 CMP_OUT (value);
1390 CMP_OUT (carrying); 1412 CMP_OUT (carrying);
1391 CMP_OUT (weight); 1413 CMP_OUT (weight);
1392 CMP_OUT (invisible); 1414 CMP_OUT (invisible);
1393 CMP_OUT (state); 1415 CMP_OUT (state);
… …
1398 CMP_OUT (last_eat); 1420 CMP_OUT (last_eat);
1399 CMP_OUT (glow_radius); 1421 CMP_OUT (glow_radius);
1400 1422
1401 if (op->flag [FLAG_IS_LINKED]) 1423 if (op->flag [FLAG_IS_LINKED])
1402 if (auto (ol, op->find_link ())) 1424 if (auto (ol, op->find_link ()))
1403 f.put (KW_connected, ol->id); 1425 f.put (KW(connected), ol->id);
1404 1426
1405 CMP_OUT (randomitems); 1427 CMP_OUT (randomitems);
1428
1406 CMP_OUT2 (container, weight_limit); 1429 CMP_OUT2 (container, weight_limit);
1407 1430
1408 CMP_OUT (run_away); 1431 CMP_OUT (run_away);
1409 CMP_OUT (pick_up); 1432 CMP_OUT (pick_up);
1410 CMP_OUT (will_apply); 1433 CMP_OUT (will_apply);
… …
1425 CMP_OUT (move_on); 1448 CMP_OUT (move_on);
1426 CMP_OUT (move_off); 1449 CMP_OUT (move_off);
1427 CMP_OUT (move_slow); 1450 CMP_OUT (move_slow);
1428 CMP_OUT (move_slow_penalty); 1451 CMP_OUT (move_slow_penalty);
1429 1452
1430 if (op->flag != tmp->flag) 1453 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1454
1455 if (diff [FLAG_OBJ_ORIGINAL])
1456 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1457
1458 diff.reset (FLAG_OBJ_ORIGINAL);
1459
1460 // quickly test whether any other flags differ
1461 if (expect_true (diff.any ()))
1431 for (int i = 0; i <= NUM_FLAGS; i++) 1462 for (int i = 0; i < NUM_FLAGS; i++)
1432 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1463 if (expect_false (diff [i]))
1433 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1434 1465
1435 // save body locations 1466 // save body locations. gcc's memcmp does an abysmal job when used
1436 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1437 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1438 f.put (body_locations[i].save_name, op->slot[i].info); 1469 f.put (body_locations[i].save_name, op->slot[i].info);
1439} 1470}
1440 1471
1441/* 1472/*
1442 * Dumps all variables in an object to a file. 1473 * Dumps all variables in an object to a file.
… …
1444 * 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.
1445 */ 1476 */
1446bool 1477bool
1447object::write (object_freezer &f) 1478object::write (object_freezer &f)
1448{ 1479{
1449 if (is_arch ()) 1480 if (expect_false (is_arch ()))
1450 { 1481 {
1451 f.put (KW_object, arch->archname); 1482 f.put (KW(object), arch->archname);
1452 write_diff (f, this, archetype::empty); 1483 write_diff (f, this, archetype::empty);
1453 } 1484 }
1454 else 1485 else
1455 { 1486 {
1456 f.put (KW_arch, arch->archname); 1487 f.put (KW(arch), arch->archname);
1457 write_diff (f, this, arch); 1488 write_diff (f, this, arch);
1458 } 1489 }
1459 1490
1460 for (object *tmp = inv; tmp; tmp = tmp->below) 1491 for (object *tmp = inv; tmp; tmp = tmp->below)
1461 tmp->write (f); 1492 tmp->write (f);
1462 1493
1463 f.put (this); 1494 f.put (this);
1464 f.put (KW_end); 1495 f.put (KW(end));
1465 1496
1466 return true; 1497 return true;
1467} 1498}
1468 1499
1469///////////////////////////////////////////////////////////////////////////// 1500/////////////////////////////////////////////////////////////////////////////

Diff Legend

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