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

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.17 by root, Wed Feb 22 22:36:45 2006 UTC vs.
Revision 1.20 by root, Thu Feb 23 01:35:35 2006 UTC

    return if %ARCH;
    *ARCH = read_arch "$LIB/archetypes",  "$cachedir/archetypes.pst";
 }
-=item $data = arch_attr $arch
+=item $type = arch_attr $arch
 Returns a hashref describing the object and its attributes. It can contain
 the following keys:
    name   the name, suitable for display purposes
    ignore
    attr
    desc
    use
    section => [name => \%attr, name => \%attr]
+   import
 =cut
 sub arch_attr($) {
    my ($arch) = @_;
    require Crossfire::Data;
-   my %attr;
+   my $attr;
    if ($arch->{type} > 0) {
-      %attr = %{ $Crossfire::Data::ATTR{$arch->{type}+0} || {} };
+      $attr = $Crossfire::Data::ATTR{$arch->{type}+0};
    } else {
-      die;
+      $attr = $Crossfire::Data::TYPE{Misc};
-   }
-   use PApp::Util;
+      type:
-   warn PApp::Util::dumpval \%attr;
+      for (@Crossfire::Data::ATTR0) {
+         my $req = $_->{required}
+            or die "internal error: ATTR0 without 'required'";
+         while (my ($k, $v) = each %$req) {
+            next type
+               unless $arch->{$k} == $v;
+         }
+         $attr = $_;
+      }
+   }
+   $attr || \%Crossfire::Data::DEFAULT_ATTR;
 }
 sub arch_edit_sections {
 #      if (edit_type == IGUIConstants.TILE_EDIT_NONE)
 #           edit_type = 0;

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