ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/Deliantra/Deliantra.pm
(Generate patch)

Comparing deliantra/Deliantra/Deliantra.pm (file contents):
Revision 1.107 by root, Wed May 9 11:44:40 2007 UTC vs.
Revision 1.135 by root, Tue Nov 3 14:56:58 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.98'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::XS qw(from_json to_json); 29use JSON::XS qw(decode_json encode_json);
25 30
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
27 32
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
31 36
32mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
33 38
34sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
35 41
36our %ARCH; 42our %ARCH;
43our %FACE; # face32
37our %FACE; 44our %FACEDATA;
38our $TILE; 45our $TILE;
39 46
40our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
41 msg => "endmsg", 48 msg => "endmsg",
42 lore => "endlore", 49 lore => "endlore",
… …
64 71
65 elevation 72 elevation
66 73
67 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 75 slaying skill msg lore other_arch
69 face animation is_animated 76 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 77 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 78 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 80 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
146 boat => MOVE_BOAT, 153 boat => MOVE_BOAT,
147 ship => MOVE_SHIP, 154 ship => MOVE_SHIP,
148 all => MOVE_ALL, 155 all => MOVE_ALL,
149); 156);
150 157
151our @MOVE_TYPE = keys %MOVE_TYPE; 158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
152 159
153{ 160{
154 package Crossfire::MoveType; 161 package Deliantra::MoveType;
155 162
156 use overload 163 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 165 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 166 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
… …
177 $_[0] 184 $_[0]
178 }, 185 },
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 186 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 187 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 188 ;
182}
183 189
184sub Crossfire::MoveType::new { 190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 196 my ($class, $string) = @_;
186 197
187 my $mask; 198 my $mask;
188 my $value; 199 my $value;
189 200
… …
203 } 214 }
204 215
205 (bless [$mask, $value], $class)->normalise 216 (bless [$mask, $value], $class)->normalise
206} 217}
207 218
208sub Crossfire::MoveType::normalise { 219sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 220 my ($self) = @_;
210 221
211 if ($self->[0] & MOVE_ALL) { 222 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 224 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 228 $self->[1] &= $self->[0];
218 229
219 $self 230 $self
220} 231}
221 232
222sub Crossfire::MoveType::as_string { 233sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 234 my ($self) = @_;
224 235
225 my @res; 236 my @res;
226 237
227 my ($mask, $value) = @$self; 238 my ($mask, $value) = @$self;
228 239
229 for (@Crossfire::MOVE_TYPE) { 240 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 241 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 243 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 244 push @res, $value & $bit ? $_ : "-$_";
234 } 245 }
235 } 246 }
… …
328 339
329# object as in "Object xxx", i.e. archetypes 340# object as in "Object xxx", i.e. archetypes
330sub normalize_object($) { 341sub normalize_object($) {
331 my ($ob) = @_; 342 my ($ob) = @_;
332 343
344 delete $ob->{editable}; # deprecated
345
333 # convert material bitset to materialname, if possible 346 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) { 347 if (exists $ob->{material}) {
335 if (!$ob->{material}) { 348 if (!$ob->{material}) {
336 delete $ob->{material}; 349 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) { 350 } elsif (exists $ob->{materialname}) {
… …
347 } else { 360 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 361 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 } 362 }
350 } 363 }
351 364
365 # check whether attachment is the same as in the archetype
366 if (exists $ob->{attach}) {
367 my $arch = $ARCH{$ob->{_name}};
368 my $js = JSON::XS->new->utf8->canonical (1);
369
370 if (defined $arch->{attach}
371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
372 delete $ob->{attach}
373 }
374 }
375
352 # color_fg is used as default for magicmap if magicmap does not exist 376 # color_fg is used as default for magicmap if magicmap does not exist
353 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 377 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354 378
355 # nuke outdated or never supported fields 379 # nuke outdated or never supported fields
356 delete @$ob{qw( 380 delete @$ob{qw(
… …
364 388
365 # convert movement strings to bitsets 389 # convert movement strings to bitsets
366 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
367 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
368 392
369 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 393 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
370 } 394 }
371 395
372 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
373 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
375 } 399 }
376 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
377 $ob->{move_slow} += "walk"; 401 $ob->{move_slow} += "walk";
378 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
379 } 403 }
380 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
381 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 405 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
382 } 406 }
383 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
384 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 408 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
385 } 409 }
386 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
387 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
388 } 412 }
389 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
390 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
391 } 415 }
392 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
393 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 417 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
394 } 418 }
395 419
396 # convert idiotic event_xxx things into objects 420 # convert idiotic event_xxx things into objects
397 while (my ($event, $subtype) = each %EVENT_TYPE) { 421 while (my ($event, $subtype) = each %EVENT_TYPE) {
398 if (exists $ob->{"event_${event}_plugin"}) { 422 if (exists $ob->{"event_${event}_plugin"}) {
… …
414# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
415sub normalize_arch($) { 439sub normalize_arch($) {
416 my ($ob) = @_; 440 my ($ob) = @_;
417 441
418 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
419 445
420 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
421 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
422 448
423 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
459} 485}
460 486
461sub attr_thaw($) { 487sub attr_thaw($) {
462 my ($ob) = @_; 488 my ($ob) = @_;
463 489
464 $ob->{attach} = from_json $ob->{attach} 490 $ob->{attach} = decode_json $ob->{attach}
465 if exists $ob->{attach}; 491 if exists $ob->{attach};
466 492
467 $ob 493 $ob
468} 494}
469 495
470sub attr_freeze($) { 496sub attr_freeze($) {
471 my ($ob) = @_; 497 my ($ob) = @_;
472 498
473 $ob->{attach} = Crossfire::to_json $ob->{attach} 499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
474 if exists $ob->{attach}; 500 if exists $ob->{attach};
475 501
476 $ob 502 $ob
477} 503}
478 504
… …
498 524
499 my %arc; 525 my %arc;
500 my ($more, $prev); 526 my ($more, $prev);
501 my $comment; 527 my $comment;
502 528
503 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
504 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
505 531
506# binmode $fh; 532# binmode $fh;
507 533
508 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
608 my $str; 634 my $str;
609 635
610 my $append; $append = sub { 636 my $append; $append = sub {
611 my %a = %{$_[0]}; 637 my %a = %{$_[0]};
612 638
613 Crossfire::attr_freeze \%a; 639 Deliantra::attr_freeze \%a;
614 Crossfire::normalize_arch \%a; 640 Deliantra::normalize_arch \%a;
615 641
616 # undo the bit-split we did before 642 # undo the bit-split we did before
617 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 643 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
618 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
619 | (delete $a{attack_movement_bits_4_7}); 645 | (delete $a{attack_movement_bits_4_7});
… …
637 } 663 }
638 664
639 my @kv; 665 my @kv;
640 666
641 for ($a{_name} eq "map" 667 for ($a{_name} eq "map"
642 ? @Crossfire::FIELD_ORDER_MAP 668 ? @Deliantra::FIELD_ORDER_MAP
643 : @Crossfire::FIELD_ORDER) { 669 : @Deliantra::FIELD_ORDER) {
644 push @kv, [$_, delete $a{$_}] 670 push @kv, [$_, delete $a{$_}]
645 if exists $a{$_}; 671 if exists $a{$_};
646 } 672 }
647 673
648 for (sort keys %a) { 674 for (sort keys %a) {
… …
651 } 677 }
652 678
653 for (@kv) { 679 for (@kv) {
654 my ($k, $v) = @$_; 680 my ($k, $v) = @$_;
655 681
656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
657 $v =~ s/\n$//; 683 $v =~ s/\n$//;
658 $str .= "$k\n$v\n$end\n"; 684 $str .= "$k\n$v\n$end\n";
659 } else { 685 } else {
660 $str .= "$k $v\n"; 686 $str .= "$k $v\n";
661 } 687 }
… …
757=cut 783=cut
758 784
759sub arch_attr($) { 785sub arch_attr($) {
760 my ($obj) = @_; 786 my ($obj) = @_;
761 787
762 require Crossfire::Data; 788 require Deliantra::Data;
763 789
764 my $root; 790 my $root;
765 my $attr = { }; 791 my $attr = { };
766 792
767 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
768 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
769 795
770 if ($type > 0) { 796 if ($type > 0) {
771 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
772 } else { 798 } else {
773 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
774 800
775 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
776 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
777 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
778 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
779 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
780 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
781 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
782 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
783 } else { 809 } else {
784 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
785 } 811 }
786 } 812 }
787 813
788 my @import = ($root); 814 my @import = ($root);
789 815
790 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
791 unless $type == 116; 817 unless $type == 116;
792 818
793 my (%ignore); 819 my (%ignore);
794 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
795 821
796 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
797 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
798 827
799 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
800 for qw(name desc use); 829 for qw(name desc use);
801 830
802 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
891} 920}
892 921
893sub construct_tilecache_pb { 922sub construct_tilecache_pb {
894 my ($idx, $cache) = @_; 923 my ($idx, $cache) = @_;
895 924
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 925 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
897 926
898 while (my ($name, $tile) = each %$cache) { 927 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb}; 928 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx}; 929 my $ofs = $tile->{idx};
901 930
902 for my $x (0 .. $tile->{w} - 1) { 931 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) { 932 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w}; 933 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 935 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
907 } 936 }
908 } 937 }
909 } 938 }
910 939
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
927=cut 956=cut
928 957
929sub load_tilecache() { 958sub load_tilecache() {
930 require Gtk2; 959 require Gtk2;
931 960
932 if (-e "$LIB/crossfire.0") { # Crossfire1 version
933 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
934 sub {
935 my $tile = read_pak "$LIB/crossfire.0";
936
937 my %cache;
938
939 my $idx = 0;
940
941 for my $name (sort keys %$tile) {
942 my $pb = new Gtk2::Gdk::PixbufLoader;
943 $pb->write ($tile->{$name});
944 $pb->close;
945 my $pb = $pb->get_pixbuf;
946
947 my $tile = $cache{$name} = {
948 pb => $pb,
949 idx => $idx,
950 w => int $pb->get_width / TILESIZE,
951 h => int $pb->get_height / TILESIZE,
952 };
953
954 $idx += $tile->{w} * $tile->{h};
955 }
956
957 construct_tilecache_pb $idx, \%cache;
958
959 \%cache
960 };
961
962 } else { # Crossfire+ version
963 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 961 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub { 962 sub {
965 my %cache; 963 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata"; 964 my $facedata = Storable::retrieve "$LIB/facedata";
967 965
968 $facedata->{version} == 2 966 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed."; 967 or die "$LIB/facedata: version mismatch, cannot proceed.";
970 968
971 my $faces = $facedata->{faceinfo}; 969 my $faces = $facedata->{faceinfo};
972 my $idx = 0; 970 my $idx = 0;
973 971
974 for (sort keys %$faces) { 972 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_}); 973 my ($face, $info) = ($_, $faces->{$_});
976 974
977 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32}); 976 $pb->write ($info->{data32});
979 $pb->close; 977 $pb->close;
980 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
981 979
982 my $tile = $cache{$face} = { 980 my $tile = $cache{$face} = {
983 pb => $pb, 981 pb => $pb,
984 idx => $idx, 982 idx => $idx,
985 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
987 }; 985 };
988 986
989 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
990 } 988 }
991 989
992 construct_tilecache_pb $idx, \%cache; 990 construct_tilecache_pb $idx, \%cache;
993 991
994 \%cache 992 \%cache
995 }; 993 };
996 }
997} 994}
995
996=back
998 997
999=head1 AUTHOR 998=head1 AUTHOR
1000 999
1001 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
1002 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
1005 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
1006 1005
1007=cut 1006=cut
1008 1007
10091 10081
1009

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines