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.140 by root, Sun Nov 8 22:30:48 2009 UTC vs.
Revision 1.149 by root, Mon Nov 16 22:31:13 2009 UTC

… …
330 330
331 if (!name_pl) 331 if (!name_pl)
332 name_pl = name; 332 name_pl = name;
333 333
334 /* objects now have a materialname. try to patch it in */ 334 /* objects now have a materialname. try to patch it in */
335 if (!(is_weapon () && level > 0)) 335 if (material == MATERIAL_NULL && !(is_weapon () && level > 0))
336 set_materialname (this, map ? map->difficulty : 5, 0); 336 select_material (this, map ? map->difficulty : 5);
337 337
338 /* only do these when program is first run - a bit 338 /* only do these when program is first run - a bit
339 * excessive to do this at every run - most of this is 339 * excessive to do this at every run - most of this is
340 * really just to catch any errors - program will still run, but 340 * really just to catch any errors - program will still run, but
341 * not in the ideal fashion. 341 * not in the ideal fashion.
… …
480 animate_object (this, direction); 480 animate_object (this, direction);
481 } 481 }
482} 482}
483 483
484static void 484static void
485set_move (MoveType &mt, const char *str) 485set_move (MoveType &mt, object_thawer &f)
486{ 486{
487 static const struct flagstr { 487 static const struct flagstr {
488 const char *name; 488 const char *name;
489 MoveType flags; 489 MoveType flags;
490 } move_flags[] = { 490 } move_flags[] = {
… …
496 { "boat" , MOVE_BOAT }, 496 { "boat" , MOVE_BOAT },
497 { "ship" , MOVE_SHIP }, 497 { "ship" , MOVE_SHIP },
498 { "all" , MOVE_ALL }, 498 { "all" , MOVE_ALL },
499 }; 499 };
500 500
501 if (!str) 501 const char *str = f.get_str ();
502 {
503 mt = 0;
504 return;
505 }
506 502
507 if (isdigit (*str)) 503 if (!*str || isdigit (*str))
508 { 504 {
509 mt = atoi (str); 505 mt = atoi (str);
510 return; 506 return;
511 } 507 }
512 508
513 mt = 0; 509 mt = 0;
514 510
515 for (str = strtok ((char *) str, " "); str; str = strtok (0, " ")) 511 for (str = strtok ((char *)str, " "); str; str = strtok (0, " "))
516 { 512 {
517 bool negate = 0; 513 bool negate = 0;
518 514
519 if (*str == '-') 515 if (*str == '-')
520 { 516 {
… …
554 for (;;) 550 for (;;)
555 { 551 {
556 switch (f.kw) 552 switch (f.kw)
557 { 553 {
558 case KW_uuid: 554 case KW_uuid:
559 if (const char *s = f.get_str ())
560 if (!uuid.parse (s)) 555 if (!uuid.parse (f.get_str ()))
561 { 556 {
562 f.parse_warn ("unparseable uuid"); 557 f.parse_warn ("unparseable uuid");
563 uuid = UUID::gen (); 558 uuid = UUID::gen ();
564 } 559 }
565 break; 560 break;
566 561
567 case KW_oid: 562 case KW_oid:
568 f.get (this, f.get_sint32 ()); 563 f.get (this, f.get_sint32 ());
569 break; 564 break;
… …
634 case KW_animation: 629 case KW_animation:
635 { 630 {
636 CLEAR_FLAG (this, FLAG_ANIMATE); 631 CLEAR_FLAG (this, FLAG_ANIMATE);
637 animation_id = 0; 632 animation_id = 0;
638 633
639 const char *str = f.get_str ();
640 if (str && (animation_id = find_animation (str))) 634 if (f.has_value () && (animation_id = find_animation (f.get_str ())))
641 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
642 } 636 }
643 break; 637 break;
644 638
645 case KW_last_heal: f.get (last_heal); break; 639 case KW_last_heal: f.get (last_heal); break;
… …
662 move_slow |= MOVE_WALK; 656 move_slow |= MOVE_WALK;
663 f.get (move_slow_penalty); 657 f.get (move_slow_penalty);
664 break; 658 break;
665 659
666 case KW_face: 660 case KW_face:
667 face = face_find (f.get_str ()); 661 face = f.has_value () ? face_find (f.get_str ()) : blank_face;
668 break; 662 break;
669 663
670 case KW_sound: 664 case KW_sound:
665 if (f.has_value ())
666 {
671 sound = sound_find (f.get_str ()); 667 sound = sound_find (f.get_str ());
672 if (!sound) 668 if (!sound)
673 f.parse_warn ("sound not found"); 669 f.parse_warn (format ("sound '%s' not found", f.get_str ()));
670 }
671 else
672 sound = 0;
674 break; 673 break;
675 674
676 case KW_sound_destroy: 675 case KW_sound_destroy:
676 if (f.has_value ())
677 {
677 sound_destroy = sound_find (f.get_str ()); 678 sound_destroy = sound_find (f.get_str ());
678 if (!sound_destroy) 679 if (!sound_destroy)
679 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;
680 break; 684 break;
681 685
682 case KW_x: f.get (x); break; 686 case KW_x: f.get (x); break;
683 case KW_y: f.get (y); break; 687 case KW_y: f.get (y); break;
684 688
… …
725 case KW_invisible: f.get (invisible); break; 729 case KW_invisible: f.get (invisible); break;
726 case KW_magic: f.get (magic); break; 730 case KW_magic: f.get (magic); break;
727 case KW_state: f.get (state); break; 731 case KW_state: f.get (state); break;
728 case KW_move_slow_penalty: f.get (move_slow_penalty); break; 732 case KW_move_slow_penalty: f.get (move_slow_penalty); break;
729 case KW_material: f.get (materials); break; //TODO: nuke 733 case KW_material: f.get (materials); break; //TODO: nuke
730 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;
731 742
732 /* These are the new values */ 743 /* These are the new values */
733 case KW_move_block: set_move (move_block, f.get_str ()); break; 744 case KW_move_block: set_move (move_block, f); break;
734 case KW_move_allow: set_move (move_allow, f.get_str ()); break; 745 case KW_move_allow: set_move (move_allow, f); break;
735 case KW_move_type: set_move (move_type, f.get_str ()); break; 746 case KW_move_type: set_move (move_type , f); break;
736 case KW_move_on: set_move (move_on, f.get_str ()); break; 747 case KW_move_on: set_move (move_on , f); break;
737 case KW_move_off: set_move (move_off, f.get_str ()); break; 748 case KW_move_off: set_move (move_off , f); break;
738 case KW_move_slow: set_move (move_slow, f.get_str ()); break; 749 case KW_move_slow: set_move (move_slow , f); break;
739 750
740 /* 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 */
741 case KW_no_pass: 752 case KW_no_pass:
742 { 753 {
743 if (f.get_sint32 ()) 754 if (f.get_sint32 ())
… …
852 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break; 863 case KW_reflect_missile: GET_FLAG (this, FLAG_REFL_MISSILE); break;
853 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break; 864 case KW_reflect_spell: GET_FLAG (this, FLAG_REFL_SPELL); break;
854 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break; 865 case KW_no_magic: GET_FLAG (this, FLAG_NO_MAGIC); break;
855 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break; 866 case KW_no_drop: GET_FLAG (this, FLAG_NO_DROP); break;
856 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break; 867 case KW_random_movement: GET_FLAG (this, FLAG_RANDOM_MOVE); break;
857 case KW_no_fix_player: GET_FLAG (this, FLAG_NO_FIX_PLAYER); break;
858 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break; 868 case KW_is_lightable: GET_FLAG (this, FLAG_IS_LIGHTABLE); break;
859 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break; 869 case KW_tear_down: GET_FLAG (this, FLAG_TEAR_DOWN); break;
860 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;
861 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;
862 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;
… …
990 add_link (map, connected); 1000 add_link (map, connected);
991 } 1001 }
992 break; 1002 break;
993 1003
994 case KW_randomitems: 1004 case KW_randomitems:
995 if (f.get_str ()) 1005 if (f.has_value ())
996 { 1006 {
997 randomitems = 1007 randomitems =
998 loading_arch 1008 loading_arch
999 ? treasurelist::get (f.get_str ()) 1009 ? treasurelist::get (f.get_str ())
1000 : treasurelist::find (f.get_str ()); 1010 : treasurelist::find (f.get_str ());
… …
1132 KW_applied, 1142 KW_applied,
1133 KW_unpaid, 1143 KW_unpaid,
1134 KW_can_use_shield, 1144 KW_can_use_shield,
1135 KW_no_pick, 1145 KW_no_pick,
1136 KW_NULL, // walk_on 1146 KW_NULL, // walk_on
1147 /* 10 */
1137 KW_NULL, // no_pass 1148 KW_NULL, // no_pass
1138 /* 10 */
1139 KW_is_animated, 1149 KW_is_animated,
1140 KW_NULL, // slow_move 1150 KW_NULL, // slow_move
1141 KW_NULL, // flying 1151 KW_NULL, // flying
1142 KW_monster, 1152 KW_monster,
1143 KW_friendly, 1153 KW_friendly,
1144 KW_generator, 1154 KW_generator,
1145 KW_is_thrown, 1155 KW_is_thrown,
1146 KW_auto_apply, 1156 KW_auto_apply,
1147 KW_treasure_env, 1157 KW_treasure_env,
1158 /* 20 */
1148 KW_player_sold, 1159 KW_player_sold,
1149 /* 20 */
1150 KW_see_invisible, 1160 KW_see_invisible,
1151 KW_can_roll, 1161 KW_can_roll,
1152 KW_overlay_floor, 1162 KW_overlay_floor,
1153 KW_is_turnable, 1163 KW_is_turnable,
1154 KW_NULL, // walk_off 1164 KW_NULL, // walk_off
1155 KW_NULL, // fly_on 1165 KW_NULL, // fly_on
1156 KW_NULL, // fly_off 1166 KW_NULL, // fly_off
1157 KW_is_used_up, 1167 KW_is_used_up,
1158 KW_identified, 1168 KW_identified,
1169 /* 30 */
1159 KW_reflecting, 1170 KW_reflecting,
1160 /* 30 */
1161 KW_changing, 1171 KW_changing,
1162 KW_splitting, 1172 KW_splitting,
1163 KW_hitback, 1173 KW_hitback,
1164 KW_startequip, 1174 KW_startequip,
1165 KW_blocksview, 1175 KW_blocksview,
1166 KW_undead, 1176 KW_undead,
1167 KW_scared, 1177 KW_scared,
1168 KW_unaggressive, 1178 KW_unaggressive,
1169 KW_reflect_missile, 1179 KW_reflect_missile,
1180 /* 40 */
1170 KW_reflect_spell, 1181 KW_reflect_spell,
1171 /* 40 */
1172 KW_no_magic, 1182 KW_no_magic,
1173 KW_no_fix_player, 1183 KW_NULL,
1174 KW_is_lightable, 1184 KW_is_lightable,
1175 KW_tear_down, 1185 KW_tear_down,
1176 KW_run_away, 1186 KW_run_away,
1177 KW_NULL, // pass_thru 1187 KW_NULL, // pass_thru
1178 KW_NULL, // an_pass_thru 1188 KW_NULL, // an_pass_thru
1179 KW_pick_up, 1189 KW_pick_up,
1180 KW_unique, 1190 KW_unique,
1191 /* 50 */
1181 KW_no_drop, 1192 KW_no_drop,
1182 /* 50 */
1183 KW_NULL, // wizcast 1193 KW_NULL, // wizcast
1184 KW_can_cast_spell, 1194 KW_can_cast_spell,
1185 KW_can_use_scroll, 1195 KW_can_use_scroll,
1186 KW_can_use_range, 1196 KW_can_use_range,
1187 KW_can_use_bow, 1197 KW_can_use_bow,
1188 KW_can_use_armour, 1198 KW_can_use_armour,
1189 KW_can_use_weapon, 1199 KW_can_use_weapon,
1190 KW_can_use_ring, 1200 KW_can_use_ring,
1191 KW_has_ready_range, 1201 KW_has_ready_range,
1202 /* 60 */
1192 KW_has_ready_bow, 1203 KW_has_ready_bow,
1193 /* 60 */
1194 KW_xrays, 1204 KW_xrays,
1195 KW_NULL, 1205 KW_NULL,
1196 KW_is_floor, 1206 KW_is_floor,
1197 KW_lifesave, 1207 KW_lifesave,
1198 KW_no_strength, 1208 KW_no_strength,
1199 KW_sleep, 1209 KW_sleep,
1200 KW_stand_still, 1210 KW_stand_still,
1201 KW_random_move, 1211 KW_random_move,
1202 KW_only_attack, 1212 KW_only_attack,
1213 /* 70 */
1203 KW_confused, 1214 KW_confused,
1204 /* 70 */
1205 KW_stealth, 1215 KW_stealth,
1206 KW_NULL, 1216 KW_NULL,
1207 KW_NULL, 1217 KW_NULL,
1208 KW_cursed, 1218 KW_cursed,
1209 KW_damned, 1219 KW_damned,
1210 KW_see_anywhere, 1220 KW_see_anywhere,
1211 KW_known_magical, 1221 KW_known_magical,
1212 KW_known_cursed, 1222 KW_known_cursed,
1213 KW_can_use_skill, 1223 KW_can_use_skill,
1224 /* 80 */
1214 KW_been_applied, 1225 KW_been_applied,
1215 /* 80 */
1216 KW_has_ready_scroll, 1226 KW_has_ready_scroll,
1217 KW_can_use_rod, 1227 KW_can_use_rod,
1218 KW_precious, 1228 KW_precious,
1219 KW_can_use_horn, 1229 KW_can_use_horn,
1220 KW_make_invisible, 1230 KW_make_invisible,
1221 KW_inv_locked, 1231 KW_inv_locked,
1222 KW_is_wooded, 1232 KW_is_wooded,
1223 KW_is_hilly, 1233 KW_is_hilly,
1224 KW_has_ready_skill, 1234 KW_has_ready_skill,
1235 /* 90 */
1225 KW_has_ready_weapon, 1236 KW_has_ready_weapon,
1226 /* 90 */
1227 KW_no_skill_ident, 1237 KW_no_skill_ident,
1228 KW_is_blind, 1238 KW_is_blind,
1229 KW_can_see_in_dark, 1239 KW_can_see_in_dark,
1230 KW_is_cauldron, 1240 KW_is_cauldron,
1231 KW_NULL, 1241 KW_NULL,
1232 KW_no_steal, 1242 KW_no_steal,
1233 KW_one_hit, 1243 KW_one_hit,
1234 KW_NULL, 1244 KW_NULL,
1235 KW_berserk, 1245 KW_berserk,
1246 /* 100 */
1236 KW_neutral, 1247 KW_neutral,
1237 /* 100 */
1238 KW_no_attack, 1248 KW_no_attack,
1239 KW_no_damage, 1249 KW_no_damage,
1240 KW_obj_original, 1250 KW_obj_original,
1241 KW_NULL, 1251 KW_NULL,
1242 KW_activate_on_push, 1252 KW_activate_on_push,
1243 KW_activate_on_release, 1253 KW_activate_on_release,
1244 KW_is_water, 1254 KW_is_water,
1245 KW_use_content_on_gen, 1255 KW_use_content_on_gen,
1246 KW_NULL, 1256 KW_NULL,
1257 /* 110 */
1247 KW_is_buildable, 1258 KW_is_buildable,
1248 /* 110 */
1249 KW_destroy_on_death, 1259 KW_destroy_on_death,
1250 KW_NULL, 1260 KW_NULL,
1251 }; 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;
1252 1274
1253 /* 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
1254 * keys that match field names will be overwritten by the loader. 1276 * keys that match field names will be overwritten by the loader.
1255 */ 1277 */
1256 for (key_value *kv = op->key_values; kv; kv = kv->next) 1278 for (key_value *kv = op->key_values; kv; kv = kv->next)
1257 if (!arch->key_values || arch->kv (kv->key) != kv->value) 1279 if (!arch->key_values || arch->kv (kv->key) != kv->value)
1258 f.put (kv->key, kv->value); 1280 f.put (kv->key, kv->value);
1259 1281
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 != arch->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 != arch->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 CMP_OUT (x); 1299 CMP_OUT (x);
1267 CMP_OUT (y); 1300 CMP_OUT (y);
1268 1301
1269 CMP_OUT (type); 1302 CMP_OUT (type);
… …
1272 1305
1273 CMP_OUT (name); 1306 CMP_OUT (name);
1274 CMP_OUT (name_pl); 1307 CMP_OUT (name_pl);
1275 1308
1276 CMP_OUT (speed); 1309 CMP_OUT (speed);
1277 CMP_OUT (speed_left); 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 }
1278 1328
1279 CMP_OUT (title); 1329 CMP_OUT (title);
1280 CMP_OUT (race); 1330 CMP_OUT (race);
1281 CMP_OUT (slaying); 1331 CMP_OUT (slaying);
1282 CMP_OUT (skill); 1332 CMP_OUT (skill);
1283 1333
1284 CMP_OUT (tag); 1334 CMP_OUT (tag);
1285 CMP_OUT (custom_name); 1335 CMP_OUT (custom_name);
1286 1336
1287 if (object *owner = op->owner) 1337 if (object *owner = op->owner)
1288 f.put (KW_owner, static_cast<const char *>(owner->ref ())); 1338 f.put (KW(owner), static_cast<const char *>(owner->ref ()));
1289 1339
1290 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved 1340 // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved
1291 1341
1292 CMP_OUT (other_arch); 1342 CMP_OUT (other_arch);
1293 1343
1294 if (op->msg != arch->msg ) f.put (KW_msg , KW_endmsg , op->msg ); 1344 if (op->msg != arch->msg ) f.put (KW(msg) , KW(endmsg) , op->msg );
1295 if (op->lore != arch->lore) f.put (KW_lore, KW_endlore, op->lore); 1345 if (op->lore != arch->lore) f.put (KW(lore), KW(endlore), op->lore);
1296 1346
1297 if (op->face != arch->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);
1298 if (op->sound != arch->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);
1299 if (op->sound_destroy != arch->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);
1300 1350
1301 if (op->animation_id != arch->animation_id) 1351 if (op->animation_id != arch->animation_id)
1302 if (op->has_anim ()) 1352 if (op->has_anim ())
1303 f.put (KW_animation, op->anim ().name); 1353 f.put (KW(animation), op->anim ().name);
1304 else 1354 else
1305 { 1355 {
1306 f.put (KW_animation, (const char *)0); 1356 f.put (KW(animation));
1307 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here? 1357 op->flag [FLAG_ANIMATE] = false; // TODO: why force to false here?
1308 } 1358 }
1309 1359
1310 CMP_OUT2 (str, stats.Str); 1360 CMP_OUT2 (str, stats.Str);
1311 CMP_OUT2 (dex, stats.Dex); 1361 CMP_OUT2 (dex, stats.Dex);
… …
1336 CMP_OUT (attack_movement); 1386 CMP_OUT (attack_movement);
1337 CMP_OUT (nrof); 1387 CMP_OUT (nrof);
1338 CMP_OUT (level); 1388 CMP_OUT (level);
1339 CMP_OUT (attacktype); 1389 CMP_OUT (attacktype);
1340 1390
1341 // using memcmp here seems to be a loss - us gcc vectorising? 1391 // using memcmp here seems to be a loss - is gcc vectorising?
1342 for (int i = 0; i < NROFATTACKS; i++) 1392 for (int i = 0; i < NROFATTACKS; i++)
1343 if (expect_false (op->resist[i] != arch->resist[i])) 1393 if (expect_false (op->resist[i] != arch->resist[i]))
1344 f.put (resist_save[i], op->resist[i]); 1394 f.put (resist_save[i], op->resist[i]);
1345 1395
1346 CMP_OUT (path_attuned); 1396 CMP_OUT (path_attuned);
1347 CMP_OUT (path_repelled); 1397 CMP_OUT (path_repelled);
1348 CMP_OUT (path_denied); 1398 CMP_OUT (path_denied);
1399
1349 CMP_OUT2 (material, materials);//TODO: nuke 1400 CMP_OUT2 (material, materials);//TODO: nuke
1350 CMP_OUT (materialname); 1401 if (op->material != arch->material)
1402 f.put (KW(materialname), op->material->name);
1403
1351 CMP_OUT (value); 1404 CMP_OUT (value);
1352 CMP_OUT (carrying); 1405 CMP_OUT (carrying);
1353 CMP_OUT (weight); 1406 CMP_OUT (weight);
1354 CMP_OUT (invisible); 1407 CMP_OUT (invisible);
1355 CMP_OUT (state); 1408 CMP_OUT (state);
… …
1360 CMP_OUT (last_eat); 1413 CMP_OUT (last_eat);
1361 CMP_OUT (glow_radius); 1414 CMP_OUT (glow_radius);
1362 1415
1363 if (op->flag [FLAG_IS_LINKED]) 1416 if (op->flag [FLAG_IS_LINKED])
1364 if (auto (ol, op->find_link ())) 1417 if (auto (ol, op->find_link ()))
1365 f.put (KW_connected, ol->id); 1418 f.put (KW(connected), ol->id);
1366 1419
1367 CMP_OUT (randomitems); 1420 CMP_OUT (randomitems);
1368 CMP_OUT2 (container, weight_limit); 1421 CMP_OUT2 (container, weight_limit);
1369 1422
1370 CMP_OUT (run_away); 1423 CMP_OUT (run_away);
… …
1387 CMP_OUT (move_on); 1440 CMP_OUT (move_on);
1388 CMP_OUT (move_off); 1441 CMP_OUT (move_off);
1389 CMP_OUT (move_slow); 1442 CMP_OUT (move_slow);
1390 CMP_OUT (move_slow_penalty); 1443 CMP_OUT (move_slow_penalty);
1391 1444
1392 // obj_original is the only commonly differing flag between archetype
1393 // and object, so special-case it here to be able to skip the loop
1394 object::flags_t diff = op->flags ^ arch->flags; 1445 object::flags_t diff = (op->flag ^ arch->flag) & flagmask;
1395 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
1396 if (expect_true (diff.any ())) 1453 if (expect_true (diff.any ()))
1397 {
1398 if (expect_false (diff.reset (FLAG_OBJ_ORIGINAL).any ()))
1399 {
1400 // some other flags differ, too
1401 for (int i = 0; i < NUM_FLAGS; i++) 1454 for (int i = 0; i < NUM_FLAGS; i++)
1402 if (expect_false (flag_names [i] && op->flag [i] != arch->flag [i])) 1455 if (expect_false (diff [i]))
1403 f.put (flag_names [i], op->flag [i] ? "1" : "0"); 1456 f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0));
1404 }
1405 else
1406 {
1407 // only obj_original differs
1408 f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? "1" : "0");
1409 }
1410 }
1411 1457
1412 // save body locations. gcc's memcmp does an abysmal job when used 1458 // save body locations. gcc's memcmp does an abysmal job when used
1413 for (int i = 0; i < NUM_BODY_LOCATIONS; i++) 1459 for (int i = 0; i < NUM_BODY_LOCATIONS; i++)
1414 if (expect_false (op->slot[i].info != arch->slot[i].info)) 1460 if (expect_false (op->slot[i].info != arch->slot[i].info))
1415 f.put (body_locations[i].save_name, op->slot[i].info); 1461 f.put (body_locations[i].save_name, op->slot[i].info);
… …
1421 * 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.
1422 */ 1468 */
1423bool 1469bool
1424object::write (object_freezer &f) 1470object::write (object_freezer &f)
1425{ 1471{
1426 if (is_arch ()) 1472 if (expect_false (is_arch ()))
1427 { 1473 {
1428 f.put (KW_object, arch->archname); 1474 f.put (KW(object), arch->archname);
1429 write_diff (f, this, archetype::empty); 1475 write_diff (f, this, archetype::empty);
1430 } 1476 }
1431 else 1477 else
1432 { 1478 {
1433 f.put (KW_arch, arch->archname); 1479 f.put (KW(arch), arch->archname);
1434 write_diff (f, this, arch); 1480 write_diff (f, this, arch);
1435 } 1481 }
1436 1482
1437 for (object *tmp = inv; tmp; tmp = tmp->below) 1483 for (object *tmp = inv; tmp; tmp = tmp->below)
1438 tmp->write (f); 1484 tmp->write (f);
1439 1485
1440 f.put (this); 1486 f.put (this);
1441 f.put (KW_end); 1487 f.put (KW(end));
1442 1488
1443 return true; 1489 return true;
1444} 1490}
1445 1491
1446///////////////////////////////////////////////////////////////////////////// 1492/////////////////////////////////////////////////////////////////////////////

Diff Legend

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