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.110 by root, Mon May 28 21:33:28 2007 UTC vs.
Revision 1.146 by root, Sun Nov 11 23:31:42 2012 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.99'; 11our $VERSION = '2.0';
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 glyph 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
75 nrof level direction type subtype attacktype 83 nrof level direction type subtype attacktype
… …
125 trigger => 10, 133 trigger => 10,
126 close => 11, 134 close => 11,
127 timer => 12, 135 timer => 12,
128); 136);
129 137
138# 1 up 2 right 4 down 8 left
139our %WALLDIR = (
140 0 => 0,
141 1_2 => 1,
142 1_4 => 2,
143 2_2_1 => 3,
144 1_1 => 4,
145 2_1_1 => 5,
146 2_2_2 => 6,
147 3_2 => 7,
148 1_3 => 8,
149 2_2_4 => 9,
150 2_1_2 => 10,
151 3_1 => 11,
152 2_2_3 => 12,
153 3_4 => 13,
154 3_3 => 14,
155 4 => 15,
156);
157
130sub MOVE_WALK (){ 0x01 } 158sub MOVE_WALK (){ 0x01 }
131sub MOVE_FLY_LOW (){ 0x02 } 159sub MOVE_FLY_LOW (){ 0x02 }
132sub MOVE_FLY_HIGH (){ 0x04 } 160sub MOVE_FLY_HIGH (){ 0x04 }
133sub MOVE_FLYING (){ 0x06 } 161sub MOVE_FLYING (){ 0x06 }
134sub MOVE_SWIM (){ 0x08 } 162sub MOVE_SWIM (){ 0x08 }
… …
146 boat => MOVE_BOAT, 174 boat => MOVE_BOAT,
147 ship => MOVE_SHIP, 175 ship => MOVE_SHIP,
148 all => MOVE_ALL, 176 all => MOVE_ALL,
149); 177);
150 178
151our @MOVE_TYPE = keys %MOVE_TYPE; 179our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
152 180
153{ 181{
154 package Crossfire::MoveType; 182 package Deliantra::MoveType;
155 183
156 use overload 184 use overload
157 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 185 '=' => sub { bless [@{$_[0]}], ref $_[0] },
158 '""' => \&as_string, 186 '""' => \&as_string,
159 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef }, 187 '>=' => sub { $_[0][0] & $MOVE_TYPE{$_[1]} ? $_[0][1] & $MOVE_TYPE{$_[1]} : undef },
188 '<=' => sub {
189 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
190 ? $_[0][1] & $MOVE_TYPE{$_[1]}
191 : undef
192 },
160 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 193 '+=' => 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 }, 194 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 195 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
163 'x=' => sub { 196 'x=' => sub { # toggle between off, + and -
164 my $cur = $_[0] >= $_[1]; 197 my $cur = $_[0] >= $_[1];
165 if (!defined $cur) { 198 if (!defined $cur) {
166 if ($_[0] >= "all") { 199 if ($_[0] >= "all") {
167 $_[0] -= $_[1]; 200 $_[0] -= $_[1];
168 } else { 201 } else {
… …
177 $_[0] 210 $_[0]
178 }, 211 },
179 'eq' => sub { "$_[0]" eq "$_[1]" }, 212 'eq' => sub { "$_[0]" eq "$_[1]" },
180 'ne' => sub { "$_[0]" ne "$_[1]" }, 213 'ne' => sub { "$_[0]" ne "$_[1]" },
181 ; 214 ;
182}
183 215
184sub Crossfire::MoveType::new { 216 sub TO_JSON {
217 $_[0][0]
218 }
219}
220
221sub Deliantra::MoveType::new {
185 my ($class, $string) = @_; 222 my ($class, $string) = @_;
186 223
187 my $mask; 224 my $mask;
188 my $value; 225 my $value;
189 226
… …
203 } 240 }
204 241
205 (bless [$mask, $value], $class)->normalise 242 (bless [$mask, $value], $class)->normalise
206} 243}
207 244
208sub Crossfire::MoveType::normalise { 245sub Deliantra::MoveType::normalise {
209 my ($self) = @_; 246 my ($self) = @_;
210 247
211 if ($self->[0] & MOVE_ALL) { 248 if ($self->[0] & MOVE_ALL) {
212 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 249 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
213 $self->[0] &= $mask; 250 $self->[0] &= $mask;
… …
217 $self->[1] &= $self->[0]; 254 $self->[1] &= $self->[0];
218 255
219 $self 256 $self
220} 257}
221 258
222sub Crossfire::MoveType::as_string { 259sub Deliantra::MoveType::as_string {
223 my ($self) = @_; 260 my ($self) = @_;
224 261
225 my @res; 262 my @res;
226 263
227 my ($mask, $value) = @$self; 264 my ($mask, $value) = @$self;
228 265
229 for (@Crossfire::MOVE_TYPE) { 266 for (@Deliantra::MOVE_TYPE) {
230 my $bit = $Crossfire::MOVE_TYPE{$_}; 267 my $bit = $Deliantra::MOVE_TYPE{$_};
231 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 268 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
232 $mask &= ~$bit; 269 $mask &= ~$bit;
233 push @res, $value & $bit ? $_ : "-$_"; 270 push @res, $value & $bit ? $_ : "-$_";
234 } 271 }
235 } 272 }
… …
328 365
329# object as in "Object xxx", i.e. archetypes 366# object as in "Object xxx", i.e. archetypes
330sub normalize_object($) { 367sub normalize_object($) {
331 my ($ob) = @_; 368 my ($ob) = @_;
332 369
370 delete $ob->{editable}; # deprecated
371
333 # convert material bitset to materialname, if possible 372 # convert material bitset to materialname, if possible
334 if (exists $ob->{material}) { 373 if (exists $ob->{material}) {
335 if (!$ob->{material}) { 374 if (!$ob->{material}) {
336 delete $ob->{material}; 375 delete $ob->{material};
337 } elsif (exists $ob->{materialname}) { 376 } elsif (exists $ob->{materialname}) {
… …
375 414
376 # convert movement strings to bitsets 415 # convert movement strings to bitsets
377 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
378 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
379 418
380 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
381 } 420 }
382 421
383 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
384 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
385 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
386 } 425 }
387 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
388 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
389 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
390 } 429 }
391 if (defined (my $v = delete $ob->{walk_on})) { 430 if (defined (my $v = delete $ob->{walk_on})) {
392 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
393 } 432 }
394 if (defined (my $v = delete $ob->{walk_off})) { 433 if (defined (my $v = delete $ob->{walk_off})) {
395 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
396 } 435 }
397 if (defined (my $v = delete $ob->{fly_on})) { 436 if (defined (my $v = delete $ob->{fly_on})) {
398 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
399 } 438 }
400 if (defined (my $v = delete $ob->{fly_off})) { 439 if (defined (my $v = delete $ob->{fly_off})) {
401 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
402 } 441 }
403 if (defined (my $v = delete $ob->{flying})) { 442 if (defined (my $v = delete $ob->{flying})) {
404 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
405 } 444 }
406 445
407 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
408 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
409 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
425# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
426sub normalize_arch($) { 465sub normalize_arch($) {
427 my ($ob) = @_; 466 my ($ob) = @_;
428 467
429 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
430 471
431 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
432 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
433 474
434 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
470} 511}
471 512
472sub attr_thaw($) { 513sub attr_thaw($) {
473 my ($ob) = @_; 514 my ($ob) = @_;
474 515
475 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
476 if exists $ob->{attach}; 517 if exists $ob->{attach};
477 518
478 $ob 519 $ob
479} 520}
480 521
481sub attr_freeze($) { 522sub attr_freeze($) {
482 my ($ob) = @_; 523 my ($ob) = @_;
483 524
484 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
485 if exists $ob->{attach}; 526 if exists $ob->{attach};
486 527
487 $ob 528 $ob
488} 529}
489 530
… …
509 550
510 my %arc; 551 my %arc;
511 my ($more, $prev); 552 my ($more, $prev);
512 my $comment; 553 my $comment;
513 554
514 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
515 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
516 557
517# binmode $fh; 558# binmode $fh;
518 559
519 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
619 my $str; 660 my $str;
620 661
621 my $append; $append = sub { 662 my $append; $append = sub {
622 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
623 664
624 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
625 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
626 667
627 # undo the bit-split we did before 668 # undo the bit-split we did before
628 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 669 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
629 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
630 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
648 } 689 }
649 690
650 my @kv; 691 my @kv;
651 692
652 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
653 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
654 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
655 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
656 if exists $a{$_}; 697 if exists $a{$_};
657 } 698 }
658 699
659 for (sort keys %a) { 700 for (sort keys %a) {
… …
662 } 703 }
663 704
664 for (@kv) { 705 for (@kv) {
665 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
666 707
667 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
668 $v =~ s/\n$//; 709 $v =~ s/\n$//;
669 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
670 } else { 711 } else {
671 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
672 } 713 }
… …
768=cut 809=cut
769 810
770sub arch_attr($) { 811sub arch_attr($) {
771 my ($obj) = @_; 812 my ($obj) = @_;
772 813
773 require Crossfire::Data; 814 require Deliantra::Data;
774 815
775 my $root; 816 my $root;
776 my $attr = { }; 817 my $attr = { };
777 818
778 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
779 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
780 821
781 if ($type > 0) { 822 if ($type > 0) {
782 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
783 } else { 824 } else {
784 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
785 826
786 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
787 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
788 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
789 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
790 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
791 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
792 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
793 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
794 } else { 835 } else {
795 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
796 } 837 }
797 } 838 }
798 839
840 my (%ignore);
799 my @import = ($root); 841 my @import = ($root);
842
843 my @new_import;
844 while (my $type = shift @import) {
845 # first import everything we will need:
846 push @import,
847 grep $_,
848 map $Deliantra::Data::TYPE{$_},
849 @{$type->{import} || []};
850
851 # and compute the ignored attributes
852 for (@{$type->{ignore} || []}) {
853 $ignore{$_}++ for ref $_ ? @$_ : $_;
854 }
855
856 push @new_import, $type;
800 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
801 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
802 unless $type == 116; 863 unless $type == 116;
803 864
804 my (%ignore);
805 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
806 866
867 # @import = root, imported, default
807 while (my $type = shift @import) { 868 while (my $type = pop @import) {
808 push @import, @{$type->{import} || []};
809
810 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
811 for qw(name desc use); 870 for qw(name desc use);
812
813 for (@{$type->{ignore} || []}) {
814 $ignore{$_}++ for ref $_ ? @$_ : $_;
815 }
816 871
817 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
818 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
819 push @section_order, $name; 874 push @section_order, $name;
820 for (@$attr) { 875 for (@$attr) {
821 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
822 push @attr_order, $k; 877 push @attr_order, $k;
823 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
824 }
825 } 879 }
880 }
881 }
882
883 # remove ignores for "root" type
884 for (
885 map @{$_->[1]}, # section attributes
886 [general => ($root->{attr} || [])],
887 @{$root->{section} || []}
888 ) {
889 my ($k, $v) = @$_;
890 # skip fixed attributes, if they are ignored thats fine
891 next if $v->{type} eq 'fixed';
892
893 delete $ignore{$k}; # if the attributes are defined explicitly they
894 # should NOT be ignored. ignore should mainly
895 # hit imported/inherited attributes.
826 } 896 }
827 897
828 $attr->{section} = [ 898 $attr->{section} = [
829 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
830 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
834 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
835 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
836 @attr_order 906 @attr_order
837 ] 907 ]
838 }, 908 },
839
840 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
841 @section_order 910 @section_order
842 ]; 911 ];
843 912
844 $attr 913 $attr
845} 914}
… …
902} 971}
903 972
904sub construct_tilecache_pb { 973sub construct_tilecache_pb {
905 my ($idx, $cache) = @_; 974 my ($idx, $cache) = @_;
906 975
907 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 976 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
908 977
909 while (my ($name, $tile) = each %$cache) { 978 while (my ($name, $tile) = each %$cache) {
910 my $tpb = delete $tile->{pb}; 979 my $tpb = delete $tile->{pb};
911 my $ofs = $tile->{idx}; 980 my $ofs = $tile->{idx};
912 981
913 for my $x (0 .. $tile->{w} - 1) { 982 for my $x (0 .. $tile->{w} - 1) {
914 for my $y (0 .. $tile->{h} - 1) { 983 for my $y (0 .. $tile->{h} - 1) {
915 my $idx = $ofs + $x + $y * $tile->{w}; 984 my $idx = $ofs + $x + $y * $tile->{w};
916 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
917 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
918 } 987 }
919 } 988 }
920 } 989 }
921 990
922 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
938=cut 1007=cut
939 1008
940sub load_tilecache() { 1009sub load_tilecache() {
941 require Gtk2; 1010 require Gtk2;
942 1011
943 if (-e "$LIB/crossfire.0") { # Crossfire1 version
944 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache, 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
945 sub { 1013 sub {
946 my $tile = read_pak "$LIB/crossfire.0";
947
948 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
949 1016
1017 open my $fh, "<", "$LIB/facedata"
1018 or die "$LIB/facedata: $!";
1019
1020 $facedata->{version} == 2
1021 or die "$LIB/facedata: version mismatch, cannot proceed.";
1022
1023 my $faces = $facedata->{faceinfo};
950 my $idx = 0; 1024 my $idx = 0;
951 1025
952 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
953 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
1030
1031 if (exists $info->{data32}) {
954 $pb->write ($tile->{$name}); 1032 $pb->write ($info->{data32});
955 $pb->close; 1033 } else {
956 my $pb = $pb->get_pixbuf; 1034 sysseek $fh, $info->{fofs32}, 0;
957 1035 sysread $fh, my $buf, $info->{size32};
958 my $tile = $cache{$name} = { 1036 $pb->write ($buf);
959 pb => $pb,
960 idx => $idx,
961 w => int $pb->get_width / TILESIZE,
962 h => int $pb->get_height / TILESIZE,
963 };
964
965 $idx += $tile->{w} * $tile->{h};
966 } 1037 }
967
968 construct_tilecache_pb $idx, \%cache;
969
970 \%cache
971 };
972
973 } else { # Crossfire+ version
974 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
975 sub {
976 my %cache;
977 my $facedata = Storable::retrieve "$LIB/facedata";
978
979 $facedata->{version} == 2
980 or die "$LIB/facedata: version mismatch, cannot proceed.";
981
982 my $faces = $facedata->{faceinfo};
983 my $idx = 0;
984
985 for (sort keys %$faces) {
986 my ($face, $info) = ($_, $faces->{$_});
987
988 my $pb = new Gtk2::Gdk::PixbufLoader;
989 $pb->write ($info->{data32});
990 $pb->close; 1038 $pb->close;
991 my $pb = $pb->get_pixbuf; 1039 my $pb = $pb->get_pixbuf;
992 1040
993 my $tile = $cache{$face} = { 1041 my $tile = $cache{$face} = {
994 pb => $pb, 1042 pb => $pb,
995 idx => $idx, 1043 idx => $idx,
996 w => int $pb->get_width / TILESIZE, 1044 w => int $pb->get_width / TILESIZE,
997 h => int $pb->get_height / TILESIZE, 1045 h => int $pb->get_height / TILESIZE,
998 }; 1046 };
999 1047
1000 $idx += $tile->{w} * $tile->{h}; 1048 $idx += $tile->{w} * $tile->{h};
1001 } 1049 }
1002 1050
1003 construct_tilecache_pb $idx, \%cache; 1051 construct_tilecache_pb $idx, \%cache;
1004 1052
1005 \%cache 1053 \%cache
1006 }; 1054 };
1007 }
1008} 1055}
1056
1057=back
1009 1058
1010=head1 AUTHOR 1059=head1 AUTHOR
1011 1060
1012 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
1013 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
1016 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
1017 1066
1018=cut 1067=cut
1019 1068
10201 10691
1070

Diff Legend

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