| … | |
… | |
| 45 | return rgn; |
45 | return rgn; |
| 46 | |
46 | |
| 47 | return default_region (); |
47 | return default_region (); |
| 48 | } |
48 | } |
| 49 | |
49 | |
| 50 | region * |
50 | void |
| 51 | region::find (object_thawer &f) |
51 | object_thawer::get (region_ptr &r) const |
| 52 | { |
52 | { |
| 53 | shstr_cmp name = f.get_str (); |
53 | shstr_cmp name = get_str (); |
| 54 | |
54 | |
| 55 | for_all_regions (rgn) |
55 | for_all_regions (rgn) |
| 56 | if (rgn->name == name) |
56 | if (rgn->name == name) |
|
|
57 | { |
|
|
58 | r = rgn; |
| 57 | return rgn; |
59 | return; |
|
|
60 | } |
| 58 | |
61 | |
| 59 | f.parse_error (format ("region called %s requested, but not found, using fallback.\n", f.get_str ())); |
62 | parse_error (format ("region called %s requested, but not found, using fallback.\n", get_str ())); |
| 60 | |
63 | |
| 61 | return default_region (); |
64 | r = region::default_region (); |
| 62 | } |
65 | } |
| 63 | |
66 | |
| 64 | void |
67 | void |
| 65 | region::do_destroy () |
68 | region::do_destroy () |
| 66 | { |
69 | { |
| … | |
… | |
| 148 | for (;;) |
151 | for (;;) |
| 149 | { |
152 | { |
| 150 | switch (f.kw) |
153 | switch (f.kw) |
| 151 | { |
154 | { |
| 152 | case KW_parent: |
155 | case KW_parent: |
| 153 | rgn->parent = region::find (f); |
156 | f.get (rgn->parent); |
| 154 | break; |
157 | break; |
| 155 | |
158 | |
| 156 | case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; |
159 | case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; |
| 157 | case KW_longname: f.get (rgn->longname); break; |
160 | case KW_longname: f.get (rgn->longname); break; |
| 158 | case KW_jail_map: f.get (rgn->jailmap); break; |
161 | case KW_jail_map: f.get (rgn->jailmap); break; |
