ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/utils/cfutil.in
(Generate patch)

Comparing deliantra/server/utils/cfutil.in (file contents):
Revision 1.87 by root, Tue Oct 5 23:25:25 2010 UTC vs.
Revision 1.95 by root, Wed Oct 6 00:19:32 2010 UTC

106 my ($id, $dataref, $hashref, $clen) = @_; 106 my ($id, $dataref, $hashref, $clen) = @_;
107 107
108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4; 108 my $hash = substr +(Digest::MD5::md5 $$dataref), 0, $clen || 4;
109 109
110 if (exists $hash{$hash}) { 110 if (exists $hash{$hash}) {
111 # hahs collinion, but some files are simply identical 111 # hash collision, but some files are simply identical
112 if (${$hash{$hash}[1]} ne $$dataref) { 112 if (${$hash{$hash}[1]} ne $$dataref) {
113 warn "hash collision $hash{$hash}[0] vs. $id\n"; 113 warn "hash collision $hash{$hash}[0] vs. $id\n";
114 exit 1; 114 exit 1;
115 } else { 115 } else {
116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3; 116 print "$hash{$hash}[0] and $id are identical (which is fine).\n" if $VERBOSE >= 3;
156 and die "map installation failed.\n"; 156 and die "map installation failed.\n";
157 157
158 print "maps installed successfully.\n"; 158 print "maps installed successfully.\n";
159} 159}
160 160
161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162
161sub autoglyph { 163sub autoglyph {
162 my ($stem, $face) = @_; 164 my ($stem, $face) = @_;
163 165
164 if ($stem =~ /^wall\/|Nimwall/) { 166 if ($stem =~ /^wall\/|Nimwall/) {
165# warn $stem; 167 return $WALL_SUFFIX[hex $1]
168 if $stem =~ /(_[0-9A-F]).x11/;
169
166 "+" 170 "+"
171
167 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { 172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
168 "." 173 "."
174
175 } elsif ($stem =~ /^player\//) {
176 "\@"
177
169 } else { 178 } else {
170 substr $stem, 0, 1 179 substr $stem, 0, 1
171 } 180 }
172} 181}
173 182
813 make_hash $k, $v->{data64}, $v->{hash64}; 822 make_hash $k, $v->{data64}, $v->{hash64};
814 823
815 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 824 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
816 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 825 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
817 826
818 my $stem = delete $v->{stem};
819 $v->{glyph} //= autoglyph $stem, $v;
820
821 if (my $magicmap = $v->{magicmap}) { 827 if (my $magicmap = $v->{magicmap}) {
822 $magicmap =~ y/A-Z_\-/a-z/d; 828 $magicmap =~ y/A-Z_\-/a-z/d;
823 $v->{magicmap} = $COLOR{$magicmap}; 829 $v->{magicmap} = $COLOR{$magicmap};
824 } 830 }
831
832 my $stem = delete $v->{stem};
833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
825 836
826 delete $v->{arc}; 837 delete $v->{arc};
827 } 838 }
828 839
829 print "processing resources...\n" if $VERBOSE; 840 print "processing resources...\n" if $VERBOSE;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines