| … | |
… | |
| 556 | |
556 | |
| 557 | case KW_attach: f.get_ornull (attach); break; |
557 | case KW_attach: f.get_ornull (attach); break; |
| 558 | case KW_skill: f.get_ornull (skill); break; |
558 | case KW_skill: f.get_ornull (skill); break; |
| 559 | case KW_race: f.get_ornull (race); break; |
559 | case KW_race: f.get_ornull (race); break; |
| 560 | case KW_slaying: f.get_ornull (slaying); break; |
560 | case KW_slaying: f.get_ornull (slaying); break; |
|
|
561 | case KW_tag: f.get_ornull (tag); break; |
| 561 | |
562 | |
| 562 | case KW_arch: |
563 | case KW_arch: |
| 563 | { |
564 | { |
| 564 | object *tmp = object::read (f); |
565 | object *tmp = object::read (f); |
| 565 | tmp->deactivate (); |
566 | tmp->deactivate (); |
| … | |
… | |
| 567 | { |
568 | { |
| 568 | // was: insert_ob_in_ob (tmp, op); |
569 | // was: insert_ob_in_ob (tmp, op); |
| 569 | // but manually adding it can improve map loading times a lot |
570 | // but manually adding it can improve map loading times a lot |
| 570 | // also, appending instead of prepending keeps the |
571 | // also, appending instead of prepending keeps the |
| 571 | // save ordering the same between repeated load/saves. |
572 | // save ordering the same between repeated load/saves. |
|
|
573 | // and finally we do not want any funny effects |
| 572 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
574 | CLEAR_FLAG (tmp, FLAG_OBJ_ORIGINAL); |
| 573 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
575 | CLEAR_FLAG (tmp, FLAG_REMOVED); |
| 574 | |
576 | |
| 575 | if (!op_inv) |
577 | if (!op_inv) |
| 576 | { |
578 | { |
| … | |
… | |
| 1284 | CMP_OUT (name_pl); |
1286 | CMP_OUT (name_pl); |
| 1285 | CMP_OUT (custom_name); |
1287 | CMP_OUT (custom_name); |
| 1286 | CMP_OUT (title); |
1288 | CMP_OUT (title); |
| 1287 | CMP_OUT (race); |
1289 | CMP_OUT (race); |
| 1288 | CMP_OUT (slaying); |
1290 | CMP_OUT (slaying); |
|
|
1291 | CMP_OUT (tag); |
| 1289 | CMP_OUT (other_arch); |
1292 | CMP_OUT (other_arch); |
| 1290 | |
1293 | |
| 1291 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1294 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
| 1292 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
1295 | if (op->lore != tmp->lore) f.put (KW_lore, KW_endlore, op->lore); |
| 1293 | |
1296 | |
