ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/lib/cf.pm
(Generate patch)

Comparing deliantra/server/lib/cf.pm (file contents):
Revision 1.306 by root, Sat Jul 14 14:33:30 2007 UTC vs.
Revision 1.307 by root, Sun Jul 15 22:39:48 2007 UTC

2771 my $meta = $enc->encode ({ 2771 my $meta = $enc->encode ({
2772 name => $name, 2772 name => $name,
2773 type => $info->{type}, 2773 type => $info->{type},
2774 copyright => $info->{copyright}, #TODO# 2774 copyright => $info->{copyright}, #TODO#
2775 }); 2775 });
2776 my $data = pack "(w/a*)*", $meta, $info->{data};
2777 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2778 2776
2779 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2777 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2778
2779 if ($name =~ /\.jpg$/) {
2780 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack
2781 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack
2782 } else {
2783 my $data = pack "(w/a*)*", $meta, $info->{data};
2784 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2785
2780 cf::face::set_type $idx, 1; 2786 cf::face::set_type $idx, 1;
2781 cf::face::set_data $idx, 0, $data, $chk; 2787 cf::face::set_data $idx, 0, $data, $chk;
2788 }
2782 2789
2783 cf::cede_to_tick; 2790 cf::cede_to_tick;
2784 } 2791 }
2785 } 2792 }
2786 2793

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines