… | |
… | |
179 | warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
179 | warn "$path: <$base> not referenced by any archetype, skipping.\n"; |
180 | next; |
180 | next; |
181 | } |
181 | } |
182 | |
182 | |
183 | my $arc = $FACEINFO{$base}{arc} |
183 | my $arc = $FACEINFO{$base}{arc} |
184 | or die "FATAL: internal error, cannot continue"; |
184 | or die "FATAL: internal error <$base>, cannot continue"; |
185 | |
185 | |
186 | unless ($path =~ /~$/) { |
186 | unless ($path =~ /~$/) { |
187 | # possibly enlarge |
187 | # possibly enlarge |
188 | if (0 > aio_stat "$stem.64x64.png") { |
188 | if (0 > aio_stat "$stem.64x64.png") { |
189 | my $other = "$stem.64x64.png~"; |
189 | my $other = "$stem.64x64.png~"; |
… | |
… | |
199 | my ($wall_pfx, $wall_dir, $wall_sfx); |
199 | my ($wall_pfx, $wall_dir, $wall_sfx); |
200 | |
200 | |
201 | if ( |
201 | if ( |
202 | !$is_floor |
202 | !$is_floor |
203 | && !$arc->{alive} |
203 | && !$arc->{alive} |
204 | && $arc->{no_pass} |
204 | && $arc->{move_block} eq "all" |
205 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
205 | && $path =~ /^(.*_)([0-9A-F])(\.x11.*\.png)$/ |
206 | ) { |
206 | ) { |
207 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
207 | ($wall_pfx, $wall_dir, $wall_sfx) = ($1, hex $2, $3); |
208 | |
208 | |
209 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
209 | unless (grep { !-e sprintf "%s%X%s", $wall_pfx, $_, $wall_sfx } 0..15) { |
… | |
… | |
427 | frames => \@frames, |
427 | frames => \@frames, |
428 | }; |
428 | }; |
429 | } |
429 | } |
430 | |
430 | |
431 | for my $face ($o->{face} || (), @{$anim || []}) { |
431 | for my $face ($o->{face} || (), @{$anim || []}) { |
432 | next if $face =~ /^facings\s|^blank.x11$|^empty.x11$/; |
432 | next if $face =~ /^facings\s/; |
433 | |
433 | |
434 | my $info = $FACEINFO{$face} ||= {}; |
434 | my $info = $FACEINFO{$face} ||= { }; |
435 | |
|
|
436 | $info->{arc} = $o; |
435 | $info->{arc} = $o; |
|
|
436 | |
|
|
437 | next if $face =~ /^blank.x11$|^empty.x11$/; |
|
|
438 | |
437 | $info->{visibility} = $visibility if defined $visibility; |
439 | $info->{visibility} = $visibility if defined $visibility; |
438 | $info->{magicmap} = $magicmap if defined $magicmap; |
440 | $info->{magicmap} = $magicmap if defined $magicmap; |
439 | } |
441 | } |
440 | |
442 | |
441 | if (my $smooth = delete $o->{smoothface}) { |
443 | if (my $smooth = delete $o->{smoothface}) { |