| … | |
… | |
| 1018 | |
1018 | |
| 1019 | assert (arch); //D maybe use exception handling of sorts? |
1019 | assert (arch); //D maybe use exception handling of sorts? |
| 1020 | |
1020 | |
| 1021 | f.next (); |
1021 | f.next (); |
| 1022 | |
1022 | |
| 1023 | object *op = object::create (); |
1023 | object *op = arch->instance (); |
| 1024 | |
|
|
| 1025 | op->map = map; |
1024 | op->map = map; |
| 1026 | arch->copy_to (op); |
|
|
| 1027 | // copy_to activates, this should be fixed properly |
1025 | // instance() activates, this should be fixed properly |
| 1028 | op->deactivate (); |
1026 | op->deactivate (); |
| 1029 | |
1027 | |
| 1030 | if (!op->parse_kv (f)) |
1028 | if (!op->parse_kv (f)) |
| 1031 | { |
1029 | { |
| 1032 | op->destroy (true); |
1030 | op->destroy (true); |
| … | |
… | |
| 1274 | CMP_OUT (name); |
1272 | CMP_OUT (name); |
| 1275 | CMP_OUT (name_pl); |
1273 | CMP_OUT (name_pl); |
| 1276 | CMP_OUT (custom_name); |
1274 | CMP_OUT (custom_name); |
| 1277 | CMP_OUT (title); |
1275 | CMP_OUT (title); |
| 1278 | CMP_OUT (race); |
1276 | CMP_OUT (race); |
|
|
1277 | CMP_OUT (skill); |
| 1279 | CMP_OUT (slaying); |
1278 | CMP_OUT (slaying); |
| 1280 | CMP_OUT (tag); |
1279 | CMP_OUT (tag); |
| 1281 | CMP_OUT (other_arch); |
1280 | CMP_OUT (other_arch); |
| 1282 | |
1281 | |
| 1283 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
1282 | if (op->msg != tmp->msg ) f.put (KW_msg , KW_endmsg , op->msg ); |
