| … | |
… | |
| 333 | } |
333 | } |
| 334 | } |
334 | } |
| 335 | |
335 | |
| 336 | my $attr = { }; |
336 | my $attr = { }; |
| 337 | |
337 | |
| 338 | my @import = $root || \%Crossfire::Data::DEFAULT_ATTR; |
338 | my @import = (\%Crossfire::Data::DEFAULT_ATTR, $root); |
| 339 | my (%ignore); |
339 | my (%ignore); |
| 340 | my (@section_order, %section, @attr_order); |
340 | my (@section_order, %section, @attr_order); |
| 341 | |
341 | |
| 342 | while (my $type = shift @import) { |
342 | while (my $type = shift @import) { |
| 343 | push @import, @{$type->{import} || []}; |
343 | push @import, @{$type->{import} || []}; |
| … | |
… | |
| 347 | |
347 | |
| 348 | for (@{$type->{ignore} || []}) { |
348 | for (@{$type->{ignore} || []}) { |
| 349 | $ignore{$_}++ for ref $_ ? @$_ : $_; |
349 | $ignore{$_}++ for ref $_ ? @$_ : $_; |
| 350 | } |
350 | } |
| 351 | |
351 | |
| 352 | for ([general => ($type->{attr} || {})], @{$type->{section} || []}) { |
352 | for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { |
| 353 | my ($name, $attr) = @$_; |
353 | my ($name, $attr) = @$_; |
| 354 | push @section_order, $name; |
354 | push @section_order, $name; |
|
|
355 | warn "$name, $attr\n";#d# |
| 355 | for (@$attr) { |
356 | for (@$attr) { |
| 356 | my ($k, $v) = @$_; |
357 | my ($k, $v) = @$_; |
| 357 | push @attr_order, $k; |
358 | push @attr_order, $k; |
| 358 | $section{$name}{$k} ||= $v; |
359 | $section{$name}{$k} ||= $v; |
| 359 | } |
360 | } |
| … | |
… | |
| 374 | |
375 | |
| 375 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
376 | exists $section{$_} ? [$_ => delete $section{$_}] : (), |
| 376 | @section_order |
377 | @section_order |
| 377 | ]; |
378 | ]; |
| 378 | |
379 | |
| 379 | use PApp::Util; |
|
|
| 380 | warn PApp::Util::dumpval $attr; |
|
|
| 381 | |
|
|
| 382 | $attr |
380 | $attr |
| 383 | } |
381 | } |
| 384 | |
382 | |
| 385 | sub arch_edit_sections { |
383 | sub arch_edit_sections { |
| 386 | # if (edit_type == IGUIConstants.TILE_EDIT_NONE) |
384 | # if (edit_type == IGUIConstants.TILE_EDIT_NONE) |
