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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.137 by root, Tue Dec 15 01:44:06 2009 UTC vs.
Revision 1.139 by root, Tue Dec 22 09:52:36 2009 UTC

 =cut
 package Deliantra;
-our $VERSION = '1.25';
+our $VERSION = '1.29';
 use common::sense;
 use base 'Exporter';
          $root = $Deliantra::Data::TYPE{Misc};
       }
    }
    my @import = ($root);
    unshift @import, \%Deliantra::Data::DEFAULT_ATTR
       unless $type == 116;
    my (%ignore);
    my (@section_order, %section, @attr_order);
             $section{$name}{$k} ||= $v;
          }
       }
    }
+   # remove ignores for "root" type
+   for (map @{$_->[1]}, # section attributes
+           [general => ($root->{attr} || [])],
+           @{$root->{section} || []})
+   {
+      my ($k, $v) = @$_;
+      # skip fixed attributes, if they are ignored thats fine
+      next if $v->{type} eq 'fixed';
+      delete $ignore{$k}; # if the attributes are defined explicitly they
+                          # should NOT be ignored. ignore should mainly
+                          # hit imported/inherited attributes.
+   }
    $attr->{section} = [
       map !exists $section{$_} ? () : do {
             my $attr = delete $section{$_};
             [
                map exists $attr->{$_} && !$ignore{$_}
                       ? [$_ => delete $attr->{$_}] : (),
                    @attr_order
             ]
          },
          exists $section{$_} ? [$_ => delete $section{$_}] : (),
          @section_order
    ];
    $attr

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