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.141 by root, Mon Mar 22 00:58:17 2010 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.30';
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 },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
160 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
161 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub { 175 'x=' => sub { # toggle between off, + and -
164 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) { 177 if (!defined $cur) {
166 if ($_[0] >= "all") { 178 if ($_[0] >= "all") {
167 $_[0] -= $_[1]; 179 $_[0] -= $_[1];
168 } else { 180 } else {
… …
177 $_[0] 189 $_[0]
178 }, 190 },
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 191 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 192 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 193 ;
182}
183 194
184sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 201 my ($class, $string) = @_;
186 202
187 my $mask; 203 my $mask;
188 my $value; 204 my $value;
189 205
… …
203 } 219 }
204 220
205 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
206} 222}
207 223
208sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 225 my ($self) = @_;
210 226
211 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
218 234
219 $self 235 $self
220} 236}
221 237
222sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 239 my ($self) = @_;
224 240
225 my @res; 241 my @res;
226 242
227 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
228 244
229 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 248 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
234 } 250 }
235 } 251 }
… …
328 344
329# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
330sub normalize_object($) { 346sub normalize_object($) {
331 my ($ob) = @_; 347 my ($ob) = @_;
332 348
349 delete $ob->{editable}; # deprecated
350
333 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
335 if (!$ob->{material}) { 353 if (!$ob->{material}) {
336 delete $ob->{material}; 354 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
352 # check whether attachment is the same as in the archetype 370 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 371 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 372 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 373 my $js = JSON::XS->new->utf8->canonical (1);
356 374
375 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 377 delete $ob->{attach}
359 } 378 }
360 } 379 }
361 380
362 # color_fg is used as default for magicmap if magicmap does not exist 381 # color_fg is used as default for magicmap if magicmap does not exist
… …
374 393
375 # convert movement strings to bitsets 394 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
378 397
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 399 }
381 400
382 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
385 } 404 }
386 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
389 } 408 }
390 if (defined (my $v = delete $ob->{walk_on})) { 409 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" } 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
392 } 411 }
393 if (defined (my $v = delete $ob->{walk_off})) { 412 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" } 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
395 } 414 }
396 if (defined (my $v = delete $ob->{fly_on})) { 415 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" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
398 } 417 }
399 if (defined (my $v = delete $ob->{fly_off})) { 418 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" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
401 } 420 }
402 if (defined (my $v = delete $ob->{flying})) { 421 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" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
404 } 423 }
405 424
406 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
424# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
425sub normalize_arch($) { 444sub normalize_arch($) {
426 my ($ob) = @_; 445 my ($ob) = @_;
427 446
428 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
429 450
430 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
431 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
432 453
433 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
469} 490}
470 491
471sub attr_thaw($) { 492sub attr_thaw($) {
472 my ($ob) = @_; 493 my ($ob) = @_;
473 494
474 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 496 if exists $ob->{attach};
476 497
477 $ob 498 $ob
478} 499}
479 500
480sub attr_freeze($) { 501sub attr_freeze($) {
481 my ($ob) = @_; 502 my ($ob) = @_;
482 503
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 505 if exists $ob->{attach};
485 506
486 $ob 507 $ob
487} 508}
488 509
… …
508 529
509 my %arc; 530 my %arc;
510 my ($more, $prev); 531 my ($more, $prev);
511 my $comment; 532 my $comment;
512 533
513 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
514 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
515 536
516# binmode $fh; 537# binmode $fh;
517 538
518 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
618 my $str; 639 my $str;
619 640
620 my $append; $append = sub { 641 my $append; $append = sub {
621 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
622 643
623 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
625 646
626 # undo the bit-split we did before 647 # undo the bit-split we did before
627 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 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}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
647 } 668 }
648 669
649 my @kv; 670 my @kv;
650 671
651 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 676 if exists $a{$_};
656 } 677 }
657 678
658 for (sort keys %a) { 679 for (sort keys %a) {
… …
661 } 682 }
662 683
663 for (@kv) { 684 for (@kv) {
664 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
665 686
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 688 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
669 } else { 690 } else {
670 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
671 } 692 }
… …
767=cut 788=cut
768 789
769sub arch_attr($) { 790sub arch_attr($) {
770 my ($obj) = @_; 791 my ($obj) = @_;
771 792
772 require Crossfire::Data; 793 require Deliantra::Data;
773 794
774 my $root; 795 my $root;
775 my $attr = { }; 796 my $attr = { };
776 797
777 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
779 800
780 if ($type > 0) { 801 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
782 } else { 803 } else {
783 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
784 805
785 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 814 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
795 } 816 }
796 } 817 }
797 818
819 my (%ignore);
798 my @import = ($root); 820 my @import = ($root);
821
822 my @new_import;
823 while (my $type = shift @import) {
824 # first import everything we will need:
825 push @import,
826 grep $_,
827 map $Deliantra::Data::TYPE{$_},
828 @{$type->{import} || []};
829
830 # and compute the ignored attributes
831 for (@{$type->{ignore} || []}) {
832 $ignore{$_}++ for ref $_ ? @$_ : $_;
833 }
834
835 push @new_import, $type;
799 836 }
837 (@import) = @new_import;
838
839 # then add defaults to the back of the list, so they are added
840 # as last resort.
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 841 push @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 842 unless $type == 116;
802 843
803 my (%ignore);
804 my (@section_order, %section, @attr_order); 844 my (@section_order, %section, @attr_order);
805 845
846 # @import = root, imported, default
806 while (my $type = shift @import) { 847 while (my $type = pop @import) {
807 push @import, @{$type->{import} || []};
808
809 $attr->{$_} ||= $type->{$_} 848 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 849 for qw(name desc use);
811
812 for (@{$type->{ignore} || []}) {
813 $ignore{$_}++ for ref $_ ? @$_ : $_;
814 }
815 850
816 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 851 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
817 my ($name, $attr) = @$_; 852 my ($name, $attr) = @$_;
818 push @section_order, $name; 853 push @section_order, $name;
819 for (@$attr) { 854 for (@$attr) {
820 my ($k, $v) = @$_; 855 my ($k, $v) = @$_;
821 push @attr_order, $k; 856 push @attr_order, $k;
822 $section{$name}{$k} ||= $v; 857 $section{$name}{$k} = $v; # overwrite, so that the root decides
823 }
824 } 858 }
859 }
860 }
861
862 # remove ignores for "root" type
863 for (
864 map @{$_->[1]}, # section attributes
865 [general => ($root->{attr} || [])],
866 @{$root->{section} || []}
867 ) {
868 my ($k, $v) = @$_;
869 # skip fixed attributes, if they are ignored thats fine
870 next if $v->{type} eq 'fixed';
871
872 delete $ignore{$k}; # if the attributes are defined explicitly they
873 # should NOT be ignored. ignore should mainly
874 # hit imported/inherited attributes.
825 } 875 }
826 876
827 $attr->{section} = [ 877 $attr->{section} = [
828 map !exists $section{$_} ? () : do { 878 map !exists $section{$_} ? () : do {
829 my $attr = delete $section{$_}; 879 my $attr = delete $section{$_};
… …
833 map exists $attr->{$_} && !$ignore{$_} 883 map exists $attr->{$_} && !$ignore{$_}
834 ? [$_ => delete $attr->{$_}] : (), 884 ? [$_ => delete $attr->{$_}] : (),
835 @attr_order 885 @attr_order
836 ] 886 ]
837 }, 887 },
838
839 exists $section{$_} ? [$_ => delete $section{$_}] : (), 888 exists $section{$_} ? [$_ => delete $section{$_}] : (),
840 @section_order 889 @section_order
841 ]; 890 ];
842 891
843 $attr 892 $attr
844} 893}
… …
901} 950}
902 951
903sub construct_tilecache_pb { 952sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 953 my ($idx, $cache) = @_;
905 954
906 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 955 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
907 956
908 while (my ($name, $tile) = each %$cache) { 957 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 958 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 959 my $ofs = $tile->{idx};
911 960
912 for my $x (0 .. $tile->{w} - 1) { 961 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 962 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 963 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 964 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 965 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 966 }
918 } 967 }
919 } 968 }
920 969
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 970 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 986=cut
938 987
939sub load_tilecache() { 988sub load_tilecache() {
940 require Gtk2; 989 require Gtk2;
941 990
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, 991 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
974 sub { 992 sub {
975 my %cache; 993 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata"; 994 my $facedata = Storable::retrieve "$LIB/facedata";
977 995
978 $facedata->{version} == 2 996 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed."; 997 or die "$LIB/facedata: version mismatch, cannot proceed.";
980 998
981 my $faces = $facedata->{faceinfo}; 999 my $faces = $facedata->{faceinfo};
982 my $idx = 0; 1000 my $idx = 0;
983 1001
984 for (sort keys %$faces) { 1002 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_}); 1003 my ($face, $info) = ($_, $faces->{$_});
986 1004
987 my $pb = new Gtk2::Gdk::PixbufLoader; 1005 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32}); 1006 $pb->write ($info->{data32});
989 $pb->close; 1007 $pb->close;
990 my $pb = $pb->get_pixbuf; 1008 my $pb = $pb->get_pixbuf;
991 1009
992 my $tile = $cache{$face} = { 1010 my $tile = $cache{$face} = {
993 pb => $pb, 1011 pb => $pb,
994 idx => $idx, 1012 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 1013 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 1014 h => int $pb->get_height / TILESIZE,
997 }; 1015 };
998 1016
999 $idx += $tile->{w} * $tile->{h}; 1017 $idx += $tile->{w} * $tile->{h};
1000 } 1018 }
1001 1019
1002 construct_tilecache_pb $idx, \%cache; 1020 construct_tilecache_pb $idx, \%cache;
1003 1021
1004 \%cache 1022 \%cache
1005 }; 1023 };
1006 }
1007} 1024}
1025
1026=back
1008 1027
1009=head1 AUTHOR 1028=head1 AUTHOR
1010 1029
1011 Marc Lehmann <schmorp@schmorp.de> 1030 Marc Lehmann <schmorp@schmorp.de>
1012 http://home.schmorp.de/ 1031 http://home.schmorp.de/
… …
1015 http://www.ta-sa.org/ 1034 http://www.ta-sa.org/
1016 1035
1017=cut 1036=cut
1018 1037
10191 10381
1039

Diff Legend

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