… | |
… | |
394 | if (ip > 2 * item_power && ip > (item_power + 3)) |
394 | if (ip > 2 * item_power && ip > (item_power + 3)) |
395 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
395 | LOG (llevDebug, "Object %s seems to have too low item power? %d > %d\n", debug_desc (), ip, item_power); |
396 | #endif |
396 | #endif |
397 | } |
397 | } |
398 | |
398 | |
399 | /* old style spellcasting object (pretty common) - need to load in the appropiate object */ |
399 | /* old style spellcasting object (pretty common) - need to load in the appropriate object */ |
400 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
400 | /* (schmorp) old really doesn't mean old, imho, just a more compact way to store such objects */ |
401 | if ((type == ROD |
401 | if ((type == ROD |
402 | || type == WAND |
402 | || type == WAND |
403 | || type == SCROLL |
403 | || type == SCROLL |
404 | || type == HORN |
404 | || type == HORN |
… | |
… | |
736 | case KW_invisible: f.get (invisible); break; |
736 | case KW_invisible: f.get (invisible); break; |
737 | case KW_magic: f.get (magic); break; |
737 | case KW_magic: f.get (magic); break; |
738 | case KW_state: f.get (state); break; |
738 | case KW_state: f.get (state); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
739 | case KW_move_slow_penalty: f.get (move_slow_penalty); break; |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
740 | case KW_material: f.get (materials); break; //TODO: nuke |
741 | |
741 | case KW_materialname: f.get (material); break; |
742 | case KW_materialname: |
|
|
743 | { |
|
|
744 | shstr sh; |
|
|
745 | f.get (sh); |
|
|
746 | material = name_to_material (sh); |
|
|
747 | } |
|
|
748 | break; |
|
|
749 | |
742 | |
750 | /* These are the new values */ |
743 | /* These are the new values */ |
751 | case KW_move_block: set_move (move_block, f); break; |
744 | case KW_move_block: set_move (move_block, f); break; |
752 | case KW_move_allow: set_move (move_allow, f); break; |
745 | case KW_move_allow: set_move (move_allow, f); break; |
753 | case KW_move_type: set_move (move_type , f); break; |
746 | case KW_move_type: set_move (move_type , f); break; |
… | |
… | |
1340 | |
1333 | |
1341 | CMP_OUT (tag); |
1334 | CMP_OUT (tag); |
1342 | CMP_OUT (custom_name); |
1335 | CMP_OUT (custom_name); |
1343 | |
1336 | |
1344 | if (object *owner = op->owner) |
1337 | if (object *owner = op->owner) |
1345 | f.put (KW(owner), static_cast<const char *>(owner->ref ())); |
1338 | if (const char *ref = owner->ref ()) |
|
|
1339 | f.put (KW(owner), ref); |
1346 | |
1340 | |
1347 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1341 | // memory, attacked_by, chosen_skill, spellitem, spell, current_weapon, arch not saved |
1348 | |
1342 | |
1349 | CMP_OUT (other_arch); |
1343 | CMP_OUT (other_arch); |
1350 | |
1344 | |
… | |
… | |
1450 | CMP_OUT (move_slow); |
1444 | CMP_OUT (move_slow); |
1451 | CMP_OUT (move_slow_penalty); |
1445 | CMP_OUT (move_slow_penalty); |
1452 | |
1446 | |
1453 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1447 | object::flags_t diff = (op->flag ^ arch->flag) & flagmask; |
1454 | |
1448 | |
|
|
1449 | #if stdcpp // we need gcc, sorry |
1455 | if (diff [FLAG_OBJ_ORIGINAL]) |
1450 | if (diff [FLAG_OBJ_ORIGINAL]) |
1456 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
1451 | f.put (flag_names [FLAG_OBJ_ORIGINAL], op->flag [FLAG_OBJ_ORIGINAL] ? CS(1) : CS(0)); |
1457 | |
1452 | |
1458 | diff.reset (FLAG_OBJ_ORIGINAL); |
1453 | diff.reset (FLAG_OBJ_ORIGINAL); |
1459 | |
1454 | |
1460 | // quickly test whether any other flags differ |
1455 | // quickly test whether any other flags differ |
1461 | if (expect_true (diff.any ())) |
1456 | if (expect_true (diff.any ())) |
1462 | for (int i = 0; i < NUM_FLAGS; i++) |
1457 | for (int i = 0; i < NUM_FLAGS; i++) |
1463 | if (expect_false (diff [i])) |
1458 | if (expect_false (diff [i])) |
1464 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
1459 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1460 | #else |
|
|
1461 | // use sgi extensions |
|
|
1462 | for (int i = diff._Find_first (); i < diff.size (); i = diff._Find_next (i)) |
|
|
1463 | f.put (flag_names [i], op->flag [i] ? CS(1) : CS(0)); |
|
|
1464 | #endif |
1465 | |
1465 | |
1466 | // save body locations. gcc's memcmp does an abysmal job when used |
1466 | // save body locations. gcc's memcmp does an abysmal job when used |
1467 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1467 | for (int i = 0; i < NUM_BODY_LOCATIONS; i++) |
1468 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1468 | if (expect_false (op->slot[i].info != arch->slot[i].info)) |
1469 | f.put (body_locations[i].save_name, op->slot[i].info); |
1469 | f.put (body_locations[i].save_name, op->slot[i].info); |