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.136 by root, Wed Nov 4 00:02:48 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 it under 8 * Deliantra is free software: you can redistribute it and/or modify it under
9 * the terms of the Affero GNU General Public License as published by the 9 * the terms of the Affero GNU General Public License as published by the
10 * Free Software Foundation, either version 3 of the License, or (at your 10 * Free Software Foundation, either version 3 of the License, or (at your
11 * option) any later version. 11 * option) any later version.
… …
21 * 21 *
22 * 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>
23 */ 23 */
24 24
25#include <global.h> 25#include <global.h>
26#include <loader.h>
27#include <sproto.h> 26#include <sproto.h>
28 27
29///////////////////////////////////////////////////////////////////////////// 28/////////////////////////////////////////////////////////////////////////////
30 29
31extern archetype *loading_arch; 30extern archetype *loading_arch;
31
32//+GPL
32 33
33/* 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
34 * spell object conversion to the new object. It was not practical 35 * spell object conversion to the new object. It was not practical
35 * 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
36 * 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
… …
328 329
329 if (!name_pl) 330 if (!name_pl)
330 name_pl = name; 331 name_pl = name;
331 332
332 /* objects now have a materialname. try to patch it in */ 333 /* objects now have a materialname. try to patch it in */
333 if (!(is_weapon () && level > 0)) 334 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
334 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 }
335 343
336 /* only do these when program is first run - a bit 344 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 345 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 346 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 347 * not in the ideal fashion.
… …
478 animate_object (this, direction); 486 animate_object (this, direction);
479 } 487 }
480} 488}
481 489
482static void 490static void
483set_move (MoveType &mt, const char *str) 491set_move (MoveType &mt, object_thawer &f)
484{ 492{
485 static const struct flagstr { 493 static const struct flagstr {
486 const char *name; 494 const char *name;
487 MoveType flags; 495 MoveType flags;
488 } move_flags[] = { 496 } move_flags[] = {
… …
494 { "boat" , MOVE_BOAT }, 502 { "boat" , MOVE_BOAT },
495 { "ship" , MOVE_SHIP }, 503 { "ship" , MOVE_SHIP },
496 { "all" , MOVE_ALL }, 504 { "all" , MOVE_ALL },
497 }; 505 };
498 506
499 if (!str) 507 const char *str = f.get_str ();
500 {
501 mt = 0;
502 return;
503 }
504 508
505 if (isdigit (*str)) 509 if (!*str || isdigit (*str))
506 { 510 {
507 mt = atoi (str); 511 mt = atoi (str);
508 return; 512 return;
509 } 513 }
510 514
511 mt = 0; 515 mt = 0;
512 516
513 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 517 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
514 { 518 {
515 bool negate = 0; 519 bool negate = 0;
516 520
517 if (*str == '-') 521 if (*str == '-')
518 { 522 {
… …
537 541
538next: ; 542next: ;
539 } 543 }
540} 544}
541 545
546//-GPL
547
542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 548#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
543 549
544bool 550bool
545object::parse_kv (object_thawer &f) 551object::parse_kv (object_thawer &f)
546{ 552{
… …
550 for (;;) 556 for (;;)
551 { 557 {
552 switch (f.kw) 558 switch (f.kw)
553 { 559 {
554 case KW_uuid: 560 case KW_uuid:
555 if (const char *s = f.get_str ())
556 if (!uuid.parse (s)) 561 if (!uuid.parse (f.get_str ()))
557 { 562 {
558 f.parse_warn ("unparseable uuid"); 563 f.parse_warn ("unparseable uuid");
559 uuid = UUID::gen (); 564 uuid = UUID::gen ();
560 } 565 }
561 break; 566 break;
562 567
563 case KW_oid: 568 case KW_oid:
564 f.get (this, f.get_sint32 ()); 569 f.get (this, f.get_sint32 ());
565 break; 570 break;
… …
630 case KW_animation: 635 case KW_animation:
631 { 636 {
632 CLEAR_FLAG (this, FLAG_ANIMATE); 637 CLEAR_FLAG (this, FLAG_ANIMATE);
633 animation_id = 0; 638 animation_id = 0;
634 639
635 const char *str = f.get_str ();
636 if (str && (animation_id = find_animation (str))) 640 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 641 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
638 } 642 }
639 break; 643 break;
640 644
641 case KW_last_heal: f.get (last_heal); break; 645 case KW_last_heal: f.get (last_heal); break;
642 case KW_last_sp: f.get (last_sp); break; 646 case KW_last_sp: f.get (last_sp); break;
643 case KW_last_grace: f.get (last_grace); break; 647 case KW_last_grace: f.get (last_grace); break;
644 case KW_last_eat: f.get (last_eat); break; 648 case KW_last_eat: f.get (last_eat); break;
649 case KW_sl:
645 case KW_speed_left: f.get (speed_left); break; 650 case KW_speed_left: f.get (speed_left); break;
646 651
647 case KW_speed: 652 case KW_speed:
648 f.get (speed); 653 f.get (speed);
649 654
… …
658 move_slow |= MOVE_WALK; 663 move_slow |= MOVE_WALK;
659 f.get (move_slow_penalty); 664 f.get (move_slow_penalty);
660 break; 665 break;
661 666
662 case KW_face: 667 case KW_face:
663 face = face_find (f.get_str ()); 668 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
664 break; 669 break;
665 670
666 case KW_sound: 671 case KW_sound:
672 if (f.has_value ())
673 {
667 sound = sound_find (f.get_str ()); 674 sound = sound_find (f.get_str ());
668 if (!sound) 675 if (!sound)
669 f.parse_warn ("sound not found"); 676 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
677 }
678 else
679 sound = 0;
670 break; 680 break;
671 681
672 case KW_sound_destroy: 682 case KW_sound_destroy:
683 if (f.has_value ())
684 {
673 sound_destroy = sound_find (f.get_str ()); 685 sound_destroy = sound_find (f.get_str ());
674 if (!sound_destroy) 686 if (!sound_destroy)
675 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;
676 break; 691 break;
677 692
678 case KW_x: f.get (x); break; 693 case KW_x: f.get (x); break;
679 case KW_y: f.get (y); break; 694 case KW_y: f.get (y); break;
680 695
… …
721 case KW_invisible: f.get (invisible); break; 736 case KW_invisible: f.get (invisible); break;
722 case KW_magic: f.get (magic); break; 737 case KW_magic: f.get (magic); break;
723 case KW_state: f.get (state); break; 738 case KW_state: f.get (state); break;
724 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 739 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
725 case KW_material: f.get (materials); break; //TODO: nuke 740 case KW_material: f.get (materials); break; //TODO: nuke
726 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;
727 749
728 /* These are the new values */ 750 /* These are the new values */
729 case KW_move_block: set_move (move_block, f.get_str ()); break; 751 case KW_move_block: set_move (move_block, f); break;
730 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 752 case KW_move_allow: set_move (move_allow, f); break;
731 case KW_move_type: set_move (move_type, f.get_str ()); break; 753 case KW_move_type: set_move (move_type , f); break;
732 case KW_move_on: set_move (move_on, f.get_str ()); break; 754 case KW_move_on: set_move (move_on , f); break;
733 case KW_move_off: set_move (move_off, f.get_str ()); break; 755 case KW_move_off: set_move (move_off , f); break;
734 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 756 case KW_move_slow: set_move (move_slow , f); break;
735 757
736 /* 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 */
737 case KW_no_pass: 759 case KW_no_pass:
738 { 760 {
739 if (f.get_sint32 ()) 761 if (f.get_sint32 ())
… …
848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 870 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 871 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 872 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 873 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
852 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 874 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; 875 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 876 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
856 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;
857 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;
858 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;
… …
902 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break; 923 case KW_berserk: GET_FLAG (this, FLAG_BERSERK); break;
903 case KW_is_buildable: GET_FLAG (this, FLAG_IS_BUILDABLE); break; 924 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; 925 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; 926 case KW_treasure_env: GET_FLAG (this, FLAG_TREASURE_ENV); break;
906 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;
907 929
908 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break; 930 case KW_armour: f.get (resist[ATNR_PHYSICAL]); break;
909 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break; 931 case KW_resist_physical: f.get (resist[ATNR_PHYSICAL]); break;
910 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break; 932 case KW_resist_magic: f.get (resist[ATNR_MAGIC]); break;
911 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break; 933 case KW_resist_fire: f.get (resist[ATNR_FIRE]); break;
… …
986 add_link (map, connected); 1008 add_link (map, connected);
987 } 1009 }
988 break; 1010 break;
989 1011
990 case KW_randomitems: 1012 case KW_randomitems:
991 if (f.get_str ()) 1013 if (f.has_value ())
992 { 1014 {
993 randomitems = 1015 randomitems =
994 loading_arch 1016 loading_arch
995 ? treasurelist::get (f.get_str ()) 1017 ? treasurelist::get (f.get_str ())
996 : treasurelist::find (f.get_str ()); 1018 : treasurelist::find (f.get_str ());
… …
1066 archetype *arch = archetype::find (f.get_str ()); 1088 archetype *arch = archetype::find (f.get_str ());
1067 1089
1068 if (!arch) 1090 if (!arch)
1069 { 1091 {
1070 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 ());
1071 arch = archetype::find ("earthwall"); 1093 arch = archetype::find (shstr_earthwall);
1072 } 1094 }
1073 1095
1074 assert (arch); //D maybe use exception handling of sorts? 1096 assert (arch); //D maybe use exception handling of sorts?
1075 1097
1076 f.next (); 1098 f.next ();
… …
1102 object_thawer f (buf, (AV *)0); 1124 object_thawer f (buf, (AV *)0);
1103 1125
1104 return op->parse_kv (f); 1126 return op->parse_kv (f);
1105} 1127}
1106 1128
1107// compare *op against *tmp and output differences 1129// compare *op against *arch and output differences
1108static void 1130static void
1109write_diff (object_freezer &f, object *op, object *tmp) 1131write_diff (object_freezer &f, object *op, object *arch)
1110{ 1132{
1111 static const keyword resist_save[NROFATTACKS] = { 1133 static const keyword resist_save[NROFATTACKS] = {
1112# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1134# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1113# include "attackinc.h" 1135# include "attackinc.h"
1114# undef def 1136# undef def
… …
1128 KW_applied, 1150 KW_applied,
1129 KW_unpaid, 1151 KW_unpaid,
1130 KW_can_use_shield, 1152 KW_can_use_shield,
1131 KW_no_pick, 1153 KW_no_pick,
1132 KW_NULL, // walk_on 1154 KW_NULL, // walk_on
1155 /* 10 */
1133 KW_NULL, // no_pass 1156 KW_NULL, // no_pass
1134 /* 10 */
1135 KW_is_animated, 1157 KW_is_animated,
1136 KW_NULL, // slow_move 1158 KW_NULL, // slow_move
1137 KW_NULL, // flying 1159 KW_NULL, // flying
1138 KW_monster, 1160 KW_monster,
1139 KW_friendly, 1161 KW_friendly,
1140 KW_generator, 1162 KW_generator,
1141 KW_is_thrown, 1163 KW_is_thrown,
1142 KW_auto_apply, 1164 KW_auto_apply,
1143 KW_treasure_env, 1165 KW_treasure_env,
1166 /* 20 */
1144 KW_player_sold, 1167 KW_player_sold,
1145 /* 20 */
1146 KW_see_invisible, 1168 KW_see_invisible,
1147 KW_can_roll, 1169 KW_can_roll,
1148 KW_overlay_floor, 1170 KW_overlay_floor,
1149 KW_is_turnable, 1171 KW_is_turnable,
1150 KW_NULL, // walk_off 1172 KW_NULL, // walk_off
1151 KW_NULL, // fly_on 1173 KW_NULL, // fly_on
1152 KW_NULL, // fly_off 1174 KW_NULL, // fly_off
1153 KW_is_used_up, 1175 KW_is_used_up,
1154 KW_identified, 1176 KW_identified,
1177 /* 30 */
1155 KW_reflecting, 1178 KW_reflecting,
1156 /* 30 */
1157 KW_changing, 1179 KW_changing,
1158 KW_splitting, 1180 KW_splitting,
1159 KW_hitback, 1181 KW_hitback,
1160 KW_startequip, 1182 KW_startequip,
1161 KW_blocksview, 1183 KW_blocksview,
1162 KW_undead, 1184 KW_undead,
1163 KW_scared, 1185 KW_scared,
1164 KW_unaggressive, 1186 KW_unaggressive,
1165 KW_reflect_missile, 1187 KW_reflect_missile,
1188 /* 40 */
1166 KW_reflect_spell, 1189 KW_reflect_spell,
1167 /* 40 */
1168 KW_no_magic, 1190 KW_no_magic,
1169 KW_no_fix_player, 1191 KW_NULL,
1170 KW_is_lightable, 1192 KW_is_lightable,
1171 KW_tear_down, 1193 KW_tear_down,
1172 KW_run_away, 1194 KW_run_away,
1173 KW_NULL, // pass_thru 1195 KW_NULL, // pass_thru
1174 KW_NULL, // an_pass_thru 1196 KW_NULL, // an_pass_thru
1175 KW_pick_up, 1197 KW_pick_up,
1176 KW_unique, 1198 KW_unique,
1199 /* 50 */
1177 KW_no_drop, 1200 KW_no_drop,
1178 /* 50 */
1179 KW_NULL, // wizcast 1201 KW_NULL, // wizcast
1180 KW_can_cast_spell, 1202 KW_can_cast_spell,
1181 KW_can_use_scroll, 1203 KW_can_use_scroll,
1182 KW_can_use_range, 1204 KW_can_use_range,
1183 KW_can_use_bow, 1205 KW_can_use_bow,
1184 KW_can_use_armour, 1206 KW_can_use_armour,
1185 KW_can_use_weapon, 1207 KW_can_use_weapon,
1186 KW_can_use_ring, 1208 KW_can_use_ring,
1187 KW_has_ready_range, 1209 KW_has_ready_range,
1210 /* 60 */
1188 KW_has_ready_bow, 1211 KW_has_ready_bow,
1189 /* 60 */
1190 KW_xrays, 1212 KW_xrays,
1191 KW_NULL, 1213 KW_NULL,
1192 KW_is_floor, 1214 KW_is_floor,
1193 KW_lifesave, 1215 KW_lifesave,
1194 KW_no_strength, 1216 KW_no_strength,
1195 KW_sleep, 1217 KW_sleep,
1196 KW_stand_still, 1218 KW_stand_still,
1197 KW_random_move, 1219 KW_random_move,
1198 KW_only_attack, 1220 KW_only_attack,
1221 /* 70 */
1199 KW_confused, 1222 KW_confused,
1200 /* 70 */
1201 KW_stealth, 1223 KW_stealth,
1202 KW_NULL, 1224 KW_NULL,
1203 KW_NULL, 1225 KW_NULL,
1204 KW_cursed, 1226 KW_cursed,
1205 KW_damned, 1227 KW_damned,
1206 KW_see_anywhere, 1228 KW_see_anywhere,
1207 KW_known_magical, 1229 KW_known_magical,
1208 KW_known_cursed, 1230 KW_known_cursed,
1209 KW_can_use_skill, 1231 KW_can_use_skill,
1232 /* 80 */
1210 KW_been_applied, 1233 KW_been_applied,
1211 /* 80 */
1212 KW_has_ready_scroll, 1234 KW_has_ready_scroll,
1213 KW_can_use_rod, 1235 KW_can_use_rod,
1214 KW_precious, 1236 KW_precious,
1215 KW_can_use_horn, 1237 KW_can_use_horn,
1216 KW_make_invisible, 1238 KW_make_invisible,
1217 KW_inv_locked, 1239 KW_inv_locked,
1218 KW_is_wooded, 1240 KW_is_wooded,
1219 KW_is_hilly, 1241 KW_is_hilly,
1220 KW_has_ready_skill, 1242 KW_has_ready_skill,
1243 /* 90 */
1221 KW_has_ready_weapon, 1244 KW_has_ready_weapon,
1222 /* 90 */
1223 KW_no_skill_ident, 1245 KW_no_skill_ident,
1224 KW_is_blind, 1246 KW_is_blind,
1225 KW_can_see_in_dark, 1247 KW_can_see_in_dark,
1226 KW_is_cauldron, 1248 KW_is_cauldron,
1227 KW_NULL, 1249 KW_NULL,
1228 KW_no_steal, 1250 KW_no_steal,
1229 KW_one_hit, 1251 KW_one_hit,
1230 KW_NULL, 1252 KW_NULL,
1231 KW_berserk, 1253 KW_berserk,
1254 /* 100 */
1232 KW_neutral, 1255 KW_neutral,
1233 /* 100 */
1234 KW_no_attack, 1256 KW_no_attack,
1235 KW_no_damage, 1257 KW_no_damage,
1236 KW_obj_original, 1258 KW_obj_original,
1237 KW_NULL, 1259 KW_random_speed,
1238 KW_activate_on_push, 1260 KW_activate_on_push,
1239 KW_activate_on_release, 1261 KW_activate_on_release,
1240 KW_is_water, 1262 KW_is_water,
1241 KW_use_content_on_gen, 1263 KW_use_content_on_gen,
1242 KW_NULL, 1264 KW_NULL,
1265 /* 110 */
1243 KW_is_buildable, 1266 KW_is_buildable,
1244 /* 110 */
1245 KW_destroy_on_death, 1267 KW_destroy_on_death,
1246 KW_NULL, 1268 KW_NULL,
1247 }; 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;
1248 1282
1249 /* 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
1250 * keys that match field names will be overwritten by the loader. 1284 * keys that match field names will be overwritten by the loader.
1251 */ 1285 */
1252 for (key_value *kv = op->key_values; kv; kv = kv->next) 1286 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1287 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1254 f.put (kv->key, kv->value); 1288 f.put (kv->key, kv->value);
1255 1289
1256 /* We don't need to worry about the arch's extra fields - they
1257 * will get taken care of the copy_to method.
1258 */
1259
1260 if (op->uuid) 1290 if (op->uuid)
1261 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;
1262 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
1263#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)
1264#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)
1265 1306
1266 if (object *owner = op->owner) 1307 CMP_OUT (x);
1267 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);
1268 1313
1269 CMP_OUT (name); 1314 CMP_OUT (name);
1270 CMP_OUT (name_pl); 1315 CMP_OUT (name_pl);
1271 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
1272 CMP_OUT (title); 1336 CMP_OUT (title);
1273 CMP_OUT (race); 1337 CMP_OUT (race);
1338 CMP_OUT (slaying);
1274 CMP_OUT (skill); 1339 CMP_OUT (skill);
1275 CMP_OUT (slaying); 1340
1276 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
1277 CMP_OUT (other_arch); 1349 CMP_OUT (other_arch);
1278 1350
1279 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 );
1280 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);
1281 1353
1282 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);
1283 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);
1284 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);
1285 1357
1286 if (op->animation_id != tmp->animation_id) 1358 if (op->animation_id != arch->animation_id)
1287 if (op->has_anim ()) 1359 if (op->has_anim ())
1288 f.put (KW_animation, op->anim ().name); 1360 f.put (KW(animation), op->anim ().name);
1289 else 1361 else
1290 { 1362 {
1291 f.put (KW_animation, (const char *)0); 1363 f.put (KW(animation));
1292 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1364 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1293 } 1365 }
1294 1366
1295 CMP_OUT2 (str, stats.Str); 1367 CMP_OUT2 (str, stats.Str);
1296 CMP_OUT2 (dex, stats.Dex); 1368 CMP_OUT2 (dex, stats.Dex);
… …
1307 CMP_OUT2 (grace, stats.grace); 1379 CMP_OUT2 (grace, stats.grace);
1308 CMP_OUT2 (maxgrace, stats.maxgrace); 1380 CMP_OUT2 (maxgrace, stats.maxgrace);
1309 CMP_OUT2 (exp, stats.exp); 1381 CMP_OUT2 (exp, stats.exp);
1310 1382
1311 CMP_OUT (perm_exp); 1383 CMP_OUT (perm_exp);
1312 CMP_OUT (expmul); 1384 //CMP_OUT (expmul);
1313 1385
1314 CMP_OUT2 (food, stats.food); 1386 CMP_OUT2 (food, stats.food);
1315 CMP_OUT2 (dam, stats.dam); 1387 CMP_OUT2 (dam, stats.dam);
1316 CMP_OUT2 (luck, stats.luck); 1388 CMP_OUT2 (luck, stats.luck);
1317 CMP_OUT2 (wc, stats.wc); 1389 CMP_OUT2 (wc, stats.wc);
1318 CMP_OUT2 (ac, stats.ac); 1390 CMP_OUT2 (ac, stats.ac);
1319 1391
1320 CMP_OUT (x);
1321 CMP_OUT (y);
1322 CMP_OUT (speed);
1323 CMP_OUT (speed_left);
1324 CMP_OUT2 (move_state, move_status); 1392 CMP_OUT2 (move_state, move_status);
1325 CMP_OUT (attack_movement); 1393 CMP_OUT (attack_movement);
1326 CMP_OUT (nrof); 1394 CMP_OUT (nrof);
1327 CMP_OUT (level); 1395 CMP_OUT (level);
1328 CMP_OUT (direction);
1329 CMP_OUT (type);
1330 CMP_OUT (subtype);
1331 CMP_OUT (attacktype); 1396 CMP_OUT (attacktype);
1332 1397
1398 // using memcmp here seems to be a loss - is gcc vectorising?
1333 for (int i = 0; i < NROFATTACKS; i++) 1399 for (int i = 0; i < NROFATTACKS; i++)
1334 if (expect_false (op->resist[i] != tmp->resist[i])) 1400 if (expect_false (op->resist[i] != arch->resist[i]))
1335 f.put (resist_save[i], op->resist[i]); 1401 f.put (resist_save[i], op->resist[i]);
1336 1402
1337 CMP_OUT (path_attuned); 1403 CMP_OUT (path_attuned);
1338 CMP_OUT (path_repelled); 1404 CMP_OUT (path_repelled);
1339 CMP_OUT (path_denied); 1405 CMP_OUT (path_denied);
1406
1340 CMP_OUT2 (material, materials);//TODO: nuke 1407 CMP_OUT2 (material, materials);//TODO: nuke
1341 CMP_OUT (materialname); 1408 if (op->material != arch->material)
1409 f.put (KW(materialname), op->material->name);
1410
1342 CMP_OUT (value); 1411 CMP_OUT (value);
1343 CMP_OUT (carrying); 1412 CMP_OUT (carrying);
1344 CMP_OUT (weight); 1413 CMP_OUT (weight);
1345 CMP_OUT (invisible); 1414 CMP_OUT (invisible);
1346 CMP_OUT (state); 1415 CMP_OUT (state);
… …
1351 CMP_OUT (last_eat); 1420 CMP_OUT (last_eat);
1352 CMP_OUT (glow_radius); 1421 CMP_OUT (glow_radius);
1353 1422
1354 if (op->flag [FLAG_IS_LINKED]) 1423 if (op->flag [FLAG_IS_LINKED])
1355 if (auto (ol, op->find_link ())) 1424 if (auto (ol, op->find_link ()))
1356 f.put (KW_connected, ol->id); 1425 f.put (KW(connected), ol->id);
1357 1426
1358 CMP_OUT (randomitems); 1427 CMP_OUT (randomitems);
1428
1359 CMP_OUT2 (container, weight_limit); 1429 CMP_OUT2 (container, weight_limit);
1360 1430
1361 CMP_OUT (run_away); 1431 CMP_OUT (run_away);
1362 CMP_OUT (pick_up); 1432 CMP_OUT (pick_up);
1363 CMP_OUT (will_apply); 1433 CMP_OUT (will_apply);
… …
1378 CMP_OUT (move_on); 1448 CMP_OUT (move_on);
1379 CMP_OUT (move_off); 1449 CMP_OUT (move_off);
1380 CMP_OUT (move_slow); 1450 CMP_OUT (move_slow);
1381 CMP_OUT (move_slow_penalty); 1451 CMP_OUT (move_slow_penalty);
1382 1452
1383 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 ()))
1384 for (int i = 0; i <= NUM_FLAGS; i++) 1462 for (int i = 0; i < NUM_FLAGS; i++)
1385 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1463 if (expect_false (diff [i]))
1386 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1464 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1387 1465
1388 // save body locations 1466 // save body locations. gcc's memcmp does an abysmal job when used
1389 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1467 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1390 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1468 if (expect_false (op->slot[i].info != arch->slot[i].info))
1391 f.put (body_locations[i].save_name, op->slot[i].info); 1469 f.put (body_locations[i].save_name, op->slot[i].info);
1392} 1470}
1393 1471
1394/* 1472/*
1395 * Dumps all variables in an object to a file. 1473 * Dumps all variables in an object to a file.
… …
1397 * 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.
1398 */ 1476 */
1399bool 1477bool
1400object::write (object_freezer &f) 1478object::write (object_freezer &f)
1401{ 1479{
1402 if (is_arch ()) 1480 if (expect_false (is_arch ()))
1403 { 1481 {
1404 f.put (KW_object, arch->archname); 1482 f.put (KW(object), arch->archname);
1405 write_diff (f, this, archetype::empty); 1483 write_diff (f, this, archetype::empty);
1406 } 1484 }
1407 else 1485 else
1408 { 1486 {
1409 f.put (KW_arch, arch->archname); 1487 f.put (KW(arch), arch->archname);
1410 write_diff (f, this, arch); 1488 write_diff (f, this, arch);
1411 } 1489 }
1412 1490
1413 for (object *tmp = inv; tmp; tmp = tmp->below) 1491 for (object *tmp = inv; tmp; tmp = tmp->below)
1414 tmp->write (f); 1492 tmp->write (f);
1415 1493
1416 f.put (this); 1494 f.put (this);
1417 f.put (KW_end); 1495 f.put (KW(end));
1418 1496
1419 return true; 1497 return true;
1420} 1498}
1421 1499
1422///////////////////////////////////////////////////////////////////////////// 1500/////////////////////////////////////////////////////////////////////////////

Diff Legend

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