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.317 by root, Mon Jul 23 23:38:17 2007 UTC vs.
Revision 1.318 by root, Tue Jul 24 04:55:34 2007 UTC

2868 my $enc = JSON::XS->new->utf8->canonical; 2868 my $enc = JSON::XS->new->utf8->canonical;
2869 2869
2870 while (my ($name, $info) = each %$res) { 2870 while (my ($name, $info) = each %$res) {
2871 my $meta = $enc->encode ({ 2871 my $meta = $enc->encode ({
2872 name => $name, 2872 name => $name,
2873 type => $info->{type},
2874 copyright => $info->{copyright}, #TODO# 2873 copyright => $info->{copyright}, #TODO#
2875 }); 2874 });
2876 2875
2877 my $idx = (cf::face::find $name) || cf::face::alloc $name; 2876 my $idx = (cf::face::find $name) || cf::face::alloc $name;
2878 2877
2879 if ($name =~ /\.(?:jpg|png)$/) { 2878 if ($info->{type} & 1) {
2880 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};#d# temp hack 2879 # prepend meta info
2881 cf::face::set_data $idx, 1, $info->{data}, $info->{chksum};#d# temp hack 2880
2882 } else {
2883 my $data = pack "(w/a*)*", $meta, $info->{data}; 2881 my $data = pack "(w/a*)*", $meta, $info->{data};
2884 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata 2882 my $chk = Digest::MD5::md5 "$info->{chksum},$meta"; # mangle data checksum and metadata
2885 2883
2886 cf::face::set_type $idx, 1;
2887 cf::face::set_data $idx, 0, $data, $chk; 2884 cf::face::set_data $idx, 0, $data, $chk;
2885 } else {
2886 cf::face::set_data $idx, 0, $info->{data}, $info->{chksum};
2888 } 2887 }
2889 2888
2889 cf::face::set_type $idx, $info->{type};
2890
2890 cf::cede_to_tick; 2891 cf::cede_to_tick;
2891 } 2892 }
2892 } 2893 }
2893 2894
2894 1 2895 1
2895} 2896}
2897
2898register_exticmd fx_want => sub {
2899 my ($ns, $want) = @_;
2900
2901 while (my ($k, $v) = each %$want) {
2902 $ns->fx_want ($k, $v);
2903 }
2904};
2896 2905
2897sub reload_regions { 2906sub reload_regions {
2898 load_resource_file "$MAPDIR/regions" 2907 load_resource_file "$MAPDIR/regions"
2899 or die "unable to load regions file\n"; 2908 or die "unable to load regions file\n";
2900 2909

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines