[ViewVC] Diff of: cvs/deliantra/Deliantra/Deliantra.pm

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.36 by root, Sun Mar 12 23:21:11 2006 UTC vs.
Revision 1.42 by root, Mon Mar 13 03:28:53 2006 UTC

       }
    }
    my $attr = { };
-   my @import = $root || \%Crossfire::Data::DEFAULT_ATTR;
+   my @import = (\%Crossfire::Data::DEFAULT_ATTR, $root);
    my (%ignore);
    my (@section_order, %section, @attr_order);
    while (my $type = shift @import) {
       push @import, @{$type->{import} || []};
       }
       for ([general => ($type->{attr} || {})], @{$type->{section} || []}) {
          my ($name, $attr) = @$_;
          push @section_order, $name;
-         for (@$attr) {
+         for (@{$attr || []}) {
             my ($k, $v) = @$_;
             push @attr_order, $k;
             $section{$name}{$k} ||= $v;
          }
       }
       map !exists $section{$_} ? () : do {
             my $attr = delete $section{$_};
             [
                $_,
+               map exists $attr->{$_} && !$ignore{$_}
-               map exists $attr->{$_} ? [$_ => delete $attr->{$_}] : (),
+                      ? [$_ => delete $attr->{$_}] : (),
                    @attr_order
             ]
          },
          exists $section{$_} ? [$_ => delete $section{$_}] : (),
          @section_order
    ];
-   use PApp::Util;
-   warn PApp::Util::dumpval $attr;
    $attr
 }
 sub arch_edit_sections {

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines