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.108 by elmex, Wed May 23 20:21:28 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}) {
… …
352 # check whether attachment is the same as in the archetype 365 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 366 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 367 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 368 my $js = JSON::XS->new->utf8->canonical (1);
356 369
370 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 371 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 372 delete $ob->{attach}
359 } 373 }
360 } 374 }
361 375
362 # 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
… …
374 388
375 # convert movement strings to bitsets 389 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 390 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 391 next unless exists $ob->{$attr};
378 392
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 393 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 394 }
381 395
382 # convert outdated movement flags to new movement sets 396 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 397 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 398 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
385 } 399 }
386 if (defined (my $v = delete $ob->{slow_move})) { 400 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 401 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 402 $ob->{move_slow_penalty} = $v;
389 } 403 }
390 if (defined (my $v = delete $ob->{walk_on})) { 404 if (defined (my $v = delete $ob->{walk_on})) {
391 $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" }
392 } 406 }
393 if (defined (my $v = delete $ob->{walk_off})) { 407 if (defined (my $v = delete $ob->{walk_off})) {
394 $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" }
395 } 409 }
396 if (defined (my $v = delete $ob->{fly_on})) { 410 if (defined (my $v = delete $ob->{fly_on})) {
397 $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" }
398 } 412 }
399 if (defined (my $v = delete $ob->{fly_off})) { 413 if (defined (my $v = delete $ob->{fly_off})) {
400 $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" }
401 } 415 }
402 if (defined (my $v = delete $ob->{flying})) { 416 if (defined (my $v = delete $ob->{flying})) {
403 $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" }
404 } 418 }
405 419
406 # convert idiotic event_xxx things into objects 420 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 421 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 422 if (exists $ob->{"event_${event}_plugin"}) {
… …
424# arch as in "arch xxx", ie.. objects 438# arch as in "arch xxx", ie.. objects
425sub normalize_arch($) { 439sub normalize_arch($) {
426 my ($ob) = @_; 440 my ($ob) = @_;
427 441
428 normalize_object $ob; 442 normalize_object $ob;
443
444 return if $ob->{_atype} eq "object";
429 445
430 my $arch = $ARCH{$ob->{_name}} 446 my $arch = $ARCH{$ob->{_name}}
431 or (warn "$ob->{_name}: no such archetype", return $ob); 447 or (warn "$ob->{_name}: no such archetype", return $ob);
432 448
433 if ($arch->{type} == 22) { # map 449 if ($arch->{type} == 22) { # map
… …
469} 485}
470 486
471sub attr_thaw($) { 487sub attr_thaw($) {
472 my ($ob) = @_; 488 my ($ob) = @_;
473 489
474 $ob->{attach} = from_json $ob->{attach} 490 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 491 if exists $ob->{attach};
476 492
477 $ob 493 $ob
478} 494}
479 495
480sub attr_freeze($) { 496sub attr_freeze($) {
481 my ($ob) = @_; 497 my ($ob) = @_;
482 498
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 499 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 500 if exists $ob->{attach};
485 501
486 $ob 502 $ob
487} 503}
488 504
… …
508 524
509 my %arc; 525 my %arc;
510 my ($more, $prev); 526 my ($more, $prev);
511 my $comment; 527 my $comment;
512 528
513 open my $fh, "<:raw:perlio:utf8", $path 529 open my $fh, "<:utf8", $path
514 or Carp::croak "$path: $!"; 530 or Carp::croak "$path: $!";
515 531
516# binmode $fh; 532# binmode $fh;
517 533
518 my $parse_block; $parse_block = sub { 534 my $parse_block; $parse_block = sub {
… …
618 my $str; 634 my $str;
619 635
620 my $append; $append = sub { 636 my $append; $append = sub {
621 my %a = %{$_[0]}; 637 my %a = %{$_[0]};
622 638
623 Crossfire::attr_freeze \%a; 639 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 640 Deliantra::normalize_arch \%a;
625 641
626 # undo the bit-split we did before 642 # undo the bit-split we did before
627 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}) {
628 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 644 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 645 | (delete $a{attack_movement_bits_4_7});
… …
647 } 663 }
648 664
649 my @kv; 665 my @kv;
650 666
651 for ($a{_name} eq "map" 667 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 668 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 669 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 670 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 671 if exists $a{$_};
656 } 672 }
657 673
658 for (sort keys %a) { 674 for (sort keys %a) {
… …
661 } 677 }
662 678
663 for (@kv) { 679 for (@kv) {
664 my ($k, $v) = @$_; 680 my ($k, $v) = @$_;
665 681
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 682 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 683 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 684 $str .= "$k\n$v\n$end\n";
669 } else { 685 } else {
670 $str .= "$k $v\n"; 686 $str .= "$k $v\n";
671 } 687 }
… …
767=cut 783=cut
768 784
769sub arch_attr($) { 785sub arch_attr($) {
770 my ($obj) = @_; 786 my ($obj) = @_;
771 787
772 require Crossfire::Data; 788 require Deliantra::Data;
773 789
774 my $root; 790 my $root;
775 my $attr = { }; 791 my $attr = { };
776 792
777 my $arch = $ARCH{ $obj->{_name} }; 793 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 794 my $type = $obj->{type} || $arch->{type};
779 795
780 if ($type > 0) { 796 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 797 $root = $Deliantra::Data::ATTR{$type};
782 } else { 798 } else {
783 my %a = (%$arch, %$obj); 799 my %a = (%$arch, %$obj);
784 800
785 if ($a{is_floor} && !$a{alive}) { 801 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 802 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 804 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 805 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 806 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 807 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 808 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 809 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 810 $root = $Deliantra::Data::TYPE{Misc};
795 } 811 }
796 } 812 }
797 813
798 my @import = ($root); 814 my @import = ($root);
799 815
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 816 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 817 unless $type == 116;
802 818
803 my (%ignore); 819 my (%ignore);
804 my (@section_order, %section, @attr_order); 820 my (@section_order, %section, @attr_order);
805 821
806 while (my $type = shift @import) { 822 while (my $type = shift @import) {
823 push @import,
824 grep $_,
825 map $Deliantra::Data::TYPE{$_},
807 push @import, @{$type->{import} || []}; 826 @{$type->{import} || []};
808 827
809 $attr->{$_} ||= $type->{$_} 828 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 829 for qw(name desc use);
811 830
812 for (@{$type->{ignore} || []}) { 831 for (@{$type->{ignore} || []}) {
… …
901} 920}
902 921
903sub construct_tilecache_pb { 922sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 923 my ($idx, $cache) = @_;
905 924
906 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;
907 926
908 while (my ($name, $tile) = each %$cache) { 927 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 928 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 929 my $ofs = $tile->{idx};
911 930
912 for my $x (0 .. $tile->{w} - 1) { 931 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 932 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 933 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 934 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 935 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 936 }
918 } 937 }
919 } 938 }
920 939
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 940 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 956=cut
938 957
939sub load_tilecache() { 958sub load_tilecache() {
940 require Gtk2; 959 require Gtk2;
941 960
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
944 sub {
945 my $tile = read_pak "$LIB/crossfire.0";
946
947 my %cache;
948
949 my $idx = 0;
950
951 for my $name (sort keys %$tile) {
952 my $pb = new Gtk2::Gdk::PixbufLoader;
953 $pb->write ($tile->{$name});
954 $pb->close;
955 my $pb = $pb->get_pixbuf;
956
957 my $tile = $cache{$name} = {
958 pb => $pb,
959 idx => $idx,
960 w => int $pb->get_width / TILESIZE,
961 h => int $pb->get_height / TILESIZE,
962 };
963
964 $idx += $tile->{w} * $tile->{h};
965 }
966
967 construct_tilecache_pb $idx, \%cache;
968
969 \%cache
970 };
971
972 } else { # Crossfire+ version
973 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 961 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub { 962 sub {
975 my %cache; 963 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata"; 964 my $facedata = Storable::retrieve "$LIB/facedata";
977 965
978 $facedata->{version} == 2 966 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed."; 967 or die "$LIB/facedata: version mismatch, cannot proceed.";
980 968
981 my $faces = $facedata->{faceinfo}; 969 my $faces = $facedata->{faceinfo};
982 my $idx = 0; 970 my $idx = 0;
983 971
984 for (sort keys %$faces) { 972 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_}); 973 my ($face, $info) = ($_, $faces->{$_});
986 974
987 my $pb = new Gtk2::Gdk::PixbufLoader; 975 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32}); 976 $pb->write ($info->{data32});
989 $pb->close; 977 $pb->close;
990 my $pb = $pb->get_pixbuf; 978 my $pb = $pb->get_pixbuf;
991 979
992 my $tile = $cache{$face} = { 980 my $tile = $cache{$face} = {
993 pb => $pb, 981 pb => $pb,
994 idx => $idx, 982 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 983 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 984 h => int $pb->get_height / TILESIZE,
997 }; 985 };
998 986
999 $idx += $tile->{w} * $tile->{h}; 987 $idx += $tile->{w} * $tile->{h};
1000 } 988 }
1001 989
1002 construct_tilecache_pb $idx, \%cache; 990 construct_tilecache_pb $idx, \%cache;
1003 991
1004 \%cache 992 \%cache
1005 }; 993 };
1006 }
1007} 994}
995
996=back
1008 997
1009=head1 AUTHOR 998=head1 AUTHOR
1010 999
1011 Marc Lehmann <schmorp@schmorp.de> 1000 Marc Lehmann <schmorp@schmorp.de>
1012 http://home.schmorp.de/ 1001 http://home.schmorp.de/
… …
1015 http://www.ta-sa.org/ 1004 http://www.ta-sa.org/
1016 1005
1017=cut 1006=cut
1018 1007
10191 10081
1009

Diff Legend

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