| … | |
… | |
| 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 | |
339 | |
|
|
340 | #if 0 |
| 340 | if (f.kw == KW_inherit) |
341 | if (f.kw == KW_inherit) |
| 341 | { |
342 | { |
| 342 | if (archetype *at = find (f.get_str ())) |
343 | if (archetype *at = find (f.get_str ())) |
| 343 | *op = at->clone; |
344 | *op = at->clone; |
| 344 | else |
345 | else |
| 345 | LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", |
346 | LOG (llevError, "archetype '%s' tries to inherit from non-existent archetype '%s'.\n", |
| 346 | &at->name, f.get_str ()); |
347 | &at->name, f.get_str ()); |
| 347 | |
348 | |
| 348 | f.next (); |
349 | f.next (); |
| 349 | } |
350 | } |
|
|
351 | #endif |
| 350 | |
352 | |
| 351 | if (!op->parse_kv (f)) |
353 | if (!op->parse_kv (f)) |
| 352 | goto fail; |
354 | goto fail; |
| 353 | |
355 | |
| 354 | parts.push_back (std::make_pair (at, op)); |
356 | parts.push_back (std::make_pair (at, op)); |
| … | |
… | |
| 529 | archetype *at = find (name); |
531 | archetype *at = find (name); |
| 530 | |
532 | |
| 531 | if (!at) |
533 | if (!at) |
| 532 | { |
534 | { |
| 533 | archetypes.push_back (at = new archetype); |
535 | archetypes.push_back (at = new archetype); |
| 534 | at->name = name; |
536 | at->name = at->clone.name = at->clone.name_pl = name; |
| 535 | at->hash_add (); |
537 | at->hash_add (); |
| 536 | } |
538 | } |
| 537 | |
539 | |
| 538 | return at; |
540 | return at; |
| 539 | } |
541 | } |
