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.128 by root, Sun Sep 28 05:58:01 2008 UTC

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

Diff Legend

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