| … | |
… | |
| 590 | |
590 | |
| 591 | tmp->below = 0; |
591 | tmp->below = 0; |
| 592 | tmp->env = this; |
592 | tmp->env = this; |
| 593 | op_inv = tmp; |
593 | op_inv = tmp; |
| 594 | } |
594 | } |
|
|
595 | else |
|
|
596 | LOG (llevError, "ERROR: couldn't load inventory object, file corrupted?\n"); |
|
|
597 | |
| 595 | continue; |
598 | continue; |
| 596 | |
599 | |
| 597 | case KW_other_arch: |
600 | case KW_other_arch: |
| 598 | if (loading_arch == this) |
601 | if (loading_arch == this) |
| 599 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
602 | archetype::postpone_arch_ref (loading_arch->other_arch, f.get_str ()); |
| … | |
… | |
| 1056 | // instance() activates, this should be fixed properly |
1059 | // instance() activates, this should be fixed properly |
| 1057 | op->deactivate (); |
1060 | op->deactivate (); |
| 1058 | |
1061 | |
| 1059 | if (!op->parse_kv (f)) |
1062 | if (!op->parse_kv (f)) |
| 1060 | { |
1063 | { |
| 1061 | op->destroy (true); |
1064 | op->destroy (); |
| 1062 | return 0; |
1065 | return 0; |
| 1063 | } |
1066 | } |
| 1064 | |
1067 | |
| 1065 | op->post_load_check (); |
1068 | op->post_load_check (); |
| 1066 | return op; |
1069 | return op; |
