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.149 by root, Mon Nov 16 22:31:13 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);
335 337
336 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
337 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
338 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
339 * not in the ideal fashion. 341 * not in the ideal fashion.
… …
478 animate_object (this, direction); 480 animate_object (this, direction);
479 } 481 }
480} 482}
481 483
482static void 484static void
483set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, object_thawer &f)
484{ 486{
485 static const struct flagstr { 487 static const struct flagstr {
486 const char *name; 488 const char *name;
487 MoveType flags; 489 MoveType flags;
488 } move_flags[] = { 490 } move_flags[] = {
… …
494 { "boat" , MOVE_BOAT }, 496 { "boat" , MOVE_BOAT },
495 { "ship" , MOVE_SHIP }, 497 { "ship" , MOVE_SHIP },
496 { "all" , MOVE_ALL }, 498 { "all" , MOVE_ALL },
497 }; 499 };
498 500
499 if (!str) 501 const char *str = f.get_str ();
500 {
501 mt = 0;
502 return;
503 }
504 502
505 if (isdigit (*str)) 503 if (!*str || isdigit (*str))
506 { 504 {
507 mt = atoi (str); 505 mt = atoi (str);
508 return; 506 return;
509 } 507 }
510 508
511 mt = 0; 509 mt = 0;
512 510
513 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
514 { 512 {
515 bool negate = 0; 513 bool negate = 0;
516 514
517 if (*str == '-') 515 if (*str == '-')
518 { 516 {
… …
537 535
538next: ; 536next: ;
539 } 537 }
540} 538}
541 539
540//-GPL
541
542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool () 542#define GET_FLAG(op,flg) op->flag [flg] = f.get_bool ()
543 543
544bool 544bool
545object::parse_kv (object_thawer &f) 545object::parse_kv (object_thawer &f)
546{ 546{
… …
550 for (;;) 550 for (;;)
551 { 551 {
552 switch (f.kw) 552 switch (f.kw)
553 { 553 {
554 case KW_uuid: 554 case KW_uuid:
555 if (const char *s = f.get_str ())
556 if (!uuid.parse (s)) 555 if (!uuid.parse (f.get_str ()))
557 { 556 {
558 f.parse_warn ("unparseable uuid"); 557 f.parse_warn ("unparseable uuid");
559 uuid = UUID::gen (); 558 uuid = UUID::gen ();
560 } 559 }
561 break; 560 break;
562 561
563 case KW_oid: 562 case KW_oid:
564 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
565 break; 564 break;
… …
630 case KW_animation: 629 case KW_animation:
631 { 630 {
632 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
633 animation_id = 0; 632 animation_id = 0;
634 633
635 const char *str = f.get_str ();
636 if (str && (animation_id = find_animation (str))) 634 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 635 SET_FLAG (this, FLAG_ANIMATE); //TODO: should not be forced to true here
638 } 636 }
639 break; 637 break;
640 638
641 case KW_last_heal: f.get (last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
… …
658 move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
659 f.get (move_slow_penalty); 657 f.get (move_slow_penalty);
660 break; 658 break;
661 659
662 case KW_face: 660 case KW_face:
663 face = face_find (f.get_str ()); 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
664 break; 662 break;
665 663
666 case KW_sound: 664 case KW_sound:
665 if (f.has_value ())
666 {
667 sound = sound_find (f.get_str ()); 667 sound = sound_find (f.get_str ());
668 if (!sound) 668 if (!sound)
669 f.parse_warn ("sound not found"); 669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
671 else
672 sound = 0;
670 break; 673 break;
671 674
672 case KW_sound_destroy: 675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
673 sound_destroy = sound_find (f.get_str ()); 678 sound_destroy = sound_find (f.get_str ());
674 if (!sound_destroy) 679 if (!sound_destroy)
675 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;
676 break; 684 break;
677 685
678 case KW_x: f.get (x); break; 686 case KW_x: f.get (x); break;
679 case KW_y: f.get (y); break; 687 case KW_y: f.get (y); break;
680 688
… …
721 case KW_invisible: f.get (invisible); break; 729 case KW_invisible: f.get (invisible); break;
722 case KW_magic: f.get (magic); break; 730 case KW_magic: f.get (magic); break;
723 case KW_state: f.get (state); break; 731 case KW_state: f.get (state); break;
724 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 732 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
725 case KW_material: f.get (materials); break; //TODO: nuke 733 case KW_material: f.get (materials); break; //TODO: nuke
726 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;
727 742
728 /* These are the new values */ 743 /* These are the new values */
729 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
730 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
731 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
732 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
733 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
734 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
735 750
736 /* 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 */
737 case KW_no_pass: 752 case KW_no_pass:
738 { 753 {
739 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
848 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
849 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
850 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
851 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
852 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 867 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; 868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
855 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
856 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;
857 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;
858 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;
… …
986 add_link (map, connected); 1000 add_link (map, connected);
987 } 1001 }
988 break; 1002 break;
989 1003
990 case KW_randomitems: 1004 case KW_randomitems:
991 if (f.get_str ()) 1005 if (f.has_value ())
992 { 1006 {
993 randomitems = 1007 randomitems =
994 loading_arch 1008 loading_arch
995 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
996 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());
… …
1066 archetype *arch = archetype::find (f.get_str ()); 1080 archetype *arch = archetype::find (f.get_str ());
1067 1081
1068 if (!arch) 1082 if (!arch)
1069 { 1083 {
1070 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 ());
1071 arch = archetype::find ("earthwall"); 1085 arch = archetype::find (shstr_earthwall);
1072 } 1086 }
1073 1087
1074 assert (arch); //D maybe use exception handling of sorts? 1088 assert (arch); //D maybe use exception handling of sorts?
1075 1089
1076 f.next (); 1090 f.next ();
… …
1102 object_thawer f (buf, (AV *)0); 1116 object_thawer f (buf, (AV *)0);
1103 1117
1104 return op->parse_kv (f); 1118 return op->parse_kv (f);
1105} 1119}
1106 1120
1107// compare *op against *tmp and output differences 1121// compare *op against *arch and output differences
1108static void 1122static void
1109write_diff (object_freezer &f, object *op, object *tmp) 1123write_diff (object_freezer &f, object *op, object *arch)
1110{ 1124{
1111 static const keyword resist_save[NROFATTACKS] = { 1125 static const keyword resist_save[NROFATTACKS] = {
1112# define def(uc, lc, name, plus, change) KW_resist_ ## lc, 1126# define def(uc, lc, name, plus, change) KW_resist_ ## lc,
1113# include "attackinc.h" 1127# include "attackinc.h"
1114# undef def 1128# undef def
… …
1128 KW_applied, 1142 KW_applied,
1129 KW_unpaid, 1143 KW_unpaid,
1130 KW_can_use_shield, 1144 KW_can_use_shield,
1131 KW_no_pick, 1145 KW_no_pick,
1132 KW_NULL, // walk_on 1146 KW_NULL, // walk_on
1147 /* 10 */
1133 KW_NULL, // no_pass 1148 KW_NULL, // no_pass
1134 /* 10 */
1135 KW_is_animated, 1149 KW_is_animated,
1136 KW_NULL, // slow_move 1150 KW_NULL, // slow_move
1137 KW_NULL, // flying 1151 KW_NULL, // flying
1138 KW_monster, 1152 KW_monster,
1139 KW_friendly, 1153 KW_friendly,
1140 KW_generator, 1154 KW_generator,
1141 KW_is_thrown, 1155 KW_is_thrown,
1142 KW_auto_apply, 1156 KW_auto_apply,
1143 KW_treasure_env, 1157 KW_treasure_env,
1158 /* 20 */
1144 KW_player_sold, 1159 KW_player_sold,
1145 /* 20 */
1146 KW_see_invisible, 1160 KW_see_invisible,
1147 KW_can_roll, 1161 KW_can_roll,
1148 KW_overlay_floor, 1162 KW_overlay_floor,
1149 KW_is_turnable, 1163 KW_is_turnable,
1150 KW_NULL, // walk_off 1164 KW_NULL, // walk_off
1151 KW_NULL, // fly_on 1165 KW_NULL, // fly_on
1152 KW_NULL, // fly_off 1166 KW_NULL, // fly_off
1153 KW_is_used_up, 1167 KW_is_used_up,
1154 KW_identified, 1168 KW_identified,
1169 /* 30 */
1155 KW_reflecting, 1170 KW_reflecting,
1156 /* 30 */
1157 KW_changing, 1171 KW_changing,
1158 KW_splitting, 1172 KW_splitting,
1159 KW_hitback, 1173 KW_hitback,
1160 KW_startequip, 1174 KW_startequip,
1161 KW_blocksview, 1175 KW_blocksview,
1162 KW_undead, 1176 KW_undead,
1163 KW_scared, 1177 KW_scared,
1164 KW_unaggressive, 1178 KW_unaggressive,
1165 KW_reflect_missile, 1179 KW_reflect_missile,
1180 /* 40 */
1166 KW_reflect_spell, 1181 KW_reflect_spell,
1167 /* 40 */
1168 KW_no_magic, 1182 KW_no_magic,
1169 KW_no_fix_player, 1183 KW_NULL,
1170 KW_is_lightable, 1184 KW_is_lightable,
1171 KW_tear_down, 1185 KW_tear_down,
1172 KW_run_away, 1186 KW_run_away,
1173 KW_NULL, // pass_thru 1187 KW_NULL, // pass_thru
1174 KW_NULL, // an_pass_thru 1188 KW_NULL, // an_pass_thru
1175 KW_pick_up, 1189 KW_pick_up,
1176 KW_unique, 1190 KW_unique,
1191 /* 50 */
1177 KW_no_drop, 1192 KW_no_drop,
1178 /* 50 */
1179 KW_NULL, // wizcast 1193 KW_NULL, // wizcast
1180 KW_can_cast_spell, 1194 KW_can_cast_spell,
1181 KW_can_use_scroll, 1195 KW_can_use_scroll,
1182 KW_can_use_range, 1196 KW_can_use_range,
1183 KW_can_use_bow, 1197 KW_can_use_bow,
1184 KW_can_use_armour, 1198 KW_can_use_armour,
1185 KW_can_use_weapon, 1199 KW_can_use_weapon,
1186 KW_can_use_ring, 1200 KW_can_use_ring,
1187 KW_has_ready_range, 1201 KW_has_ready_range,
1202 /* 60 */
1188 KW_has_ready_bow, 1203 KW_has_ready_bow,
1189 /* 60 */
1190 KW_xrays, 1204 KW_xrays,
1191 KW_NULL, 1205 KW_NULL,
1192 KW_is_floor, 1206 KW_is_floor,
1193 KW_lifesave, 1207 KW_lifesave,
1194 KW_no_strength, 1208 KW_no_strength,
1195 KW_sleep, 1209 KW_sleep,
1196 KW_stand_still, 1210 KW_stand_still,
1197 KW_random_move, 1211 KW_random_move,
1198 KW_only_attack, 1212 KW_only_attack,
1213 /* 70 */
1199 KW_confused, 1214 KW_confused,
1200 /* 70 */
1201 KW_stealth, 1215 KW_stealth,
1202 KW_NULL, 1216 KW_NULL,
1203 KW_NULL, 1217 KW_NULL,
1204 KW_cursed, 1218 KW_cursed,
1205 KW_damned, 1219 KW_damned,
1206 KW_see_anywhere, 1220 KW_see_anywhere,
1207 KW_known_magical, 1221 KW_known_magical,
1208 KW_known_cursed, 1222 KW_known_cursed,
1209 KW_can_use_skill, 1223 KW_can_use_skill,
1224 /* 80 */
1210 KW_been_applied, 1225 KW_been_applied,
1211 /* 80 */
1212 KW_has_ready_scroll, 1226 KW_has_ready_scroll,
1213 KW_can_use_rod, 1227 KW_can_use_rod,
1214 KW_precious, 1228 KW_precious,
1215 KW_can_use_horn, 1229 KW_can_use_horn,
1216 KW_make_invisible, 1230 KW_make_invisible,
1217 KW_inv_locked, 1231 KW_inv_locked,
1218 KW_is_wooded, 1232 KW_is_wooded,
1219 KW_is_hilly, 1233 KW_is_hilly,
1220 KW_has_ready_skill, 1234 KW_has_ready_skill,
1235 /* 90 */
1221 KW_has_ready_weapon, 1236 KW_has_ready_weapon,
1222 /* 90 */
1223 KW_no_skill_ident, 1237 KW_no_skill_ident,
1224 KW_is_blind, 1238 KW_is_blind,
1225 KW_can_see_in_dark, 1239 KW_can_see_in_dark,
1226 KW_is_cauldron, 1240 KW_is_cauldron,
1227 KW_NULL, 1241 KW_NULL,
1228 KW_no_steal, 1242 KW_no_steal,
1229 KW_one_hit, 1243 KW_one_hit,
1230 KW_NULL, 1244 KW_NULL,
1231 KW_berserk, 1245 KW_berserk,
1246 /* 100 */
1232 KW_neutral, 1247 KW_neutral,
1233 /* 100 */
1234 KW_no_attack, 1248 KW_no_attack,
1235 KW_no_damage, 1249 KW_no_damage,
1236 KW_obj_original, 1250 KW_obj_original,
1237 KW_NULL, 1251 KW_NULL,
1238 KW_activate_on_push, 1252 KW_activate_on_push,
1239 KW_activate_on_release, 1253 KW_activate_on_release,
1240 KW_is_water, 1254 KW_is_water,
1241 KW_use_content_on_gen, 1255 KW_use_content_on_gen,
1242 KW_NULL, 1256 KW_NULL,
1257 /* 110 */
1243 KW_is_buildable, 1258 KW_is_buildable,
1244 /* 110 */
1245 KW_destroy_on_death, 1259 KW_destroy_on_death,
1246 KW_NULL, 1260 KW_NULL,
1247 }; 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;
1248 1274
1249 /* 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
1250 * keys that match field names will be overwritten by the loader. 1276 * keys that match field names will be overwritten by the loader.
1251 */ 1277 */
1252 for (key_value *kv = op->key_values; kv; kv = kv->next) 1278 for (key_value *kv = op->key_values; kv; kv = kv->next)
1253 if (!tmp->key_values || tmp->kv (kv->key) != kv->value) 1279 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1254 f.put (kv->key, kv->value); 1280 f.put (kv->key, kv->value);
1255 1281
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) 1282 if (op->uuid)
1261 f.put (KW_uuid, op->uuid.c_str ()); 1283 {
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;
1262 1287
1288 memcpy (ptr, "uuid ", sizeof ("uuid ") - 1);
1289 ptr += sizeof ("uuid ") - 1;
1290 ptr = op->uuid.append (ptr);
1291 *ptr++ = '\n';
1292
1293 f.alloc (ptr - cur);
1294 }
1295
1263#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)
1264#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)
1265 1298
1266 if (object *owner = op->owner) 1299 CMP_OUT (x);
1267 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);
1268 1305
1269 CMP_OUT (name); 1306 CMP_OUT (name);
1270 CMP_OUT (name_pl); 1307 CMP_OUT (name_pl);
1271 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
1272 CMP_OUT (title); 1329 CMP_OUT (title);
1273 CMP_OUT (race); 1330 CMP_OUT (race);
1331 CMP_OUT (slaying);
1274 CMP_OUT (skill); 1332 CMP_OUT (skill);
1275 CMP_OUT (slaying); 1333
1276 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
1277 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1278 1343
1279 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 );
1280 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);
1281 1346
1282 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);
1283 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);
1284 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);
1285 1350
1286 if (op->animation_id != tmp->animation_id) 1351 if (op->animation_id != arch->animation_id)
1287 if (op->has_anim ()) 1352 if (op->has_anim ())
1288 f.put (KW_animation, op->anim ().name); 1353 f.put (KW(animation), op->anim ().name);
1289 else 1354 else
1290 { 1355 {
1291 f.put (KW_animation, (const char *)0); 1356 f.put (KW(animation));
1292 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1293 } 1358 }
1294 1359
1295 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1296 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
… …
1307 CMP_OUT2 (grace, stats.grace); 1372 CMP_OUT2 (grace, stats.grace);
1308 CMP_OUT2 (maxgrace, stats.maxgrace); 1373 CMP_OUT2 (maxgrace, stats.maxgrace);
1309 CMP_OUT2 (exp, stats.exp); 1374 CMP_OUT2 (exp, stats.exp);
1310 1375
1311 CMP_OUT (perm_exp); 1376 CMP_OUT (perm_exp);
1312 CMP_OUT (expmul); 1377 //CMP_OUT (expmul);
1313 1378
1314 CMP_OUT2 (food, stats.food); 1379 CMP_OUT2 (food, stats.food);
1315 CMP_OUT2 (dam, stats.dam); 1380 CMP_OUT2 (dam, stats.dam);
1316 CMP_OUT2 (luck, stats.luck); 1381 CMP_OUT2 (luck, stats.luck);
1317 CMP_OUT2 (wc, stats.wc); 1382 CMP_OUT2 (wc, stats.wc);
1318 CMP_OUT2 (ac, stats.ac); 1383 CMP_OUT2 (ac, stats.ac);
1319 1384
1320 CMP_OUT (x);
1321 CMP_OUT (y);
1322 CMP_OUT (speed);
1323 CMP_OUT (speed_left);
1324 CMP_OUT2 (move_state, move_status); 1385 CMP_OUT2 (move_state, move_status);
1325 CMP_OUT (attack_movement); 1386 CMP_OUT (attack_movement);
1326 CMP_OUT (nrof); 1387 CMP_OUT (nrof);
1327 CMP_OUT (level); 1388 CMP_OUT (level);
1328 CMP_OUT (direction);
1329 CMP_OUT (type);
1330 CMP_OUT (subtype);
1331 CMP_OUT (attacktype); 1389 CMP_OUT (attacktype);
1332 1390
1391 // using memcmp here seems to be a loss - is gcc vectorising?
1333 for (int i = 0; i < NROFATTACKS; i++) 1392 for (int i = 0; i < NROFATTACKS; i++)
1334 if (expect_false (op->resist[i] != tmp->resist[i])) 1393 if (expect_false (op->resist[i] != arch->resist[i]))
1335 f.put (resist_save[i], op->resist[i]); 1394 f.put (resist_save[i], op->resist[i]);
1336 1395
1337 CMP_OUT (path_attuned); 1396 CMP_OUT (path_attuned);
1338 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1339 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1399
1340 CMP_OUT2 (material, materials);//TODO: nuke 1400 CMP_OUT2 (material, materials);//TODO: nuke
1341 CMP_OUT (materialname); 1401 if (op->material != arch->material)
1402 f.put (KW(materialname), op->material->name);
1403
1342 CMP_OUT (value); 1404 CMP_OUT (value);
1343 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1344 CMP_OUT (weight); 1406 CMP_OUT (weight);
1345 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
1346 CMP_OUT (state); 1408 CMP_OUT (state);
… …
1351 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1352 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1353 1415
1354 if (op->flag [FLAG_IS_LINKED]) 1416 if (op->flag [FLAG_IS_LINKED])
1355 if (auto (ol, op->find_link ())) 1417 if (auto (ol, op->find_link ()))
1356 f.put (KW_connected, ol->id); 1418 f.put (KW(connected), ol->id);
1357 1419
1358 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1359 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1360 1422
1361 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
… …
1378 CMP_OUT (move_on); 1440 CMP_OUT (move_on);
1379 CMP_OUT (move_off); 1441 CMP_OUT (move_off);
1380 CMP_OUT (move_slow); 1442 CMP_OUT (move_slow);
1381 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1382 1444
1383 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 ()))
1384 for (int i = 0; i <= NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1385 if (expect_false (flag_names [i] && op->flag [i] != tmp->flag [i])) 1455 if (expect_false (diff [i]))
1386 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1387 1457
1388 // save body locations 1458 // save body locations. gcc's memcmp does an abysmal job when used
1389 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1390 if (expect_false (op->slot[i].info != tmp->slot[i].info)) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1391 f.put (body_locations[i].save_name, op->slot[i].info); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
1392} 1462}
1393 1463
1394/* 1464/*
1395 * Dumps all variables in an object to a file. 1465 * Dumps all variables in an object to a file.
… …
1397 * 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.
1398 */ 1468 */
1399bool 1469bool
1400object::write (object_freezer &f) 1470object::write (object_freezer &f)
1401{ 1471{
1402 if (is_arch ()) 1472 if (expect_false (is_arch ()))
1403 { 1473 {
1404 f.put (KW_object, arch->archname); 1474 f.put (KW(object), arch->archname);
1405 write_diff (f, this, archetype::empty); 1475 write_diff (f, this, archetype::empty);
1406 } 1476 }
1407 else 1477 else
1408 { 1478 {
1409 f.put (KW_arch, arch->archname); 1479 f.put (KW(arch), arch->archname);
1410 write_diff (f, this, arch); 1480 write_diff (f, this, arch);
1411 } 1481 }
1412 1482
1413 for (object *tmp = inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1414 tmp->write (f); 1484 tmp->write (f);
1415 1485
1416 f.put (this); 1486 f.put (this);
1417 f.put (KW_end); 1487 f.put (KW(end));
1418 1488
1419 return true; 1489 return true;
1420} 1490}
1421 1491
1422///////////////////////////////////////////////////////////////////////////// 1492/////////////////////////////////////////////////////////////////////////////

Diff Legend

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