… | |
… | |
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 | { |
… | |
… | |
213 | break; |
224 | break; |
214 | |
225 | |
215 | case KW_end: |
226 | case KW_end: |
216 | f.next (); |
227 | f.next (); |
217 | |
228 | |
|
|
229 | // cannot use find as that will request the default region |
218 | for_all_regions (old) |
230 | for_all_regions (old) |
219 | if (old->name == rgn->name) |
231 | if (old->name == rgn->name) |
220 | { |
232 | { |
221 | // replace, copy new values (ugly) |
233 | old->destroy (); |
222 | rgn->index = old->index; |
|
|
223 | *old = *rgn; |
|
|
224 | delete rgn; |
|
|
225 | |
|
|
226 | return old; |
234 | break; |
227 | } |
235 | } |
228 | |
236 | |
229 | // just append |
237 | // just append |
230 | regions.push_back (rgn); |
238 | regions.push_back (rgn); |
231 | return rgn; |
239 | return rgn; |
… | |
… | |
236 | break; |
244 | break; |
237 | |
245 | |
238 | default: |
246 | default: |
239 | if (!f.parse_error ("region", rgn->name)) |
247 | if (!f.parse_error ("region", rgn->name)) |
240 | { |
248 | { |
241 | delete rgn; |
249 | rgn->destroy (); |
242 | return 0; |
250 | return 0; |
243 | } |
251 | } |
244 | break; |
252 | break; |
245 | } |
253 | } |
246 | |
254 | |