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.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.98'; 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}) {
… …
352 # check whether attachment is the same as in the archetype 391 # check whether attachment is the same as in the archetype
353 if (exists $ob->{attach}) { 392 if (exists $ob->{attach}) {
354 my $arch = $ARCH{$ob->{_name}}; 393 my $arch = $ARCH{$ob->{_name}};
355 my $js = JSON::XS->new->utf8->canonical (1); 394 my $js = JSON::XS->new->utf8->canonical (1);
356 395
396 if (defined $arch->{attach}
357 if ($js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) { 397 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
358 delete $ob->{attach} 398 delete $ob->{attach}
359 } 399 }
360 } 400 }
361 401
362 # color_fg is used as default for magicmap if magicmap does not exist 402 # color_fg is used as default for magicmap if magicmap does not exist
… …
374 414
375 # convert movement strings to bitsets 415 # convert movement strings to bitsets
376 for my $attr (keys %FIELD_MOVEMENT) { 416 for my $attr (keys %FIELD_MOVEMENT) {
377 next unless exists $ob->{$attr}; 417 next unless exists $ob->{$attr};
378 418
379 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 419 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
380 } 420 }
381 421
382 # convert outdated movement flags to new movement sets 422 # convert outdated movement flags to new movement sets
383 if (defined (my $v = delete $ob->{no_pass})) { 423 if (defined (my $v = delete $ob->{no_pass})) {
384 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 424 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
385 } 425 }
386 if (defined (my $v = delete $ob->{slow_move})) { 426 if (defined (my $v = delete $ob->{slow_move})) {
387 $ob->{move_slow} += "walk"; 427 $ob->{move_slow} += "walk";
388 $ob->{move_slow_penalty} = $v; 428 $ob->{move_slow_penalty} = $v;
389 } 429 }
390 if (defined (my $v = delete $ob->{walk_on})) { 430 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" } 431 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
392 } 432 }
393 if (defined (my $v = delete $ob->{walk_off})) { 433 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" } 434 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
395 } 435 }
396 if (defined (my $v = delete $ob->{fly_on})) { 436 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" } 437 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
398 } 438 }
399 if (defined (my $v = delete $ob->{fly_off})) { 439 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" } 440 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
401 } 441 }
402 if (defined (my $v = delete $ob->{flying})) { 442 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" } 443 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
404 } 444 }
405 445
406 # convert idiotic event_xxx things into objects 446 # convert idiotic event_xxx things into objects
407 while (my ($event, $subtype) = each %EVENT_TYPE) { 447 while (my ($event, $subtype) = each %EVENT_TYPE) {
408 if (exists $ob->{"event_${event}_plugin"}) { 448 if (exists $ob->{"event_${event}_plugin"}) {
… …
424# arch as in "arch xxx", ie.. objects 464# arch as in "arch xxx", ie.. objects
425sub normalize_arch($) { 465sub normalize_arch($) {
426 my ($ob) = @_; 466 my ($ob) = @_;
427 467
428 normalize_object $ob; 468 normalize_object $ob;
469
470 return if $ob->{_atype} eq "object";
429 471
430 my $arch = $ARCH{$ob->{_name}} 472 my $arch = $ARCH{$ob->{_name}}
431 or (warn "$ob->{_name}: no such archetype", return $ob); 473 or (warn "$ob->{_name}: no such archetype", return $ob);
432 474
433 if ($arch->{type} == 22) { # map 475 if ($arch->{type} == 22) { # map
… …
469} 511}
470 512
471sub attr_thaw($) { 513sub attr_thaw($) {
472 my ($ob) = @_; 514 my ($ob) = @_;
473 515
474 $ob->{attach} = from_json $ob->{attach} 516 $ob->{attach} = decode_json $ob->{attach}
475 if exists $ob->{attach}; 517 if exists $ob->{attach};
476 518
477 $ob 519 $ob
478} 520}
479 521
480sub attr_freeze($) { 522sub attr_freeze($) {
481 my ($ob) = @_; 523 my ($ob) = @_;
482 524
483 $ob->{attach} = Crossfire::to_json $ob->{attach} 525 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
484 if exists $ob->{attach}; 526 if exists $ob->{attach};
485 527
486 $ob 528 $ob
487} 529}
488 530
… …
508 550
509 my %arc; 551 my %arc;
510 my ($more, $prev); 552 my ($more, $prev);
511 my $comment; 553 my $comment;
512 554
513 open my $fh, "<:raw:perlio:utf8", $path 555 open my $fh, "<:utf8", $path
514 or Carp::croak "$path: $!"; 556 or Carp::croak "$path: $!";
515 557
516# binmode $fh; 558# binmode $fh;
517 559
518 my $parse_block; $parse_block = sub { 560 my $parse_block; $parse_block = sub {
… …
618 my $str; 660 my $str;
619 661
620 my $append; $append = sub { 662 my $append; $append = sub {
621 my %a = %{$_[0]}; 663 my %a = %{$_[0]};
622 664
623 Crossfire::attr_freeze \%a; 665 Deliantra::attr_freeze \%a;
624 Crossfire::normalize_arch \%a; 666 Deliantra::normalize_arch \%a;
625 667
626 # undo the bit-split we did before 668 # undo the bit-split we did before
627 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}) {
628 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 670 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
629 | (delete $a{attack_movement_bits_4_7}); 671 | (delete $a{attack_movement_bits_4_7});
… …
647 } 689 }
648 690
649 my @kv; 691 my @kv;
650 692
651 for ($a{_name} eq "map" 693 for ($a{_name} eq "map"
652 ? @Crossfire::FIELD_ORDER_MAP 694 ? @Deliantra::FIELD_ORDER_MAP
653 : @Crossfire::FIELD_ORDER) { 695 : @Deliantra::FIELD_ORDER) {
654 push @kv, [$_, delete $a{$_}] 696 push @kv, [$_, delete $a{$_}]
655 if exists $a{$_}; 697 if exists $a{$_};
656 } 698 }
657 699
658 for (sort keys %a) { 700 for (sort keys %a) {
… …
661 } 703 }
662 704
663 for (@kv) { 705 for (@kv) {
664 my ($k, $v) = @$_; 706 my ($k, $v) = @$_;
665 707
666 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 708 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
667 $v =~ s/\n$//; 709 $v =~ s/\n$//;
668 $str .= "$k\n$v\n$end\n"; 710 $str .= "$k\n$v\n$end\n";
669 } else { 711 } else {
670 $str .= "$k $v\n"; 712 $str .= "$k $v\n";
671 } 713 }
… …
767=cut 809=cut
768 810
769sub arch_attr($) { 811sub arch_attr($) {
770 my ($obj) = @_; 812 my ($obj) = @_;
771 813
772 require Crossfire::Data; 814 require Deliantra::Data;
773 815
774 my $root; 816 my $root;
775 my $attr = { }; 817 my $attr = { };
776 818
777 my $arch = $ARCH{ $obj->{_name} }; 819 my $arch = $ARCH{ $obj->{_name} };
778 my $type = $obj->{type} || $arch->{type}; 820 my $type = $obj->{type} || $arch->{type};
779 821
780 if ($type > 0) { 822 if ($type > 0) {
781 $root = $Crossfire::Data::ATTR{$type}; 823 $root = $Deliantra::Data::ATTR{$type};
782 } else { 824 } else {
783 my %a = (%$arch, %$obj); 825 my %a = (%$arch, %$obj);
784 826
785 if ($a{is_floor} && !$a{alive}) { 827 if ($a{is_floor} && !$a{alive}) {
786 $root = $Crossfire::Data::TYPE{Floor}; 828 $root = $Deliantra::Data::TYPE{Floor};
787 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 829 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
788 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 830 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
789 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 831 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
790 $root = $Crossfire::Data::TYPE{Wall}; 832 $root = $Deliantra::Data::TYPE{Wall};
791 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 833 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
792 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 834 $root = $Deliantra::Data::TYPE{"Weak Wall"};
793 } else { 835 } else {
794 $root = $Crossfire::Data::TYPE{Misc}; 836 $root = $Deliantra::Data::TYPE{Misc};
795 } 837 }
796 } 838 }
797 839
840 my (%ignore);
798 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;
799 857 }
858 (@import) = @new_import;
859
860 # then add defaults to the back of the list, so they are added
861 # as last resort.
800 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 862 push @import, \%Deliantra::Data::DEFAULT_ATTR
801 unless $type == 116; 863 unless $type == 116;
802 864
803 my (%ignore);
804 my (@section_order, %section, @attr_order); 865 my (@section_order, %section, @attr_order);
805 866
867 # @import = root, imported, default
806 while (my $type = shift @import) { 868 while (my $type = pop @import) {
807 push @import, @{$type->{import} || []};
808
809 $attr->{$_} ||= $type->{$_} 869 $attr->{$_} ||= $type->{$_}
810 for qw(name desc use); 870 for qw(name desc use);
811
812 for (@{$type->{ignore} || []}) {
813 $ignore{$_}++ for ref $_ ? @$_ : $_;
814 }
815 871
816 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) { 872 for ([general => ($type->{attr} || [])], @{$type->{section} || []}) {
817 my ($name, $attr) = @$_; 873 my ($name, $attr) = @$_;
818 push @section_order, $name; 874 push @section_order, $name;
819 for (@$attr) { 875 for (@$attr) {
820 my ($k, $v) = @$_; 876 my ($k, $v) = @$_;
821 push @attr_order, $k; 877 push @attr_order, $k;
822 $section{$name}{$k} ||= $v; 878 $section{$name}{$k} = $v; # overwrite, so that the root decides
823 }
824 } 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.
825 } 896 }
826 897
827 $attr->{section} = [ 898 $attr->{section} = [
828 map !exists $section{$_} ? () : do { 899 map !exists $section{$_} ? () : do {
829 my $attr = delete $section{$_}; 900 my $attr = delete $section{$_};
… …
833 map exists $attr->{$_} && !$ignore{$_} 904 map exists $attr->{$_} && !$ignore{$_}
834 ? [$_ => delete $attr->{$_}] : (), 905 ? [$_ => delete $attr->{$_}] : (),
835 @attr_order 906 @attr_order
836 ] 907 ]
837 }, 908 },
838
839 exists $section{$_} ? [$_ => delete $section{$_}] : (), 909 exists $section{$_} ? [$_ => delete $section{$_}] : (),
840 @section_order 910 @section_order
841 ]; 911 ];
842 912
843 $attr 913 $attr
844} 914}
… …
901} 971}
902 972
903sub construct_tilecache_pb { 973sub construct_tilecache_pb {
904 my ($idx, $cache) = @_; 974 my ($idx, $cache) = @_;
905 975
906 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;
907 977
908 while (my ($name, $tile) = each %$cache) { 978 while (my ($name, $tile) = each %$cache) {
909 my $tpb = delete $tile->{pb}; 979 my $tpb = delete $tile->{pb};
910 my $ofs = $tile->{idx}; 980 my $ofs = $tile->{idx};
911 981
912 for my $x (0 .. $tile->{w} - 1) { 982 for my $x (0 .. $tile->{w} - 1) {
913 for my $y (0 .. $tile->{h} - 1) { 983 for my $y (0 .. $tile->{h} - 1) {
914 my $idx = $ofs + $x + $y * $tile->{w}; 984 my $idx = $ofs + $x + $y * $tile->{w};
915 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 985 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
916 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 986 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
917 } 987 }
918 } 988 }
919 } 989 }
920 990
921 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 991 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
937=cut 1007=cut
938 1008
939sub load_tilecache() { 1009sub load_tilecache() {
940 require Gtk2; 1010 require Gtk2;
941 1011
942 if (-e "$LIB/crossfire.0") { # Crossfire1 version
943 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache, 1012 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
944 sub { 1013 sub {
945 my $tile = read_pak "$LIB/crossfire.0";
946
947 my %cache; 1014 my %cache;
1015 my $facedata = Storable::retrieve "$LIB/faceinfo";
948 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};
949 my $idx = 0; 1024 my $idx = 0;
950 1025
951 for my $name (sort keys %$tile) { 1026 for (sort keys %$faces) {
1027 my ($face, $info) = ($_, $faces->{$_});
1028
952 my $pb = new Gtk2::Gdk::PixbufLoader; 1029 my $pb = new Gtk2::Gdk::PixbufLoader;
1030
1031 if (exists $info->{data32}) {
953 $pb->write ($tile->{$name}); 1032 $pb->write ($info->{data32});
954 $pb->close; 1033 } else {
955 my $pb = $pb->get_pixbuf; 1034 sysseek $fh, $info->{fofs32}, 0;
956 1035 sysread $fh, my $buf, $info->{size32};
957 my $tile = $cache{$name} = { 1036 $pb->write ($buf);
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 } 1037 }
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,
974 sub {
975 my %cache;
976 my $facedata = Storable::retrieve "$LIB/facedata";
977
978 $facedata->{version} == 2
979 or die "$LIB/facedata: version mismatch, cannot proceed.";
980
981 my $faces = $facedata->{faceinfo};
982 my $idx = 0;
983
984 for (sort keys %$faces) {
985 my ($face, $info) = ($_, $faces->{$_});
986
987 my $pb = new Gtk2::Gdk::PixbufLoader;
988 $pb->write ($info->{data32});
989 $pb->close; 1038 $pb->close;
990 my $pb = $pb->get_pixbuf; 1039 my $pb = $pb->get_pixbuf;
991 1040
992 my $tile = $cache{$face} = { 1041 my $tile = $cache{$face} = {
993 pb => $pb, 1042 pb => $pb,
994 idx => $idx, 1043 idx => $idx,
995 w => int $pb->get_width / TILESIZE, 1044 w => int $pb->get_width / TILESIZE,
996 h => int $pb->get_height / TILESIZE, 1045 h => int $pb->get_height / TILESIZE,
997 }; 1046 };
998 1047
999 $idx += $tile->{w} * $tile->{h}; 1048 $idx += $tile->{w} * $tile->{h};
1000 } 1049 }
1001 1050
1002 construct_tilecache_pb $idx, \%cache; 1051 construct_tilecache_pb $idx, \%cache;
1003 1052
1004 \%cache 1053 \%cache
1005 }; 1054 };
1006 }
1007} 1055}
1056
1057=back
1008 1058
1009=head1 AUTHOR 1059=head1 AUTHOR
1010 1060
1011 Marc Lehmann <schmorp@schmorp.de> 1061 Marc Lehmann <schmorp@schmorp.de>
1012 http://home.schmorp.de/ 1062 http://home.schmorp.de/
… …
1015 http://www.ta-sa.org/ 1065 http://www.ta-sa.org/
1016 1066
1017=cut 1067=cut
1018 1068
10191 10691
1070

Diff Legend

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