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.88 by root, Tue Oct 5 23:26:44 2010 UTC vs.
Revision 1.96 by root, Wed Oct 6 00:28:15 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
172 } elsif ($stem =~ /^monster.*\/(.)/) {
173 $1
174
167 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { 175 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
168 "." 176 "."
177
169 } elsif ($stem =~ /^player\//) { 178 } elsif ($stem =~ /^player\//) {
170 "@" 179 "\@"
180
171 } else { 181 } else {
172 substr $stem, 0, 1 182 substr $stem, 0, 1
173 } 183 }
174} 184}
175 185
815 make_hash $k, $v->{data64}, $v->{hash64}; 825 make_hash $k, $v->{data64}, $v->{hash64};
816 826
817 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n"; 827 #length $v->{data32} <= 10000 or warn "$k: face32 larger than 10000 bytes, will not work with crossfire client.\n";
818 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n"; 828 #length $v->{data64} <= 10000 or warn "$k: face64 larger than 10000 bytes.\n";
819 829
820 my $stem = delete $v->{stem};
821 $v->{glyph} //= autoglyph $stem, $v;
822
823 if (my $magicmap = $v->{magicmap}) { 830 if (my $magicmap = $v->{magicmap}) {
824 $magicmap =~ y/A-Z_\-/a-z/d; 831 $magicmap =~ y/A-Z_\-/a-z/d;
825 $v->{magicmap} = $COLOR{$magicmap}; 832 $v->{magicmap} = $COLOR{$magicmap};
826 } 833 }
834
835 my $stem = delete $v->{stem};
836 $v->{glyph} //= autoglyph $stem, $v;
837 utf8::encode $v->{glyph};
838 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
827 839
828 delete $v->{arc}; 840 delete $v->{arc};
829 } 841 }
830 842
831 print "processing resources...\n" if $VERBOSE; 843 print "processing resources...\n" if $VERBOSE;

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines