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.106 by root, Mon Apr 23 19:09:48 2007 UTC vs.
Revision 1.134 by root, Wed Oct 28 10:17:01 2009 UTC

1=head1 NAME 1=head1 NAME
2 2
3Crossfire - Crossfire maphandling 3Deliantra - Deliantra suppport module to read/write archetypes, maps etc.
4
5=over 4
4 6
5=cut 7=cut
6 8
7package Crossfire; 9package Deliantra;
8 10
9our $VERSION = '0.98'; 11our $VERSION = '1.25';
10 12
11use strict; 13use common::sense;
12 14
13use base 'Exporter'; 15use base 'Exporter';
14 16
15use Carp (); 17use Carp ();
16use File::Spec; 18use File::Spec;
17use List::Util qw(min max); 19use List::Util qw(min max);
18use Storable qw(freeze thaw); 20use Storable qw(freeze thaw);
19 21
20our @EXPORT = qw( 22our @EXPORT = qw(
21 read_pak read_arch *ARCH TILESIZE $TILE *FACE editor_archs arch_extents 23 read_pak read_arch
24 *ARCH $TILE *FACE *FACEDATA
25 TILESIZE CACHESTRIDE
26 editor_archs arch_extents
22); 27);
23 28
24use JSON::XS qw(from_json to_json); 29use JSON::XS qw(decode_json encode_json);
25 30
26our $LIB = $ENV{CROSSFIRE_LIBDIR}; 31our $LIB = $ENV{DELIANTRA_LIBDIR};
27 32
28our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 33our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
29 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 34 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
30 : File::Spec->tmpdir . "/crossfire"; 35 : File::Spec->tmpdir . "/deliantra";
31 36
32mkdir $VARDIR, 0777; 37mkdir $VARDIR, 0777;
33 38
34sub TILESIZE (){ 32 } 39sub TILESIZE (){ 32 }
40sub CACHESTRIDE (){ 64 }
35 41
36our %ARCH; 42our %ARCH;
43our %FACE; # face32
37our %FACE; 44our %FACEDATA;
38our $TILE; 45our $TILE;
39 46
40our %FIELD_MULTILINE = ( 47our %FIELD_MULTILINE = (
41 msg => "endmsg", 48 msg => "endmsg",
42 lore => "endlore", 49 lore => "endlore",
… …
64 71
65 elevation 72 elevation
66 73
67 name name_pl custom_name attach title race 74 name name_pl custom_name attach title race
68 slaying skill msg lore other_arch 75 slaying skill msg lore other_arch
69 face animation is_animated 76 sound sound_destroy face animation is_animated
70 magicmap smoothlevel smoothface 77 magicmap smoothlevel smoothface
71 str dex con wis pow cha int 78 str dex con wis pow cha int
72 hp maxhp sp maxsp grace maxgrace 79 hp maxhp sp maxsp grace maxgrace
73 exp perm_exp expmul 80 exp perm_exp expmul
74 food dam luck wc ac x y speed speed_left move_state attack_movement 81 food dam luck wc ac x y speed speed_left move_state attack_movement
… …
83 resist_life_stealing resist_disease 90 resist_life_stealing resist_disease
84 91
85 path_attuned path_repelled path_denied material materialname 92 path_attuned path_repelled path_denied material materialname
86 value carrying weight invisible state magic 93 value carrying weight invisible state magic
87 last_heal last_sp last_grace last_eat 94 last_heal last_sp last_grace last_eat
88 connected glow_radius randomitems npx_status npc_program 95 connected glow_radius randomitems tresure_env npx_status npc_program
89 run_away pick_up container will_apply smoothlevel 96 run_away pick_up container will_apply smoothlevel
90 current_weapon_script weapontype tooltype elevation client_type 97 current_weapon_script weapontype tooltype elevation client_type
91 item_power duration range 98 item_power duration range
92 range_modifier duration_modifier dam_modifier gen_sp_armour 99 range_modifier duration_modifier dam_modifier gen_sp_armour
93 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty 100 move_type move_block move_allow move_on move_off move_on move_slow move_slow_penalty
… …
104 known_magical known_cursed can_use_skill been_applied has_ready_scroll 111 known_magical known_cursed can_use_skill been_applied has_ready_scroll
105 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly 112 can_use_rod can_use_horn make_invisible inv_locked is_wooded is_hilly
106 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark 113 has_ready_skill has_ready_weapon no_skill_ident is_blind can_see_in_dark
107 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage 114 is_cauldron is_dust no_steal one_hit berserk neutral no_attack no_damage
108 activate_on_push activate_on_release is_water use_content_on_gen is_buildable 115 activate_on_push activate_on_release is_water use_content_on_gen is_buildable
116 precious
109 117
110 body_range body_arm body_torso body_head body_neck body_skill 118 body_range body_arm body_torso body_head body_neck body_skill
111 body_finger body_shoulder body_foot body_hand body_wrist body_waist 119 body_finger body_shoulder body_foot body_hand body_wrist body_waist
112)); 120));
113 121
… …
145 boat => MOVE_BOAT, 153 boat => MOVE_BOAT,
146 ship => MOVE_SHIP, 154 ship => MOVE_SHIP,
147 all => MOVE_ALL, 155 all => MOVE_ALL,
148); 156);
149 157
150our @MOVE_TYPE = keys %MOVE_TYPE; 158our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat ship);
151 159
152{ 160{
153 package Crossfire::MoveType; 161 package Deliantra::MoveType;
154 162
155 use overload 163 use overload
156 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 164 '=' => sub { bless [@{$_[0]}], ref $_[0] },
157 '""' => \&as_string, 165 '""' => \&as_string,
158 '>=' => 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 },
… …
176 $_[0] 184 $_[0]
177 }, 185 },
178 'eq' => sub { "$_[0]" eq "$_[1]" }, 186 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" }, 187 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ; 188 ;
181}
182 189
183sub Crossfire::MoveType::new { 190 sub TO_JSON {
191 $_[0][0]
192 }
193}
194
195sub Deliantra::MoveType::new {
184 my ($class, $string) = @_; 196 my ($class, $string) = @_;
185 197
186 my $mask; 198 my $mask;
187 my $value; 199 my $value;
188 200
… …
202 } 214 }
203 215
204 (bless [$mask, $value], $class)->normalise 216 (bless [$mask, $value], $class)->normalise
205} 217}
206 218
207sub Crossfire::MoveType::normalise { 219sub Deliantra::MoveType::normalise {
208 my ($self) = @_; 220 my ($self) = @_;
209 221
210 if ($self->[0] & MOVE_ALL) { 222 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 223 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask; 224 $self->[0] &= $mask;
… …
216 $self->[1] &= $self->[0]; 228 $self->[1] &= $self->[0];
217 229
218 $self 230 $self
219} 231}
220 232
221sub Crossfire::MoveType::as_string { 233sub Deliantra::MoveType::as_string {
222 my ($self) = @_; 234 my ($self) = @_;
223 235
224 my @res; 236 my @res;
225 237
226 my ($mask, $value) = @$self; 238 my ($mask, $value) = @$self;
227 239
228 for (@Crossfire::MOVE_TYPE) { 240 for (@Deliantra::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_}; 241 my $bit = $Deliantra::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 242 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit; 243 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_"; 244 push @res, $value & $bit ? $_ : "-$_";
233 } 245 }
234 } 246 }
… …
346 } else { 358 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 359 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 } 360 }
349 } 361 }
350 362
363 # check whether attachment is the same as in the archetype
364 if (exists $ob->{attach}) {
365 my $arch = $ARCH{$ob->{_name}};
366 my $js = JSON::XS->new->utf8->canonical (1);
367
368 if (defined $arch->{attach}
369 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
370 delete $ob->{attach}
371 }
372 }
373
351 # color_fg is used as default for magicmap if magicmap does not exist 374 # color_fg is used as default for magicmap if magicmap does not exist
352 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 375 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353 376
354 # nuke outdated or never supported fields 377 # nuke outdated or never supported fields
355 delete @$ob{qw( 378 delete @$ob{qw(
… …
363 386
364 # convert movement strings to bitsets 387 # convert movement strings to bitsets
365 for my $attr (keys %FIELD_MOVEMENT) { 388 for my $attr (keys %FIELD_MOVEMENT) {
366 next unless exists $ob->{$attr}; 389 next unless exists $ob->{$attr};
367 390
368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 391 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
369 } 392 }
370 393
371 # convert outdated movement flags to new movement sets 394 # convert outdated movement flags to new movement sets
372 if (defined (my $v = delete $ob->{no_pass})) { 395 if (defined (my $v = delete $ob->{no_pass})) {
373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 396 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
374 } 397 }
375 if (defined (my $v = delete $ob->{slow_move})) { 398 if (defined (my $v = delete $ob->{slow_move})) {
376 $ob->{move_slow} += "walk"; 399 $ob->{move_slow} += "walk";
377 $ob->{move_slow_penalty} = $v; 400 $ob->{move_slow_penalty} = $v;
378 } 401 }
379 if (defined (my $v = delete $ob->{walk_on})) { 402 if (defined (my $v = delete $ob->{walk_on})) {
380 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" } 403 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
381 } 404 }
382 if (defined (my $v = delete $ob->{walk_off})) { 405 if (defined (my $v = delete $ob->{walk_off})) {
383 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" } 406 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
384 } 407 }
385 if (defined (my $v = delete $ob->{fly_on})) { 408 if (defined (my $v = delete $ob->{fly_on})) {
386 $ob->{move_on} ||= new Crossfire::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" } 409 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
387 } 410 }
388 if (defined (my $v = delete $ob->{fly_off})) { 411 if (defined (my $v = delete $ob->{fly_off})) {
389 $ob->{move_off} ||= new Crossfire::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" } 412 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
390 } 413 }
391 if (defined (my $v = delete $ob->{flying})) { 414 if (defined (my $v = delete $ob->{flying})) {
392 $ob->{move_type} ||= new Crossfire::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" } 415 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
393 } 416 }
394 417
395 # convert idiotic event_xxx things into objects 418 # convert idiotic event_xxx things into objects
396 while (my ($event, $subtype) = each %EVENT_TYPE) { 419 while (my ($event, $subtype) = each %EVENT_TYPE) {
397 if (exists $ob->{"event_${event}_plugin"}) { 420 if (exists $ob->{"event_${event}_plugin"}) {
… …
413# arch as in "arch xxx", ie.. objects 436# arch as in "arch xxx", ie.. objects
414sub normalize_arch($) { 437sub normalize_arch($) {
415 my ($ob) = @_; 438 my ($ob) = @_;
416 439
417 normalize_object $ob; 440 normalize_object $ob;
441
442 return if $ob->{_atype} eq "object";
418 443
419 my $arch = $ARCH{$ob->{_name}} 444 my $arch = $ARCH{$ob->{_name}}
420 or (warn "$ob->{_name}: no such archetype", return $ob); 445 or (warn "$ob->{_name}: no such archetype", return $ob);
421 446
422 if ($arch->{type} == 22) { # map 447 if ($arch->{type} == 22) { # map
… …
458} 483}
459 484
460sub attr_thaw($) { 485sub attr_thaw($) {
461 my ($ob) = @_; 486 my ($ob) = @_;
462 487
463 $ob->{attach} = from_json $ob->{attach} 488 $ob->{attach} = decode_json $ob->{attach}
464 if exists $ob->{attach}; 489 if exists $ob->{attach};
465 490
466 $ob 491 $ob
467} 492}
468 493
469sub attr_freeze($) { 494sub attr_freeze($) {
470 my ($ob) = @_; 495 my ($ob) = @_;
471 496
472 $ob->{attach} = Crossfire::to_json $ob->{attach} 497 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
473 if exists $ob->{attach}; 498 if exists $ob->{attach};
474 499
475 $ob 500 $ob
476} 501}
477 502
… …
497 522
498 my %arc; 523 my %arc;
499 my ($more, $prev); 524 my ($more, $prev);
500 my $comment; 525 my $comment;
501 526
502 open my $fh, "<:raw:perlio:utf8", $path 527 open my $fh, "<:utf8", $path
503 or Carp::croak "$path: $!"; 528 or Carp::croak "$path: $!";
504 529
505# binmode $fh; 530# binmode $fh;
506 531
507 my $parse_block; $parse_block = sub { 532 my $parse_block; $parse_block = sub {
… …
607 my $str; 632 my $str;
608 633
609 my $append; $append = sub { 634 my $append; $append = sub {
610 my %a = %{$_[0]}; 635 my %a = %{$_[0]};
611 636
612 Crossfire::attr_freeze \%a; 637 Deliantra::attr_freeze \%a;
613 Crossfire::normalize_arch \%a; 638 Deliantra::normalize_arch \%a;
614 639
615 # undo the bit-split we did before 640 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 641 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) {
617 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 642 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7}); 643 | (delete $a{attack_movement_bits_4_7});
… …
636 } 661 }
637 662
638 my @kv; 663 my @kv;
639 664
640 for ($a{_name} eq "map" 665 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP 666 ? @Deliantra::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) { 667 : @Deliantra::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}] 668 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_}; 669 if exists $a{$_};
645 } 670 }
646 671
647 for (sort keys %a) { 672 for (sort keys %a) {
… …
650 } 675 }
651 676
652 for (@kv) { 677 for (@kv) {
653 my ($k, $v) = @$_; 678 my ($k, $v) = @$_;
654 679
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 680 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//; 681 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n"; 682 $str .= "$k\n$v\n$end\n";
658 } else { 683 } else {
659 $str .= "$k $v\n"; 684 $str .= "$k $v\n";
660 } 685 }
… …
756=cut 781=cut
757 782
758sub arch_attr($) { 783sub arch_attr($) {
759 my ($obj) = @_; 784 my ($obj) = @_;
760 785
761 require Crossfire::Data; 786 require Deliantra::Data;
762 787
763 my $root; 788 my $root;
764 my $attr = { }; 789 my $attr = { };
765 790
766 my $arch = $ARCH{ $obj->{_name} }; 791 my $arch = $ARCH{ $obj->{_name} };
767 my $type = $obj->{type} || $arch->{type}; 792 my $type = $obj->{type} || $arch->{type};
768 793
769 if ($type > 0) { 794 if ($type > 0) {
770 $root = $Crossfire::Data::ATTR{$type}; 795 $root = $Deliantra::Data::ATTR{$type};
771 } else { 796 } else {
772 my %a = (%$arch, %$obj); 797 my %a = (%$arch, %$obj);
773 798
774 if ($a{is_floor} && !$a{alive}) { 799 if ($a{is_floor} && !$a{alive}) {
775 $root = $Crossfire::Data::TYPE{Floor}; 800 $root = $Deliantra::Data::TYPE{Floor};
776 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 801 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 802 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
778 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 803 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
779 $root = $Crossfire::Data::TYPE{Wall}; 804 $root = $Deliantra::Data::TYPE{Wall};
780 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 805 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
781 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 806 $root = $Deliantra::Data::TYPE{"Weak Wall"};
782 } else { 807 } else {
783 $root = $Crossfire::Data::TYPE{Misc}; 808 $root = $Deliantra::Data::TYPE{Misc};
784 } 809 }
785 } 810 }
786 811
787 my @import = ($root); 812 my @import = ($root);
788 813
789 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 814 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
790 unless $type == 116; 815 unless $type == 116;
791 816
792 my (%ignore); 817 my (%ignore);
793 my (@section_order, %section, @attr_order); 818 my (@section_order, %section, @attr_order);
794 819
795 while (my $type = shift @import) { 820 while (my $type = shift @import) {
821 push @import,
822 grep $_,
823 map $Deliantra::Data::TYPE{$_},
796 push @import, @{$type->{import} || []}; 824 @{$type->{import} || []};
797 825
798 $attr->{$_} ||= $type->{$_} 826 $attr->{$_} ||= $type->{$_}
799 for qw(name desc use); 827 for qw(name desc use);
800 828
801 for (@{$type->{ignore} || []}) { 829 for (@{$type->{ignore} || []}) {
… …
890} 918}
891 919
892sub construct_tilecache_pb { 920sub construct_tilecache_pb {
893 my ($idx, $cache) = @_; 921 my ($idx, $cache) = @_;
894 922
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 923 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
896 924
897 while (my ($name, $tile) = each %$cache) { 925 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb}; 926 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx}; 927 my $ofs = $tile->{idx};
900 928
901 for my $x (0 .. $tile->{w} - 1) { 929 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) { 930 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w}; 931 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 932 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 933 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
906 } 934 }
907 } 935 }
908 } 936 }
909 937
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 938 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
926=cut 954=cut
927 955
928sub load_tilecache() { 956sub load_tilecache() {
929 require Gtk2; 957 require Gtk2;
930 958
931 if (-e "$LIB/crossfire.0") { # Crossfire1 version
932 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
933 sub {
934 my $tile = read_pak "$LIB/crossfire.0";
935
936 my %cache;
937
938 my $idx = 0;
939
940 for my $name (sort keys %$tile) {
941 my $pb = new Gtk2::Gdk::PixbufLoader;
942 $pb->write ($tile->{$name});
943 $pb->close;
944 my $pb = $pb->get_pixbuf;
945
946 my $tile = $cache{$name} = {
947 pb => $pb,
948 idx => $idx,
949 w => int $pb->get_width / TILESIZE,
950 h => int $pb->get_height / TILESIZE,
951 };
952
953 $idx += $tile->{w} * $tile->{h};
954 }
955
956 construct_tilecache_pb $idx, \%cache;
957
958 \%cache
959 };
960
961 } else { # Crossfire+ version
962 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 959 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub { 960 sub {
964 my %cache; 961 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata"; 962 my $facedata = Storable::retrieve "$LIB/facedata";
966 963
967 $facedata->{version} == 2 964 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed."; 965 or die "$LIB/facedata: version mismatch, cannot proceed.";
969 966
970 my $faces = $facedata->{faceinfo}; 967 my $faces = $facedata->{faceinfo};
971 my $idx = 0; 968 my $idx = 0;
972 969
973 for (sort keys %$faces) { 970 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_}); 971 my ($face, $info) = ($_, $faces->{$_});
975 972
976 my $pb = new Gtk2::Gdk::PixbufLoader; 973 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32}); 974 $pb->write ($info->{data32});
978 $pb->close; 975 $pb->close;
979 my $pb = $pb->get_pixbuf; 976 my $pb = $pb->get_pixbuf;
980 977
981 my $tile = $cache{$face} = { 978 my $tile = $cache{$face} = {
982 pb => $pb, 979 pb => $pb,
983 idx => $idx, 980 idx => $idx,
984 w => int $pb->get_width / TILESIZE, 981 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE, 982 h => int $pb->get_height / TILESIZE,
986 }; 983 };
987 984
988 $idx += $tile->{w} * $tile->{h}; 985 $idx += $tile->{w} * $tile->{h};
989 } 986 }
990 987
991 construct_tilecache_pb $idx, \%cache; 988 construct_tilecache_pb $idx, \%cache;
992 989
993 \%cache 990 \%cache
994 }; 991 };
995 }
996} 992}
993
994=back
997 995
998=head1 AUTHOR 996=head1 AUTHOR
999 997
1000 Marc Lehmann <schmorp@schmorp.de> 998 Marc Lehmann <schmorp@schmorp.de>
1001 http://home.schmorp.de/ 999 http://home.schmorp.de/
… …
1004 http://www.ta-sa.org/ 1002 http://www.ta-sa.org/
1005 1003
1006=cut 1004=cut
1007 1005
10081 10061
1007

Diff Legend

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