| … | |
… | |
| 114 | } |
114 | } |
| 115 | |
115 | |
| 116 | return default_region (); |
116 | return default_region (); |
| 117 | } |
117 | } |
| 118 | |
118 | |
|
|
119 | void |
|
|
120 | region::do_destroy () |
|
|
121 | { |
|
|
122 | regions.erase (this); |
|
|
123 | |
|
|
124 | attachable::do_destroy (); |
|
|
125 | |
|
|
126 | refcnt_dec (); |
|
|
127 | } |
|
|
128 | |
| 119 | /* |
129 | /* |
| 120 | * returns 1 if the player is in the region reg, or a child region thereof |
130 | * returns 1 if the player is in the region reg, or a child region thereof |
| 121 | * otherwise returns 0 |
131 | * otherwise returns 0 |
| 122 | * if passed a NULL region returns -1 |
132 | * if passed a NULL region returns -1 |
| 123 | */ |
133 | */ |
| 124 | |
|
|
| 125 | static int |
134 | static int |
| 126 | region_is_child_of_region (const region * child, const region * r) |
135 | region_is_child_of_region (const region * child, const region * r) |
| 127 | { |
136 | { |
| 128 | |
137 | |
| 129 | if (r == NULL) |
138 | if (r == NULL) |
| … | |
… | |
| 184 | region::read (object_thawer &f) |
193 | region::read (object_thawer &f) |
| 185 | { |
194 | { |
| 186 | assert (f.kw == KW_region); |
195 | assert (f.kw == KW_region); |
| 187 | |
196 | |
| 188 | region *rgn = new region; |
197 | region *rgn = new region; |
|
|
198 | rgn->refcnt_inc (); |
|
|
199 | |
| 189 | f.get (rgn->name); |
200 | f.get (rgn->name); |
| 190 | f.next (); |
201 | f.next (); |
| 191 | |
202 | |
| 192 | for (;;) |
203 | for (;;) |
| 193 | { |
204 | { |
| … | |
… | |
| 197 | rgn->parent = region::find (f.get_str ()); |
208 | rgn->parent = region::find (f.get_str ()); |
| 198 | break; |
209 | break; |
| 199 | |
210 | |
| 200 | case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; |
211 | case KW_msg: f.get_ml (KW_endmsg, rgn->msg); break; |
| 201 | case KW_longname: f.get (rgn->longname); break; |
212 | case KW_longname: f.get (rgn->longname); break; |
| 202 | case KW_match: f.get (rgn->match); break; |
|
|
| 203 | case KW_jail_map: f.get (rgn->jailmap); break; |
213 | case KW_jail_map: f.get (rgn->jailmap); break; |
| 204 | case KW_jail_x: f.get (rgn->jailx); break; |
214 | case KW_jail_x: f.get (rgn->jailx); break; |
| 205 | case KW_jail_y: f.get (rgn->jaily); break; |
215 | case KW_jail_y: f.get (rgn->jaily); break; |
| 206 | case KW_portal_map: f.get (rgn->portalmap);break; |
216 | case KW_portal_map: f.get (rgn->portalmap);break; |
| 207 | case KW_portal_x: f.get (rgn->portalx); break; |
217 | case KW_portal_x: f.get (rgn->portalx); break; |
| … | |
… | |
| 214 | break; |
224 | break; |
| 215 | |
225 | |
| 216 | case KW_end: |
226 | case KW_end: |
| 217 | f.next (); |
227 | f.next (); |
| 218 | |
228 | |
|
|
229 | // cannot use find as that will request the default region |
| 219 | for_all_regions (old) |
230 | for_all_regions (old) |
| 220 | if (old->name == rgn->name) |
231 | if (old->name == rgn->name) |
| 221 | { |
232 | { |
| 222 | // replace, copy new values (ugly) |
233 | old->destroy (); |
| 223 | rgn->index = old->index; |
|
|
| 224 | *old = *rgn; |
|
|
| 225 | delete rgn; |
|
|
| 226 | |
|
|
| 227 | return old; |
234 | break; |
| 228 | } |
235 | } |
| 229 | |
236 | |
| 230 | // just append |
237 | // just append |
| 231 | regions.push_back (rgn); |
238 | regions.push_back (rgn); |
| 232 | return rgn; |
239 | return rgn; |
| 233 | |
240 | |
|
|
241 | case KW_ERROR: |
|
|
242 | rgn->set_key_text (f.kw_str, f.value); |
|
|
243 | //fprintf (stderr, "region addkv(%s,%s)\n", f.kw_str, f.value);//D |
|
|
244 | break; |
|
|
245 | |
| 234 | default: |
246 | default: |
| 235 | if (!f.parse_error ("region", rgn->name)) |
247 | if (!f.parse_error ("region", rgn->name)) |
| 236 | { |
248 | { |
| 237 | delete rgn; |
249 | rgn->destroy (); |
| 238 | return 0; |
250 | return 0; |
| 239 | } |
251 | } |
| 240 | break; |
252 | break; |
| 241 | } |
253 | } |
| 242 | |
254 | |
