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.135 by root, Fri Oct 23 03:08:34 2009 UTC vs.
Revision 1.150 by root, Sun Nov 29 09:41:27 2009 UTC

… …
27#include <sproto.h> 27#include <sproto.h>
28 28
29///////////////////////////////////////////////////////////////////////////// 29/////////////////////////////////////////////////////////////////////////////
30 30
31extern archetype *loading_arch; 31extern archetype *loading_arch;
32
33//+GPL
32 34
33/* 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
34 * spell object conversion to the new object. It was not practical 36 * spell object conversion to the new object. It was not practical
35 * 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
36 * 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
… …
328 330
329 if (!name_pl) 331 if (!name_pl)
330 name_pl = name; 332 name_pl = name;
331 333
332 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
333 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
334 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337
338 if (speed < 0.)
339 {
340 flag [FLAG_RANDOM_SPEED] = true;
341 speed = -speed;
342 // speed_left will be randomised in instantiate () and copy_to ()
343 }
335 344
336 /* only do these when program is first run - a bit 345 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 346 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 347 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 348 * not in the ideal fashion.
… …
478 animate_object (this, direction); 487 animate_object (this, direction);
479 } 488 }
480} 489}
481 490
482static void 491static void
483set_move (MoveType &mt, const char *str) 492set_move (MoveType &mt, object_thawer &f)
484{ 493{
485 static const struct flagstr { 494 static const struct flagstr {
486 const char *name; 495 const char *name;
487 MoveType flags; 496 MoveType flags;
488 } move_flags[] = { 497 } move_flags[] = {
… …
494 { "boat" , MOVE_BOAT }, 503 { "boat" , MOVE_BOAT },
495 { "ship" , MOVE_SHIP }, 504 { "ship" , MOVE_SHIP },
496 { "all" , MOVE_ALL }, 505 { "all" , MOVE_ALL },
497 }; 506 };
498 507
499 if (!str) 508 const char *str = f.get_str ();
500 {
501 mt = 0;
502 return;
503 }
504 509
505 if (isdigit (*str)) 510 if (!*str || isdigit (*str))
506 { 511 {
507 mt = atoi (str); 512 mt = atoi (str);
508 return; 513 return;
509 } 514 }
510 515
511 mt = 0; 516 mt = 0;
512 517
513 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 518 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
514 { 519 {
515 bool negate = 0; 520 bool negate = 0;
516 521
517 if (*str == '-') 522 if (*str == '-')
518 { 523 {
… …
537 542
538next: ; 543next: ;
539 } 544 }
540} 545}
541 546
547//-GPL
548
542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 549#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
543 550
544bool 551bool
545object::parse_kv (object_thawer &f) 552object::parse_kv (object_thawer &f)
546{ 553{
… …
550 for (;;) 557 for (;;)
551 { 558 {
552 switch (f.kw) 559 switch (f.kw)
553 { 560 {
554 case KW_uuid: 561 case KW_uuid:
555 if (const char *s = f.get_str ())
556 if (!uuid.parse (s)) 562 if (!uuid.parse (f.get_str ()))
557 { 563 {
558 f.parse_warn ("unparseable uuid"); 564 f.parse_warn ("unparseable uuid");
559 uuid = UUID::gen (); 565 uuid = UUID::gen ();
560 } 566 }
561 break; 567 break;
562 568
563 case KW_oid: 569 case KW_oid:
564 f.get (this, f.get_sint32 ()); 570 f.get (this, f.get_sint32 ());
565 break; 571 break;
… …
630 case KW_animation: 636 case KW_animation:
631 { 637 {
632 CLEAR_FLAG (this, FLAG_ANIMATE); 638 CLEAR_FLAG (this, FLAG_ANIMATE);
633 animation_id = 0; 639 animation_id = 0;
634 640
635 const char *str = f.get_str ();
636 if (str && (animation_id = find_animation (str))) 641 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
637 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here 642 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
638 } 643 }
639 break; 644 break;
640 645
641 case KW_last_heal: f.get (last_heal); break; 646 case KW_last_heal: f.get (last_heal); break;
642 case KW_last_sp: f.get (last_sp); break; 647 case KW_last_sp: f.get (last_sp); break;
643 case KW_last_grace: f.get (last_grace); break; 648 case KW_last_grace: f.get (last_grace); break;
644 case KW_last_eat: f.get (last_eat); break; 649 case KW_last_eat: f.get (last_eat); break;
650 case KW_sl:
645 case KW_speed_left: f.get (speed_left); break; 651 case KW_speed_left: f.get (speed_left); break;
646 652
647 case KW_speed: 653 case KW_speed:
648 f.get (speed); 654 f.get (speed);
649 655
… …
658 move_slow |= MOVE_WALK; 664 move_slow |= MOVE_WALK;
659 f.get (move_slow_penalty); 665 f.get (move_slow_penalty);
660 break; 666 break;
661 667
662 case KW_face: 668 case KW_face:
663 face = face_find (f.get_str ()); 669 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
664 break; 670 break;
665 671
666 case KW_sound: 672 case KW_sound:
673 if (f.has_value ())
674 {
667 sound = sound_find (f.get_str ()); 675 sound = sound_find (f.get_str ());
668 if (!sound) 676 if (!sound)
669 f.parse_warn ("sound not found"); 677 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
678 }
679 else
680 sound = 0;
670 break; 681 break;
671 682
672 case KW_sound_destroy: 683 case KW_sound_destroy:
684 if (f.has_value ())
685 {
673 sound_destroy = sound_find (f.get_str ()); 686 sound_destroy = sound_find (f.get_str ());
674 if (!sound_destroy) 687 if (!sound_destroy)
675 f.parse_warn ("sound not found"); 688 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
689 }
690 else
691 sound_destroy = 0;
676 break; 692 break;
677 693
678 case KW_x: f.get (x); break; 694 case KW_x: f.get (x); break;
679 case KW_y: f.get (y); break; 695 case KW_y: f.get (y); break;
680 696
… …
721 case KW_invisible: f.get (invisible); break; 737 case KW_invisible: f.get (invisible); break;
722 case KW_magic: f.get (magic); break; 738 case KW_magic: f.get (magic); break;
723 case KW_state: f.get (state); break; 739 case KW_state: f.get (state); break;
724 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 740 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
725 case KW_material: f.get (materials); break; //TODO: nuke 741 case KW_material: f.get (materials); break; //TODO: nuke
726 case KW_materialname: f.get (materialname); break; 742
743 case KW_materialname:
744 {
745 shstr sh;
746 f.get (sh);
747 material = name_to_material (sh);
748 }
749 break;
727 750
728 /* These are the new values */ 751 /* These are the new values */
729 case KW_move_block: set_move (move_block, f.get_str ()); break; 752 case KW_move_block: set_move (move_block, f); break;
730 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 753 case KW_move_allow: set_move (move_allow, f); break;
731 case KW_move_type: set_move (move_type, f.get_str ()); break; 754 case KW_move_type: set_move (move_type , f); break;
732 case KW_move_on: set_move (move_on, f.get_str ()); break; 755 case KW_move_on: set_move (move_on , f); break;
733 case KW_move_off: set_move (move_off, f.get_str ()); break; 756 case KW_move_off: set_move (move_off , f); break;
734 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 757 case KW_move_slow: set_move (move_slow , f); break;
735 758
736 /* These are all legacy - any new objects should use the move_ .. values */ 759 /* These are all legacy - any new objects should use the move_ .. values */
737 case KW_no_pass: 760 case KW_no_pass:
738 { 761 {
739 if (f.get_sint32 ()) 762 if (f.get_sint32 ())
… …
848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 871 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 872 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 873 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 874 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
852 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 875 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
853 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
854 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 876 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 877 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
856 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break; 878 case KW_can_use_shield: GET_FLAG (this, FLAG_USE_SHIELD); break;
857 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break; 879 case KW_can_cast_spell: GET_FLAG (this, FLAG_CAST_SPELL); break;
858 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break; 880 case KW_can_use_scroll: GET_FLAG (this, FLAG_USE_SCROLL); break;
… …
902 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 924 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
903 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 925 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break;
904 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break; 926 case KW_destroy_on_death: GET_FLAG (this, FLAG_DESTROY_ON_DEATH); break;
905 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break; 927 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
906 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break; 928 case KW_precious: GET_FLAG (this, FLAG_PRECIOUS); break;
929 case KW_random_speed: GET_FLAG (this, FLAG_RANDOM_SPEED); break;
907 930
908 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 932 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 933 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 934 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
986 add_link (map, connected); 1009 add_link (map, connected);
987 } 1010 }
988 break; 1011 break;
989 1012
990 case KW_randomitems: 1013 case KW_randomitems:
991 if (f.get_str ()) 1014 if (f.has_value ())
992 { 1015 {
993 randomitems = 1016 randomitems =
994 loading_arch 1017 loading_arch
995 ? treasurelist::get (f.get_str ()) 1018 ? treasurelist::get (f.get_str ())
996 : treasurelist::find (f.get_str ()); 1019 : treasurelist::find (f.get_str ());
… …
1066 archetype *arch = archetype::find (f.get_str ()); 1089 archetype *arch = archetype::find (f.get_str ());
1067 1090
1068 if (!arch) 1091 if (!arch)
1069 { 1092 {
1070 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ()); 1093 LOG (llevError, "object refering to nonexistant archetype '%s'.\n", f.get_str ());
1071 arch = archetype::find ("earthwall"); 1094 arch = archetype::find (shstr_earthwall);
1072 } 1095 }
1073 1096
1074 assert (arch); //D maybe use exception handling of sorts? 1097 assert (arch); //D maybe use exception handling of sorts?
1075 1098
1076 f.next (); 1099 f.next ();
… …
1102 object_thawer f (buf, (AV *)0); 1125 object_thawer f (buf, (AV *)0);
1103 1126
1104 return op->parse_kv (f); 1127 return op->parse_kv (f);
1105} 1128}
1106 1129
1107/* This returns a string of the integer movement type */
1108#if 0
1109// unused function
1110static char *
1111get_string_move_type (MoveType mt)
1112{
1113 static char retbuf[MAX_BUF], retbuf_all[MAX_BUF];
1114 int i, all_count = 0, count;
1115
1116 strcpy (retbuf, "");
1117 strcpy (retbuf_all, " all");
1118
1119 /* Quick check, and probably fairly common */
1120 if (mt == MOVE_ALL)
1121 return retbuf_all + 1;
1122 if (mt == 0)
1123 {
1124 strcpy (retbuf, "0");
1125 return retbuf;
1126 }
1127
1128 /* We basically slide the bits down. Why look at MOVE_ALL?
1129 * because we may want to return a string like 'all -swim',
1130 * and if we just looked at mt, we couldn't get that.
1131 */
1132 for (i = MOVE_ALL, count = 0; i != 0; i >>= 1, count++)
1133 {
1134 if (mt & (1 << count))
1135 {
1136 strcat (retbuf, " ");
1137 strcat (retbuf, move_name[count]);
1138 }
1139 else
1140 {
1141 strcat (retbuf_all, " -");
1142 strcat (retbuf_all, move_name[count]);
1143 all_count++;
1144 }
1145 }
1146 /* Basically, if there is a single negation, return it, eg
1147 * 'all -swim'. But more than that, just return the
1148 * enumerated values. It doesn't make sense to return
1149 * 'all -walk -fly_low' - it is shorter to return 'fly_high swim'
1150 */
1151 if (all_count <= 1)
1152 return retbuf_all + 1;
1153 else
1154 return retbuf + 1;
1155}
1156#endif
1157
1158// compare *op against *tmp and output differences 1130// compare *op against *arch and output differences
1159static void 1131static void
1160write_diff (object_freezer &f, object *op, object *tmp) 1132write_diff (object_freezer &f, object *op, object *arch)
1161{ 1133{
1162 static const keyword resist_save[NROFATTACKS] = { 1134 static const keyword resist_save[NROFATTACKS] = {
1163# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1135# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1164# include "attackinc.h" 1136# include "attackinc.h"
1165# undef def 1137# undef def
… …
1179 KW_applied, 1151 KW_applied,
1180 KW_unpaid, 1152 KW_unpaid,
1181 KW_can_use_shield, 1153 KW_can_use_shield,
1182 KW_no_pick, 1154 KW_no_pick,
1183 KW_NULL, // walk_on 1155 KW_NULL, // walk_on
1156 /* 10 */
1184 KW_NULL, // no_pass 1157 KW_NULL, // no_pass
1185 /* 10 */
1186 KW_is_animated, 1158 KW_is_animated,
1187 KW_NULL, // slow_move 1159 KW_NULL, // slow_move
1188 KW_NULL, // flying 1160 KW_NULL, // flying
1189 KW_monster, 1161 KW_monster,
1190 KW_friendly, 1162 KW_friendly,
1191 KW_generator, 1163 KW_generator,
1192 KW_is_thrown, 1164 KW_is_thrown,
1193 KW_auto_apply, 1165 KW_auto_apply,
1194 KW_treasure_env, 1166 KW_treasure_env,
1167 /* 20 */
1195 KW_player_sold, 1168 KW_player_sold,
1196 /* 20 */
1197 KW_see_invisible, 1169 KW_see_invisible,
1198 KW_can_roll, 1170 KW_can_roll,
1199 KW_overlay_floor, 1171 KW_overlay_floor,
1200 KW_is_turnable, 1172 KW_is_turnable,
1201 KW_NULL, // walk_off 1173 KW_NULL, // walk_off
1202 KW_NULL, // fly_on 1174 KW_NULL, // fly_on
1203 KW_NULL, // fly_off 1175 KW_NULL, // fly_off
1204 KW_is_used_up, 1176 KW_is_used_up,
1205 KW_identified, 1177 KW_identified,
1178 /* 30 */
1206 KW_reflecting, 1179 KW_reflecting,
1207 /* 30 */
1208 KW_changing, 1180 KW_changing,
1209 KW_splitting, 1181 KW_splitting,
1210 KW_hitback, 1182 KW_hitback,
1211 KW_startequip, 1183 KW_startequip,
1212 KW_blocksview, 1184 KW_blocksview,
1213 KW_undead, 1185 KW_undead,
1214 KW_scared, 1186 KW_scared,
1215 KW_unaggressive, 1187 KW_unaggressive,
1216 KW_reflect_missile, 1188 KW_reflect_missile,
1189 /* 40 */
1217 KW_reflect_spell, 1190 KW_reflect_spell,
1218 /* 40 */
1219 KW_no_magic, 1191 KW_no_magic,
1220 KW_no_fix_player, 1192 KW_NULL,
1221 KW_is_lightable, 1193 KW_is_lightable,
1222 KW_tear_down, 1194 KW_tear_down,
1223 KW_run_away, 1195 KW_run_away,
1224 KW_NULL, // pass_thru 1196 KW_NULL, // pass_thru
1225 KW_NULL, // an_pass_thru 1197 KW_NULL, // an_pass_thru
1226 KW_pick_up, 1198 KW_pick_up,
1227 KW_unique, 1199 KW_unique,
1200 /* 50 */
1228 KW_no_drop, 1201 KW_no_drop,
1229 /* 50 */
1230 KW_NULL, // wizcast 1202 KW_NULL, // wizcast
1231 KW_can_cast_spell, 1203 KW_can_cast_spell,
1232 KW_can_use_scroll, 1204 KW_can_use_scroll,
1233 KW_can_use_range, 1205 KW_can_use_range,
1234 KW_can_use_bow, 1206 KW_can_use_bow,
1235 KW_can_use_armour, 1207 KW_can_use_armour,
1236 KW_can_use_weapon, 1208 KW_can_use_weapon,
1237 KW_can_use_ring, 1209 KW_can_use_ring,
1238 KW_has_ready_range, 1210 KW_has_ready_range,
1211 /* 60 */
1239 KW_has_ready_bow, 1212 KW_has_ready_bow,
1240 /* 60 */
1241 KW_xrays, 1213 KW_xrays,
1242 KW_NULL, 1214 KW_NULL,
1243 KW_is_floor, 1215 KW_is_floor,
1244 KW_lifesave, 1216 KW_lifesave,
1245 KW_no_strength, 1217 KW_no_strength,
1246 KW_sleep, 1218 KW_sleep,
1247 KW_stand_still, 1219 KW_stand_still,
1248 KW_random_move, 1220 KW_random_move,
1249 KW_only_attack, 1221 KW_only_attack,
1222 /* 70 */
1250 KW_confused, 1223 KW_confused,
1251 /* 70 */
1252 KW_stealth, 1224 KW_stealth,
1253 KW_NULL, 1225 KW_NULL,
1254 KW_NULL, 1226 KW_NULL,
1255 KW_cursed, 1227 KW_cursed,
1256 KW_damned, 1228 KW_damned,
1257 KW_see_anywhere, 1229 KW_see_anywhere,
1258 KW_known_magical, 1230 KW_known_magical,
1259 KW_known_cursed, 1231 KW_known_cursed,
1260 KW_can_use_skill, 1232 KW_can_use_skill,
1233 /* 80 */
1261 KW_been_applied, 1234 KW_been_applied,
1262 /* 80 */
1263 KW_has_ready_scroll, 1235 KW_has_ready_scroll,
1264 KW_can_use_rod, 1236 KW_can_use_rod,
1265 KW_precious, 1237 KW_precious,
1266 KW_can_use_horn, 1238 KW_can_use_horn,
1267 KW_make_invisible, 1239 KW_make_invisible,
1268 KW_inv_locked, 1240 KW_inv_locked,
1269 KW_is_wooded, 1241 KW_is_wooded,
1270 KW_is_hilly, 1242 KW_is_hilly,
1271 KW_has_ready_skill, 1243 KW_has_ready_skill,
1244 /* 90 */
1272 KW_has_ready_weapon, 1245 KW_has_ready_weapon,
1273 /* 90 */
1274 KW_no_skill_ident, 1246 KW_no_skill_ident,
1275 KW_is_blind, 1247 KW_is_blind,
1276 KW_can_see_in_dark, 1248 KW_can_see_in_dark,
1277 KW_is_cauldron, 1249 KW_is_cauldron,
1278 KW_NULL, 1250 KW_NULL,
1279 KW_no_steal, 1251 KW_no_steal,
1280 KW_one_hit, 1252 KW_one_hit,
1281 KW_NULL, 1253 KW_NULL,
1282 KW_berserk, 1254 KW_berserk,
1255 /* 100 */
1283 KW_neutral, 1256 KW_neutral,
1284 /* 100 */
1285 KW_no_attack, 1257 KW_no_attack,
1286 KW_no_damage, 1258 KW_no_damage,
1287 KW_obj_original, 1259 KW_obj_original,
1288 KW_NULL, 1260 KW_random_speed,
1289 KW_activate_on_push, 1261 KW_activate_on_push,
1290 KW_activate_on_release, 1262 KW_activate_on_release,
1291 KW_is_water, 1263 KW_is_water,
1292 KW_use_content_on_gen, 1264 KW_use_content_on_gen,
1293 KW_NULL, 1265 KW_NULL,
1266 /* 110 */
1294 KW_is_buildable, 1267 KW_is_buildable,
1295 /* 110 */
1296 KW_destroy_on_death, 1268 KW_destroy_on_death,
1297 KW_NULL, 1269 KW_NULL,
1298 }; 1270 };
1271
1272 // obj_original is the only commonly differing flag between archetype
1273 // and object, so special-case it here to be able to skip the loop
1274 static const struct flagmask : object::flags_t
1275 {
1276 flagmask ()
1277 {
1278 for (int i = 0; i < NUM_FLAGS; i++)
1279 if (flag_names [i])
1280 set (i);
1281 }
1282 } flagmask;
1299 1283
1300 /* This saves the key/value lists. We do it first so that any 1284 /* This saves the key/value lists. We do it first so that any
1301 * keys that match field names will be overwritten by the loader. 1285 * keys that match field names will be overwritten by the loader.
1302 */ 1286 */
1303 for (key_value *kv = op->key_values; kv; kv = kv->next) 1287 for (key_value *kv = op->key_values; kv; kv = kv->next)
1304 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1288 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1305 f.put (kv->key, kv->value); 1289 f.put (kv->key, kv->value);
1306 1290
1307 /* We don't need to worry about the arch's extra fields - they
1308 * will get taken care of the copy_to method.
1309 */
1310
1311 if (op->uuid) 1291 if (op->uuid)
1312 f.put (KW_uuid, op->uuid.c_str ()); 1292 {
1293 // highly optimised - this is often 25% of all data written
1294 char *cur = f.force (sizeof ("uuid ") + UUID::MAX_LEN + 1);
1295 char *ptr = cur;
1313 1296
1297 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1298 ptr += sizeof ("uuid ") - 1;
1299 ptr = op->uuid.append (ptr);
1300 *ptr++ = '\n';
1301
1302 f.alloc (ptr - cur);
1303 }
1304
1314#define CMP_OUT(v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## v, op->v) 1305#define CMP_OUT(v) if (expect_false (op->v != arch->v)) f.put (KW (v), op->v)
1315#define CMP_OUT2(k,v) if (expect_false (op->v != tmp->v)) f.put (KW_ ## k, op->v) 1306#define CMP_OUT2(k,v) if (expect_false (op->v != arch->v)) f.put (KW (k), op->v)
1316 1307
1317 if (object *owner = op->owner) 1308 CMP_OUT (x);
1318 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1309 CMP_OUT (y);
1310
1311 CMP_OUT (type);
1312 CMP_OUT (subtype);
1313 CMP_OUT (direction);
1319 1314
1320 CMP_OUT (name); 1315 CMP_OUT (name);
1321 CMP_OUT (name_pl); 1316 CMP_OUT (name_pl);
1322 CMP_OUT (custom_name); 1317 CMP_OUT (speed);
1318
1319 // speed_left is a major time-burner, and has good locality, so
1320 // we use a simple lookup-cache to avoid the very slow printf.
1321 if (op->speed_left != arch->speed_left)
1322 {
1323 static double last_speed_left = 0.;
1324 static char last_speed_left_str [256] = "sl 0\n";
1325 static int last_speed_left_len = sizeof ("sl 0\n") - 1;
1326
1327 if (last_speed_left != op->speed_left)
1328 {
1329 last_speed_left = op->speed_left;
1330 last_speed_left_len = sizeof ("sl ") - 1
1331 + sprintf (last_speed_left_str + sizeof ("sl ") - 1, "%.7g\n", last_speed_left);
1332 }
1333
1334 f.add (last_speed_left_str, last_speed_left_len);
1335 }
1336
1323 CMP_OUT (title); 1337 CMP_OUT (title);
1324 CMP_OUT (race); 1338 CMP_OUT (race);
1339 CMP_OUT (slaying);
1325 CMP_OUT (skill); 1340 CMP_OUT (skill);
1326 CMP_OUT (slaying); 1341
1327 CMP_OUT (tag); 1342 CMP_OUT (tag);
1343 CMP_OUT (custom_name);
1344
1345 if (object *owner = op->owner)
1346 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1347
1348 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1349
1328 CMP_OUT (other_arch); 1350 CMP_OUT (other_arch);
1329 1351
1330 if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1352 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1331 if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); 1353 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1332 1354
1333 if (op->face != tmp->face ) f.put (KW_face , op->face ? &faces [op->face ] : 0); 1355 if (op->face != arch->face ) f.put (KW(face) , op->face ? &faces [op->face ] : 0);
1334 if (op->sound != tmp->sound ) f.put (KW_sound , op->sound ? &faces [op->sound ] : 0); 1356 if (op->sound != arch->sound ) f.put (KW(sound) , op->sound ? &faces [op->sound ] : 0);
1335 if (op->sound_destroy != tmp->sound_destroy) f.put (KW_sound_destroy, op->sound_destroy ? &faces [op->sound_destroy] : 0); 1357 if (op->sound_destroy != arch->sound_destroy) f.put (KW(sound_destroy), op->sound_destroy ? &faces [op->sound_destroy] : 0);
1336 1358
1337 if (op->animation_id != tmp->animation_id) 1359 if (op->animation_id != arch->animation_id)
1338 if (op->has_anim ()) 1360 if (op->has_anim ())
1339 f.put (KW_animation, op->anim ().name); 1361 f.put (KW(animation), op->anim ().name);
1340 else 1362 else
1341 { 1363 {
1342 f.put (KW_animation, (const char *)0); 1364 f.put (KW(animation));
1343 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1365 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1344 } 1366 }
1345 1367
1346 CMP_OUT2 (str, stats.Str); 1368 CMP_OUT2 (str, stats.Str);
1347 CMP_OUT2 (dex, stats.Dex); 1369 CMP_OUT2 (dex, stats.Dex);
… …
1358 CMP_OUT2 (grace, stats.grace); 1380 CMP_OUT2 (grace, stats.grace);
1359 CMP_OUT2 (maxgrace, stats.maxgrace); 1381 CMP_OUT2 (maxgrace, stats.maxgrace);
1360 CMP_OUT2 (exp, stats.exp); 1382 CMP_OUT2 (exp, stats.exp);
1361 1383
1362 CMP_OUT (perm_exp); 1384 CMP_OUT (perm_exp);
1363 CMP_OUT (expmul); 1385 //CMP_OUT (expmul);
1364 1386
1365 CMP_OUT2 (food, stats.food); 1387 CMP_OUT2 (food, stats.food);
1366 CMP_OUT2 (dam, stats.dam); 1388 CMP_OUT2 (dam, stats.dam);
1367 CMP_OUT2 (luck, stats.luck); 1389 CMP_OUT2 (luck, stats.luck);
1368 CMP_OUT2 (wc, stats.wc); 1390 CMP_OUT2 (wc, stats.wc);
1369 CMP_OUT2 (ac, stats.ac); 1391 CMP_OUT2 (ac, stats.ac);
1370 1392
1371 CMP_OUT (x);
1372 CMP_OUT (y);
1373 CMP_OUT (speed);
1374 CMP_OUT (speed_left);
1375 CMP_OUT2 (move_state, move_status); 1393 CMP_OUT2 (move_state, move_status);
1376 CMP_OUT (attack_movement); 1394 CMP_OUT (attack_movement);
1377 CMP_OUT (nrof); 1395 CMP_OUT (nrof);
1378 CMP_OUT (level); 1396 CMP_OUT (level);
1379 CMP_OUT (direction);
1380 CMP_OUT (type);
1381 CMP_OUT (subtype);
1382 CMP_OUT (attacktype); 1397 CMP_OUT (attacktype);
1383 1398
1399 // using memcmp here seems to be a loss - is gcc vectorising?
1384 for (int i = 0; i < NROFATTACKS; i++) 1400 for (int i = 0; i < NROFATTACKS; i++)
1385 if (expect_false (op->resist[i] != tmp->resist[i])) 1401 if (expect_false (op->resist[i] != arch->resist[i]))
1386 f.put (resist_save[i], op->resist[i]); 1402 f.put (resist_save[i], op->resist[i]);
1387 1403
1388 CMP_OUT (path_attuned); 1404 CMP_OUT (path_attuned);
1389 CMP_OUT (path_repelled); 1405 CMP_OUT (path_repelled);
1390 CMP_OUT (path_denied); 1406 CMP_OUT (path_denied);
1407
1391 CMP_OUT2 (material, materials);//TODO: nuke 1408 CMP_OUT2 (material, materials);//TODO: nuke
1392 CMP_OUT (materialname); 1409 if (op->material != arch->material)
1410 f.put (KW(materialname), op->material->name);
1411
1393 CMP_OUT (value); 1412 CMP_OUT (value);
1394 CMP_OUT (carrying); 1413 CMP_OUT (carrying);
1395 CMP_OUT (weight); 1414 CMP_OUT (weight);
1396 CMP_OUT (invisible); 1415 CMP_OUT (invisible);
1397 CMP_OUT (state); 1416 CMP_OUT (state);
… …
1402 CMP_OUT (last_eat); 1421 CMP_OUT (last_eat);
1403 CMP_OUT (glow_radius); 1422 CMP_OUT (glow_radius);
1404 1423
1405 if (op->flag [FLAG_IS_LINKED]) 1424 if (op->flag [FLAG_IS_LINKED])
1406 if (auto (ol, op->find_link ())) 1425 if (auto (ol, op->find_link ()))
1407 f.put (KW_connected, ol->id); 1426 f.put (KW(connected), ol->id);
1408 1427
1409 CMP_OUT (randomitems); 1428 CMP_OUT (randomitems);
1429
1410 CMP_OUT2 (container, weight_limit); 1430 CMP_OUT2 (container, weight_limit);
1411 1431
1412 CMP_OUT (run_away); 1432 CMP_OUT (run_away);
1413 CMP_OUT (pick_up); 1433 CMP_OUT (pick_up);
1414 CMP_OUT (will_apply); 1434 CMP_OUT (will_apply);
… …
1429 CMP_OUT (move_on); 1449 CMP_OUT (move_on);
1430 CMP_OUT (move_off); 1450 CMP_OUT (move_off);
1431 CMP_OUT (move_slow); 1451 CMP_OUT (move_slow);
1432 CMP_OUT (move_slow_penalty); 1452 CMP_OUT (move_slow_penalty);
1433 1453
1434 if (op->flag != tmp->flag) 1454 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1455
1456 if (diff [FLAG_OBJ_ORIGINAL])
1457 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0));
1458
1459 diff.reset (FLAG_OBJ_ORIGINAL);
1460
1461 // quickly test whether any other flags differ
1462 if (expect_true (diff.any ()))
1435 for (int i = 0; i <= NUM_FLAGS; i++) 1463 for (int i = 0; i < NUM_FLAGS; i++)
1436 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1464 if (expect_false (diff [i]))
1437 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1465 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1438 1466
1439 // save body locations 1467 // save body locations. gcc's memcmp does an abysmal job when used
1440 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1468 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1441 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1469 if (expect_false (op->slot[i].info != arch->slot[i].info))
1442 f.put (body_locations[i].save_name, op->slot[i].info); 1470 f.put (body_locations[i].save_name, op->slot[i].info);
1443} 1471}
1444 1472
1445/* 1473/*
1446 * Dumps all variables in an object to a file. 1474 * Dumps all variables in an object to a file.
… …
1448 * the only place this is not set is when saving the player. 1476 * the only place this is not set is when saving the player.
1449 */ 1477 */
1450bool 1478bool
1451object::write (object_freezer &f) 1479object::write (object_freezer &f)
1452{ 1480{
1453 if (is_arch ()) 1481 if (expect_false (is_arch ()))
1454 { 1482 {
1455 f.put (KW_object, arch->archname); 1483 f.put (KW(object), arch->archname);
1456 write_diff (f, this, archetype::empty); 1484 write_diff (f, this, archetype::empty);
1457 } 1485 }
1458 else 1486 else
1459 { 1487 {
1460 f.put (KW_arch, arch->archname); 1488 f.put (KW(arch), arch->archname);
1461 write_diff (f, this, arch); 1489 write_diff (f, this, arch);
1462 } 1490 }
1463 1491
1464 for (object *tmp = inv; tmp; tmp = tmp->below) 1492 for (object *tmp = inv; tmp; tmp = tmp->below)
1465 tmp->write (f); 1493 tmp->write (f);
1466 1494
1467 f.put (this); 1495 f.put (this);
1468 f.put (KW_end); 1496 f.put (KW(end));
1469 1497
1470 return true; 1498 return true;
1471} 1499}
1472 1500
1473///////////////////////////////////////////////////////////////////////////// 1501/////////////////////////////////////////////////////////////////////////////

Diff Legend

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