… | |
… | |
181 | LOG (llevError, "No suitable jailmap for region %s was found.\n", ®->name); |
181 | LOG (llevError, "No suitable jailmap for region %s was found.\n", ®->name); |
182 | |
182 | |
183 | return 0; |
183 | return 0; |
184 | } |
184 | } |
185 | |
185 | |
186 | region *loader_region::get_region (const char *name) |
186 | region * |
|
|
187 | region::load (object_f &f) |
187 | { |
188 | { |
188 | region *rgn = new region; |
189 | region *rgn = new region; |
189 | rgn->name = name; |
190 | f.get (rgn->name); |
190 | return rgn; |
191 | f.next_kv (); |
191 | } |
|
|
192 | |
192 | |
193 | void loader_region::put_region (region *rgn) |
|
|
194 | { |
|
|
195 | for_all_regions (old) |
|
|
196 | if (old->name == rgn->name) |
|
|
197 | { |
|
|
198 | // replace, copy new values (ugly) |
|
|
199 | rgn->index = old->index; |
|
|
200 | *old = *rgn; |
|
|
201 | delete rgn; |
|
|
202 | |
|
|
203 | return; |
|
|
204 | } |
|
|
205 | |
|
|
206 | // just append |
|
|
207 | regions.push_back (rgn); |
|
|
208 | } |
|
|
209 | |
|
|
210 | bool |
|
|
211 | loader_base::parse_region (object_thawer &thawer, region *rgn) |
|
|
212 | { |
|
|
213 | for (;;) |
193 | for (;;) |
214 | { |
194 | { |
215 | keyword kw = thawer.get_kv (); |
|
|
216 | |
|
|
217 | switch (kw) |
195 | switch (f.kw) |
218 | { |
196 | { |
219 | case KW_parent: |
197 | case KW_parent: |
220 | rgn->parent = region::find (thawer.get_str ()); |
198 | rgn->parent = region::find (f.get_str ()); |
221 | break; |
199 | break; |
222 | |
200 | |
223 | case KW_longname: |
201 | case KW_longname: |
224 | thawer.get (rgn->longname); |
202 | f.get (rgn->longname); |
225 | break; |
203 | break; |
226 | |
204 | |
227 | case KW_jail_map: |
205 | case KW_jail_map: |
228 | thawer.get (rgn->jailmap); |
206 | f.get (rgn->jailmap); |
229 | break; |
207 | break; |
230 | |
208 | |
231 | case KW_jail_x: |
209 | case KW_jail_x: |
232 | thawer.get (rgn->jailx); |
210 | f.get (rgn->jailx); |
233 | break; |
211 | break; |
234 | |
212 | |
235 | case KW_jail_y: |
213 | case KW_jail_y: |
236 | thawer.get (rgn->jaily); |
214 | f.get (rgn->jaily); |
237 | break; |
215 | break; |
238 | |
216 | |
239 | case KW_msg: |
217 | case KW_msg: |
240 | thawer.get_ml (KW_endmsg, rgn->msg); |
218 | f.get_ml (KW_endmsg, rgn->msg); |
241 | break; |
219 | break; |
242 | |
220 | |
243 | case KW_fallback: |
221 | case KW_fallback: |
244 | thawer.get (rgn->fallback); |
222 | f.get (rgn->fallback); |
245 | break; |
223 | break; |
246 | |
224 | |
247 | case KW_end: |
225 | case KW_end: |
|
|
226 | for_all_regions (old) |
|
|
227 | if (old->name == rgn->name) |
|
|
228 | { |
|
|
229 | // replace, copy new values (ugly) |
|
|
230 | rgn->index = old->index; |
|
|
231 | *old = *rgn; |
|
|
232 | delete rgn; |
|
|
233 | |
|
|
234 | return old; |
|
|
235 | } |
|
|
236 | |
|
|
237 | // just append |
|
|
238 | regions.push_back (rgn); |
248 | return true; |
239 | return rgn; |
249 | |
240 | |
250 | default: |
241 | default: |
251 | if (!thawer.parse_error (kw, "region", rgn->name)) |
242 | if (!f.parse_error ("region", rgn->name)) |
|
|
243 | { |
|
|
244 | delete rgn; |
252 | return false; |
245 | return 0; |
|
|
246 | } |
253 | break; |
247 | break; |
254 | } |
248 | } |
|
|
249 | |
|
|
250 | f.next_kv (); |
255 | } |
251 | } |
256 | } |
252 | } |
257 | |
253 | |
258 | /* |
254 | /* |
259 | * First initialises the archtype hash-table (init_archetable()). |
255 | * First initialises the archtype hash-table (init_archetable()). |