| … | |
… | |
| 309 | // dire hack, need to rationalise |
309 | // dire hack, need to rationalise |
| 310 | void |
310 | void |
| 311 | overwrite (archetype *at, object *op) |
311 | overwrite (archetype *at, object *op) |
| 312 | { |
312 | { |
| 313 | at->clone = *op; |
313 | at->clone = *op; |
| 314 | |
|
|
| 315 | at->clone.arch = at; |
314 | at->clone.arch = at; |
|
|
315 | |
| 316 | at->clone.inv = op->inv; op->inv = 0; |
316 | at->clone.inv = op->inv; op->inv = 0; |
| 317 | |
317 | |
| 318 | op->destroy (); |
318 | op->destroy (); |
| 319 | } |
319 | } |
| 320 | |
320 | |
| … | |
… | |
| 334 | { |
334 | { |
| 335 | object *op = object::create (); |
335 | object *op = object::create (); |
| 336 | archetype *at = get (f.get_str ()); |
336 | archetype *at = get (f.get_str ()); |
| 337 | f.get (op->name); |
337 | f.get (op->name); |
| 338 | f.next (); |
338 | f.next (); |
|
|
339 | |
|
|
340 | if (f.kw == KW_inherit) |
|
|
341 | { |
|
|
342 | if (archetype *at = find (f.get_str ())) |
|
|
343 | *op = at->clone; |
|
|
344 | else |
|
|
345 | LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", |
|
|
346 | &at->name, f.get_str ()); |
|
|
347 | |
|
|
348 | f.next (); |
|
|
349 | } |
| 339 | |
350 | |
| 340 | if (!op->parse_kv (f)) |
351 | if (!op->parse_kv (f)) |
| 341 | goto fail; |
352 | goto fail; |
| 342 | |
353 | |
| 343 | parts.push_back (std::make_pair (at, op)); |
354 | parts.push_back (std::make_pair (at, op)); |
