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

Comparing deliantra/server/lib/collect.pl.in (file contents):
Revision 1.3 by root, Thu May 11 20:31:10 2006 UTC vs.
Revision 1.4 by pippijn, Tue Jan 2 22:27:24 2007 UTC

170 170
171sub storeFaceInfo { 171sub storeFaceInfo {
172 local($lface,@values) = @_; 172 local($lface,@values) = @_;
173 173
174 if ($values[0] ne "") { 174 if ($values[0] ne "") {
175# blank.111 is a special case - 175# blank.x11 is a special case -
176# since no foreground pixels will actually be drawn, foreground colors is 176# since no foreground pixels will actually be drawn, foreground colors is
177# not relevant. Several monsters use blank.111 as part of their 177# not relevant. Several monsters use blank.x11 as part of their
178# animation to make them appear invisible, but have some other 178# animation to make them appear invisible, but have some other
179# foreground color set. 179# foreground color set.
180# Same applies to empty also. 180# Same applies to empty also.
181 if ($fg{$lface} && $fg{$lface} ne $values[0] && $lface ne "blank.111" 181 if ($fg{$lface} && $fg{$lface} ne $values[0] && $lface ne "blank.x11"
182 && $lface ne "empty.111") { 182 && $lface ne "empty.x11") {
183 &warn($arch." duplicate fg color ".$fg{$lface}."/".$values[0]." face ".$lface); 183 &warn($arch." duplicate fg color ".$fg{$lface}."/".$values[0]." face ".$lface);
184 } else { 184 } else {
185 $fg{$lface} = $values[0]; 185 $fg{$lface} = $values[0];
186 } 186 }
187 } 187 }
190 &warn($arch." duplicate bg color ".$bg{$lface}."/".$values[1]." face ".$lface); 190 &warn($arch." duplicate bg color ".$bg{$lface}."/".$values[1]." face ".$lface);
191 } else { 191 } else {
192 $bg{$lface} = $values[1]; 192 $bg{$lface} = $values[1];
193 } 193 }
194 } 194 }
195 if ($values[2] ne "" && $lface ne "blank.111" && $lface ne "empty.111") { 195 if ($values[2] ne "" && $lface ne "blank.x11" && $lface ne "empty.x11") {
196# blank.111 is a special case - see above explanation 196# blank.x11 is a special case - see above explanation
197# Its visibility is always 0. 197# Its visibility is always 0.
198 if ($visibility{$lface} && $visibility{$lface} ne $values[2]) { 198 if ($visibility{$lface} && $visibility{$lface} ne $values[2]) {
199 &warn($arch." duplicate visibilty ".$visibility{$lface}."/".$values[2]." face ".$lface); 199 &warn($arch." duplicate visibilty ".$visibility{$lface}."/".$values[2]." face ".$lface);
200 } else { 200 } else {
201 $visibility{$lface} = $values[2]; 201 $visibility{$lface} = $values[2];
202 } 202 }
203 } 203 }
204 if ($values[3] ne "" && lface ne "blank.111" && $lface ne "empty.111") { 204 if ($values[3] ne "" && lface ne "blank.x11" && $lface ne "empty.x11") {
205 if ($magicmap{$lface} && $magicmap{$lface} ne $values[3]) { 205 if ($magicmap{$lface} && $magicmap{$lface} ne $values[3]) {
206 &warn($arch." duplicate magicmap color ".$magicmap{$lface}."/".$values[3]." face ".$lface); 206 &warn($arch." duplicate magicmap color ".$magicmap{$lface}."/".$values[3]." face ".$lface);
207 } else { 207 } else {
208 $magicmap{$lface} = $values[3]; 208 $magicmap{$lface} = $values[3];
209 } 209 }
365} 365}
366 366
367sub bmapsOut { 367sub bmapsOut {
368 &pheader; 368 &pheader;
369 $idx = 0; 369 $idx = 0;
370 &pline("bug.111"); 370 &pline("bug.x11");
371 foreach $face (sort(keys %faces)) { 371 foreach $face (sort(keys %faces)) {
372 &pline($face) if $face !~ /bug\.111/; 372 &pline($face) if $face !~ /bug\.x11/;
373 } 373 }
374} 374}
375 375
376sub pathsOut { 376sub pathsOut {
377 &pheader; 377 &pheader;
378 $idx = 0; 378 $idx = 0;
379 &opline($root."/system/bug.111"); 379 &opline($root."/system/bug.x11");
380 foreach $face (sort(keys %faces)) { 380 foreach $face (sort(keys %faces)) {
381 &opline($faces{$face}) if $faces{$face} !~ /bug\.111/; 381 &opline($faces{$face}) if $faces{$face} !~ /bug\.x11/;
382 } 382 }
383} 383}
384 384
385sub treasuresOut { 385sub treasuresOut {
386 foreach $treasure (@treasure_files) { 386 foreach $treasure (@treasure_files) {

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines