--- deliantra/server/lib/collect.pl.in 2006/05/11 20:31:10 1.3 +++ deliantra/server/lib/collect.pl.in 2007/01/02 22:27:24 1.4 @@ -172,14 +172,14 @@ local($lface,@values) = @_; if ($values[0] ne "") { -# blank.111 is a special case - +# blank.x11 is a special case - # since no foreground pixels will actually be drawn, foreground colors is -# not relevant. Several monsters use blank.111 as part of their +# not relevant. Several monsters use blank.x11 as part of their # animation to make them appear invisible, but have some other # foreground color set. # Same applies to empty also. - if ($fg{$lface} && $fg{$lface} ne $values[0] && $lface ne "blank.111" - && $lface ne "empty.111") { + if ($fg{$lface} && $fg{$lface} ne $values[0] && $lface ne "blank.x11" + && $lface ne "empty.x11") { &warn($arch." duplicate fg color ".$fg{$lface}."/".$values[0]." face ".$lface); } else { $fg{$lface} = $values[0]; @@ -192,8 +192,8 @@ $bg{$lface} = $values[1]; } } - if ($values[2] ne "" && $lface ne "blank.111" && $lface ne "empty.111") { -# blank.111 is a special case - see above explanation + if ($values[2] ne "" && $lface ne "blank.x11" && $lface ne "empty.x11") { +# blank.x11 is a special case - see above explanation # Its visibility is always 0. if ($visibility{$lface} && $visibility{$lface} ne $values[2]) { &warn($arch." duplicate visibilty ".$visibility{$lface}."/".$values[2]." face ".$lface); @@ -201,7 +201,7 @@ $visibility{$lface} = $values[2]; } } - if ($values[3] ne "" && lface ne "blank.111" && $lface ne "empty.111") { + if ($values[3] ne "" && lface ne "blank.x11" && $lface ne "empty.x11") { if ($magicmap{$lface} && $magicmap{$lface} ne $values[3]) { &warn($arch." duplicate magicmap color ".$magicmap{$lface}."/".$values[3]." face ".$lface); } else { @@ -367,18 +367,18 @@ sub bmapsOut { &pheader; $idx = 0; - &pline("bug.111"); + &pline("bug.x11"); foreach $face (sort(keys %faces)) { - &pline($face) if $face !~ /bug\.111/; + &pline($face) if $face !~ /bug\.x11/; } } sub pathsOut { &pheader; $idx = 0; - &opline($root."/system/bug.111"); + &opline($root."/system/bug.x11"); foreach $face (sort(keys %faces)) { - &opline($faces{$face}) if $faces{$face} !~ /bug\.111/; + &opline($faces{$face}) if $faces{$face} !~ /bug\.x11/; } }