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.91 by root, Tue Oct 5 23:52:52 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 = ( 161our @WALL_SUFFIX = qw(⬤ ╹ ╺ ┗ ╻ ┃ ┏ ┣ ╸ ┛ ━ ┻ ┓ ┫ ┳ ╋);
162 "0" => "⬤",
163 "1_3" => "╸",
164 "1_4" => "╺",
165 "2_1_2" => "━",
166
167 "1_2" => "╹",
168 "2_2_4" => "┛",
169 "2_2_1" => "┗",
170 "3_1" => "┻",
171
172 "1_1" => "╻",
173 "2_2_3" => "┓",
174 "2_2_2" => "┏",
175 "3_3" => "┳",
176
177 "2_1_1" => "┃",
178 "3_4" => "┫",
179 "3_2" => "┣",
180 "4" => "╋",
181);
182 162
183sub autoglyph { 163sub autoglyph {
184 my ($stem, $face) = @_; 164 my ($stem, $face) = @_;
185 165
186 if ($stem =~ /^wall\/|Nimwall/) { 166 if ($stem =~ /^wall\/|Nimwall/) {
187 while (my ($k, $v) = each %WALL_SUFFIX) { 167 return $WALL_SUFFIX[hex $1]
188 return $v if $stem =~ /_$k.x11/; 168 if $stem =~ /(_[0-9A-F]).x11/;
189 }
190 169
191 "+" 170 "+"
192 171
193 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) { 172 } elsif ($stem =~ /^floor\/|^ground\/|Nimfloor/) {
194 "." 173 "."
850 $v->{magicmap} = $COLOR{$magicmap}; 829 $v->{magicmap} = $COLOR{$magicmap};
851 } 830 }
852 831
853 my $stem = delete $v->{stem}; 832 my $stem = delete $v->{stem};
854 $v->{glyph} //= autoglyph $stem, $v; 833 $v->{glyph} //= autoglyph $stem, $v;
834 utf8::encode $v->{glyph};
855 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph}; 835 $v->{glyph} = (chr $v->{magicmap}) . $v->{glyph};
856 836
857 delete $v->{arc}; 837 delete $v->{arc};
858 } 838 }
859 839

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines