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.142 by root, Sat May 15 00:30:53 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",
… …
49 56
50# same as in server save routine, to (hopefully) be compatible 57# same as in server save routine, to (hopefully) be compatible
51# to the other editors. 58# to the other editors.
52our @FIELD_ORDER_MAP = (qw( 59our @FIELD_ORDER_MAP = (qw(
53 file_format_version 60 file_format_version
54 name attach swap_time reset_timeout fixed_resettime difficulty region 61 name attach swap_time reset_timeout fixed_resettime difficulty
62 region music
55 shopitems shopgreed shopmin shopmax shoprace 63 shopitems shopgreed shopmin shopmax shoprace
56 darkness width height enter_x enter_y msg maplore 64 darkness width height enter_x enter_y msg maplore
57 unique template 65 unique template
58 outdoor temp pressure humid windspeed winddir sky nosmooth 66 outdoor temp pressure humid windspeed winddir sky nosmooth
59 tile_path_1 tile_path_2 tile_path_3 tile_path_4 67 tile_path_1 tile_path_2 tile_path_3 tile_path_4
… …
64 72
65 elevation 73 elevation
66 74
67 name name_pl custom_name attach title race 75 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 76 slaying skill msg lore other_arch
69 face animation is_animated 77 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 78 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 79 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 80 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 81 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 82 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
146 boat => MOVE_BOAT, 154 boat => MOVE_BOAT,
147 ship => MOVE_SHIP, 155 ship => MOVE_SHIP,
148 all => MOVE_ALL, 156 all => MOVE_ALL,
149); 157);
150 158
151our @MOVE_TYPE = keys %MOVE_TYPE; 159our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
152 160
153{ 161{
154 package Crossfire::MoveType; 162 package Deliantra::MoveType;
155 163
156 use overload 164 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 165 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 166 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 167 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
168 '<=' => sub {
169 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
170 ? $_[0][1] & $MOVE_TYPE{$_[1]}
171 : undef
172 },
160 '+=' => 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 },
161 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 175 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub { 176 'x=' => sub { # toggle between off, + and -
164 my $cur = $_[0] >= $_[1]; 177 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) { 178 if (!defined $cur) {
166 if ($_[0] >= "all") { 179 if ($_[0] >= "all") {
167 $_[0] -= $_[1]; 180 $_[0] -= $_[1];
168 } else { 181 } else {
… …
177 $_[0] 190 $_[0]
178 }, 191 },
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 192 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 193 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 194 ;
182}
183 195
184sub Crossfire::MoveType::new { 196 sub TO_JSON {
197 $_[0][0]
198 }
199}
200
201sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 202 my ($class, $string) = @_;
186 203
187 my $mask; 204 my $mask;
188 my $value; 205 my $value;
189 206
… …
203 } 220 }
204 221
205 (bless [$mask, $value], $class)->normalise 222 (bless [$mask, $value], $class)->normalise
206} 223}
207 224
208sub Crossfire::MoveType::normalise { 225sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 226 my ($self) = @_;
210 227
211 if ($self->[0] & MOVE_ALL) { 228 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 229 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 230 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 234 $self->[1] &= $self->[0];
218 235
219 $self 236 $self
220} 237}
221 238
222sub Crossfire::MoveType::as_string { 239sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 240 my ($self) = @_;
224 241
225 my @res; 242 my @res;
226 243
227 my ($mask, $value) = @$self; 244 my ($mask, $value) = @$self;
228 245
229 for (@Crossfire::MOVE_TYPE) { 246 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 247 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 248 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 249 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 250 push @res, $value & $bit ? $_ : "-$_";
234 } 251 }
235 } 252 }
… …
328 345
329# object as in "Object xxx", i.e. archetypes 346# object as in "Object xxx", i.e. archetypes
330sub normalize_object($) { 347sub normalize_object($) {
331 my ($ob) = @_; 348 my ($ob) = @_;
332 349
350 delete $ob->{editable}; # deprecated
351
333 # convert material bitset to materialname, if possible 352 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) { 353 if (exists $ob->{material}) {
335 if (!$ob->{material}) { 354 if (!$ob->{material}) {
336 delete $ob->{material}; 355 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) { 356 } elsif (exists $ob->{materialname}) {
… …
347 } else { 366 } else {
348 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 367 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
349 } 368 }
350 } 369 }
351 370
371 # check whether attachment is the same as in the archetype
372 if (exists $ob->{attach}) {
373 my $arch = $ARCH{$ob->{_name}};
374 my $js = JSON::XS->new->utf8->canonical (1);
375
376 if (defined $arch->{attach}
377 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
378 delete $ob->{attach}
379 }
380 }
381
352 # color_fg is used as default for magicmap if magicmap does not exist 382 # 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}; 383 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
354 384
355 # nuke outdated or never supported fields 385 # nuke outdated or never supported fields
356 delete @$ob{qw( 386 delete @$ob{qw(
… …
364 394
365 # convert movement strings to bitsets 395 # convert movement strings to bitsets
366 for my $attr (keys %FIELD_MOVEMENT) { 396 for my $attr (keys %FIELD_MOVEMENT) {
367 next unless exists $ob->{$attr}; 397 next unless exists $ob->{$attr};
368 398
369 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 399 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
370 } 400 }
371 401
372 # convert outdated movement flags to new movement sets 402 # convert outdated movement flags to new movement sets
373 if (defined (my $v = delete $ob->{no_pass})) { 403 if (defined (my $v = delete $ob->{no_pass})) {
374 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 404 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
375 } 405 }
376 if (defined (my $v = delete $ob->{slow_move})) { 406 if (defined (my $v = delete $ob->{slow_move})) {
377 $ob->{move_slow} += "walk"; 407 $ob->{move_slow} += "walk";
378 $ob->{move_slow_penalty} = $v; 408 $ob->{move_slow_penalty} = $v;
379 } 409 }
380 if (defined (my $v = delete $ob->{walk_on})) { 410 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" } 411 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
382 } 412 }
383 if (defined (my $v = delete $ob->{walk_off})) { 413 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" } 414 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
385 } 415 }
386 if (defined (my $v = delete $ob->{fly_on})) { 416 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" } 417 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
388 } 418 }
389 if (defined (my $v = delete $ob->{fly_off})) { 419 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" } 420 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
391 } 421 }
392 if (defined (my $v = delete $ob->{flying})) { 422 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" } 423 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
394 } 424 }
395 425
396 # convert idiotic event_xxx things into objects 426 # convert idiotic event_xxx things into objects
397 while (my ($event, $subtype) = each %EVENT_TYPE) { 427 while (my ($event, $subtype) = each %EVENT_TYPE) {
398 if (exists $ob->{"event_${event}_plugin"}) { 428 if (exists $ob->{"event_${event}_plugin"}) {
… …
414# arch as in "arch xxx", ie.. objects 444# arch as in "arch xxx", ie.. objects
415sub normalize_arch($) { 445sub normalize_arch($) {
416 my ($ob) = @_; 446 my ($ob) = @_;
417 447
418 normalize_object $ob; 448 normalize_object $ob;
449
450 return if $ob->{_atype} eq "object";
419 451
420 my $arch = $ARCH{$ob->{_name}} 452 my $arch = $ARCH{$ob->{_name}}
421 or (warn "$ob->{_name}: no such archetype", return $ob); 453 or (warn "$ob->{_name}: no such archetype", return $ob);
422 454
423 if ($arch->{type} == 22) { # map 455 if ($arch->{type} == 22) { # map
… …
459} 491}
460 492
461sub attr_thaw($) { 493sub attr_thaw($) {
462 my ($ob) = @_; 494 my ($ob) = @_;
463 495
464 $ob->{attach} = from_json $ob->{attach} 496 $ob->{attach} = decode_json $ob->{attach}
465 if exists $ob->{attach}; 497 if exists $ob->{attach};
466 498
467 $ob 499 $ob
468} 500}
469 501
470sub attr_freeze($) { 502sub attr_freeze($) {
471 my ($ob) = @_; 503 my ($ob) = @_;
472 504
473 $ob->{attach} = Crossfire::to_json $ob->{attach} 505 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
474 if exists $ob->{attach}; 506 if exists $ob->{attach};
475 507
476 $ob 508 $ob
477} 509}
478 510
… …
498 530
499 my %arc; 531 my %arc;
500 my ($more, $prev); 532 my ($more, $prev);
501 my $comment; 533 my $comment;
502 534
503 open my $fh, "<:raw:perlio:utf8", $path 535 open my $fh, "<:utf8", $path
504 or Carp::croak "$path: $!"; 536 or Carp::croak "$path: $!";
505 537
506# binmode $fh; 538# binmode $fh;
507 539
508 my $parse_block; $parse_block = sub { 540 my $parse_block; $parse_block = sub {
… …
608 my $str; 640 my $str;
609 641
610 my $append; $append = sub { 642 my $append; $append = sub {
611 my %a = %{$_[0]}; 643 my %a = %{$_[0]};
612 644
613 Crossfire::attr_freeze \%a; 645 Deliantra::attr_freeze \%a;
614 Crossfire::normalize_arch \%a; 646 Deliantra::normalize_arch \%a;
615 647
616 # undo the bit-split we did before 648 # undo the bit-split we did before
617 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 649 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}) 650 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
619 | (delete $a{attack_movement_bits_4_7}); 651 | (delete $a{attack_movement_bits_4_7});
… …
637 } 669 }
638 670
639 my @kv; 671 my @kv;
640 672
641 for ($a{_name} eq "map" 673 for ($a{_name} eq "map"
642 ? @Crossfire::FIELD_ORDER_MAP 674 ? @Deliantra::FIELD_ORDER_MAP
643 : @Crossfire::FIELD_ORDER) { 675 : @Deliantra::FIELD_ORDER) {
644 push @kv, [$_, delete $a{$_}] 676 push @kv, [$_, delete $a{$_}]
645 if exists $a{$_}; 677 if exists $a{$_};
646 } 678 }
647 679
648 for (sort keys %a) { 680 for (sort keys %a) {
… …
651 } 683 }
652 684
653 for (@kv) { 685 for (@kv) {
654 my ($k, $v) = @$_; 686 my ($k, $v) = @$_;
655 687
656 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 688 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
657 $v =~ s/\n$//; 689 $v =~ s/\n$//;
658 $str .= "$k\n$v\n$end\n"; 690 $str .= "$k\n$v\n$end\n";
659 } else { 691 } else {
660 $str .= "$k $v\n"; 692 $str .= "$k $v\n";
661 } 693 }
… …
757=cut 789=cut
758 790
759sub arch_attr($) { 791sub arch_attr($) {
760 my ($obj) = @_; 792 my ($obj) = @_;
761 793
762 require Crossfire::Data; 794 require Deliantra::Data;
763 795
764 my $root; 796 my $root;
765 my $attr = { }; 797 my $attr = { };
766 798
767 my $arch = $ARCH{ $obj->{_name} }; 799 my $arch = $ARCH{ $obj->{_name} };
768 my $type = $obj->{type} || $arch->{type}; 800 my $type = $obj->{type} || $arch->{type};
769 801
770 if ($type > 0) { 802 if ($type > 0) {
771 $root = $Crossfire::Data::ATTR{$type}; 803 $root = $Deliantra::Data::ATTR{$type};
772 } else { 804 } else {
773 my %a = (%$arch, %$obj); 805 my %a = (%$arch, %$obj);
774 806
775 if ($a{is_floor} && !$a{alive}) { 807 if ($a{is_floor} && !$a{alive}) {
776 $root = $Crossfire::Data::TYPE{Floor}; 808 $root = $Deliantra::Data::TYPE{Floor};
777 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 809 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
778 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 810 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
779 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 811 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
780 $root = $Crossfire::Data::TYPE{Wall}; 812 $root = $Deliantra::Data::TYPE{Wall};
781 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 813 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
782 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 814 $root = $Deliantra::Data::TYPE{"Weak Wall"};
783 } else { 815 } else {
784 $root = $Crossfire::Data::TYPE{Misc}; 816 $root = $Deliantra::Data::TYPE{Misc};
785 } 817 }
786 } 818 }
787 819
820 my (%ignore);
788 my @import = ($root); 821 my @import = ($root);
822
823 my @new_import;
824 while (my $type = shift @import) {
825 # first import everything we will need:
826 push @import,
827 grep $_,
828 map $Deliantra::Data::TYPE{$_},
829 @{$type->{import} || []};
830
831 # and compute the ignored attributes
832 for (@{$type->{ignore} || []}) {
833 $ignore{$_}++ for ref $_ ? @$_ : $_;
834 }
835
836 push @new_import, $type;
789 837 }
838 (@import) = @new_import;
839
840 # then add defaults to the back of the list, so they are added
841 # as last resort.
790 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 842 push @import, \%Deliantra::Data::DEFAULT_ATTR
791 unless $type == 116; 843 unless $type == 116;
792 844
793 my (%ignore);
794 my (@section_order, %section, @attr_order); 845 my (@section_order, %section, @attr_order);
795 846
847 # @import = root, imported, default
796 while (my $type = shift @import) { 848 while (my $type = pop @import) {
797 push @import, @{$type->{import} || []};
798
799 $attr->{$_} ||= $type->{$_} 849 $attr->{$_} ||= $type->{$_}
800 for qw(name desc use); 850 for qw(name desc use);
801
802 for (@{$type->{ignore} || []}) {
803 $ignore{$_}++ for ref $_ ? @$_ : $_;
804 }
805 851
806 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 852 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
807 my ($name, $attr) = @$_; 853 my ($name, $attr) = @$_;
808 push @section_order, $name; 854 push @section_order, $name;
809 for (@$attr) { 855 for (@$attr) {
810 my ($k, $v) = @$_; 856 my ($k, $v) = @$_;
811 push @attr_order, $k; 857 push @attr_order, $k;
812 $section{$name}{$k} ||= $v; 858 $section{$name}{$k} = $v; # overwrite, so that the root decides
813 }
814 } 859 }
860 }
861 }
862
863 # remove ignores for "root" type
864 for (
865 map @{$_->[1]}, # section attributes
866 [general => ($root->{attr} || [])],
867 @{$root->{section} || []}
868 ) {
869 my ($k, $v) = @$_;
870 # skip fixed attributes, if they are ignored thats fine
871 next if $v->{type} eq 'fixed';
872
873 delete $ignore{$k}; # if the attributes are defined explicitly they
874 # should NOT be ignored. ignore should mainly
875 # hit imported/inherited attributes.
815 } 876 }
816 877
817 $attr->{section} = [ 878 $attr->{section} = [
818 map !exists $section{$_} ? () : do { 879 map !exists $section{$_} ? () : do {
819 my $attr = delete $section{$_}; 880 my $attr = delete $section{$_};
… …
823 map exists $attr->{$_} && !$ignore{$_} 884 map exists $attr->{$_} && !$ignore{$_}
824 ? [$_ => delete $attr->{$_}] : (), 885 ? [$_ => delete $attr->{$_}] : (),
825 @attr_order 886 @attr_order
826 ] 887 ]
827 }, 888 },
828
829 exists $section{$_} ? [$_ => delete $section{$_}] : (), 889 exists $section{$_} ? [$_ => delete $section{$_}] : (),
830 @section_order 890 @section_order
831 ]; 891 ];
832 892
833 $attr 893 $attr
834} 894}
… …
891} 951}
892 952
893sub construct_tilecache_pb { 953sub construct_tilecache_pb {
894 my ($idx, $cache) = @_; 954 my ($idx, $cache) = @_;
895 955
896 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 956 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
897 957
898 while (my ($name, $tile) = each %$cache) { 958 while (my ($name, $tile) = each %$cache) {
899 my $tpb = delete $tile->{pb}; 959 my $tpb = delete $tile->{pb};
900 my $ofs = $tile->{idx}; 960 my $ofs = $tile->{idx};
901 961
902 for my $x (0 .. $tile->{w} - 1) { 962 for my $x (0 .. $tile->{w} - 1) {
903 for my $y (0 .. $tile->{h} - 1) { 963 for my $y (0 .. $tile->{h} - 1) {
904 my $idx = $ofs + $x + $y * $tile->{w}; 964 my $idx = $ofs + $x + $y * $tile->{w};
905 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 965 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
906 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 966 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
907 } 967 }
908 } 968 }
909 } 969 }
910 970
911 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 971 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
927=cut 987=cut
928 988
929sub load_tilecache() { 989sub load_tilecache() {
930 require Gtk2; 990 require Gtk2;
931 991
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, 992 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
964 sub { 993 sub {
965 my %cache; 994 my %cache;
966 my $facedata = Storable::retrieve "$LIB/facedata"; 995 my $facedata = Storable::retrieve "$LIB/facedata";
967 996
968 $facedata->{version} == 2 997 $facedata->{version} == 2
969 or die "$LIB/facedata: version mismatch, cannot proceed."; 998 or die "$LIB/facedata: version mismatch, cannot proceed.";
970 999
971 my $faces = $facedata->{faceinfo}; 1000 my $faces = $facedata->{faceinfo};
972 my $idx = 0; 1001 my $idx = 0;
973 1002
974 for (sort keys %$faces) { 1003 for (sort keys %$faces) {
975 my ($face, $info) = ($_, $faces->{$_}); 1004 my ($face, $info) = ($_, $faces->{$_});
976 1005
977 my $pb = new Gtk2::Gdk::PixbufLoader; 1006 my $pb = new Gtk2::Gdk::PixbufLoader;
978 $pb->write ($info->{data32}); 1007 $pb->write ($info->{data32});
979 $pb->close; 1008 $pb->close;
980 my $pb = $pb->get_pixbuf; 1009 my $pb = $pb->get_pixbuf;
981 1010
982 my $tile = $cache{$face} = { 1011 my $tile = $cache{$face} = {
983 pb => $pb, 1012 pb => $pb,
984 idx => $idx, 1013 idx => $idx,
985 w => int $pb->get_width / TILESIZE, 1014 w => int $pb->get_width / TILESIZE,
986 h => int $pb->get_height / TILESIZE, 1015 h => int $pb->get_height / TILESIZE,
987 }; 1016 };
988 1017
989 $idx += $tile->{w} * $tile->{h}; 1018 $idx += $tile->{w} * $tile->{h};
990 } 1019 }
991 1020
992 construct_tilecache_pb $idx, \%cache; 1021 construct_tilecache_pb $idx, \%cache;
993 1022
994 \%cache 1023 \%cache
995 }; 1024 };
996 }
997} 1025}
1026
1027=back
998 1028
999=head1 AUTHOR 1029=head1 AUTHOR
1000 1030
1001 Marc Lehmann <schmorp@schmorp.de> 1031 Marc Lehmann <schmorp@schmorp.de>
1002 http://home.schmorp.de/ 1032 http://home.schmorp.de/
… …
1005 http://www.ta-sa.org/ 1035 http://www.ta-sa.org/
1006 1036
1007=cut 1037=cut
1008 1038
10091 10391
1040

Diff Legend

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