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.131 by root, Tue Sep 1 21:37:25 2009 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.24';
10 10
11use strict; 11use common::sense;
12 12
13use base 'Exporter'; 13use base 'Exporter';
14 14
15use Carp (); 15use Carp ();
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
… …
145 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
146 ship => MOVE_SHIP, 152 ship => MOVE_SHIP,
147 all => MOVE_ALL, 153 all => MOVE_ALL,
148); 154);
149 155
150our @MOVE_TYPE = keys %MOVE_TYPE; 156our @MOVE_TYPE = qw(all ship boat swim flying fly_high fly_low walk);
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 },
… …
176 $_[0] 182 $_[0]
177 }, 183 },
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}
182 187
183sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
184 my ($class, $string) = @_; 194 my ($class, $string) = @_;
185 195
186 my $mask; 196 my $mask;
187 my $value; 197 my $value;
188 198
… …
202 } 212 }
203 213
204 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
205} 215}
206 216
207sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
208 my ($self) = @_; 218 my ($self) = @_;
209 219
210 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 221 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
216 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
217 227
218 $self 228 $self
219} 229}
220 230
221sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
222 my ($self) = @_; 232 my ($self) = @_;
223 233
224 my @res; 234 my @res;
225 235
226 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
227 237
228 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit; 241 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
233 } 243 }
234 } 244 }
… …
346 } else { 356 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 } 358 }
349 } 359 }
350 360
361 # check whether attachment is the same as in the archetype
362 if (exists $ob->{attach}) {
363 my $arch = $ARCH{$ob->{_name}};
364 my $js = JSON::XS->new->utf8->canonical (1);
365
366 if (defined $arch->{attach}
367 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
368 delete $ob->{attach}
369 }
370 }
371
351 # color_fg is used as default for magicmap if magicmap does not exist 372 # 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}; 373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353 374
354 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
355 delete @$ob{qw( 376 delete @$ob{qw(
… …
363 384
364 # convert movement strings to bitsets 385 # convert movement strings to bitsets
365 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
366 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
367 388
368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
369 } 390 }
370 391
371 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
372 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
374 } 395 }
375 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
376 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
377 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
378 } 399 }
379 if (defined (my $v = delete $ob->{walk_on})) { 400 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" } 401 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
381 } 402 }
382 if (defined (my $v = delete $ob->{walk_off})) { 403 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" } 404 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
384 } 405 }
385 if (defined (my $v = delete $ob->{fly_on})) { 406 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" } 407 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
387 } 408 }
388 if (defined (my $v = delete $ob->{fly_off})) { 409 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" } 410 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
390 } 411 }
391 if (defined (my $v = delete $ob->{flying})) { 412 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" } 413 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
393 } 414 }
394 415
395 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
396 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
397 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
413# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
414sub normalize_arch($) { 435sub normalize_arch($) {
415 my ($ob) = @_; 436 my ($ob) = @_;
416 437
417 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
418 441
419 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
420 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
421 444
422 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
458} 481}
459 482
460sub attr_thaw($) { 483sub attr_thaw($) {
461 my ($ob) = @_; 484 my ($ob) = @_;
462 485
463 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
464 if exists $ob->{attach}; 487 if exists $ob->{attach};
465 488
466 $ob 489 $ob
467} 490}
468 491
469sub attr_freeze($) { 492sub attr_freeze($) {
470 my ($ob) = @_; 493 my ($ob) = @_;
471 494
472 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
473 if exists $ob->{attach}; 496 if exists $ob->{attach};
474 497
475 $ob 498 $ob
476} 499}
477 500
… …
497 520
498 my %arc; 521 my %arc;
499 my ($more, $prev); 522 my ($more, $prev);
500 my $comment; 523 my $comment;
501 524
502 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
503 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
504 527
505# binmode $fh; 528# binmode $fh;
506 529
507 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
607 my $str; 630 my $str;
608 631
609 my $append; $append = sub { 632 my $append; $append = sub {
610 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
611 634
612 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
613 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
614 637
615 # undo the bit-split we did before 638 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 639 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}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
636 } 659 }
637 660
638 my @kv; 661 my @kv;
639 662
640 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_}; 667 if exists $a{$_};
645 } 668 }
646 669
647 for (sort keys %a) { 670 for (sort keys %a) {
… …
650 } 673 }
651 674
652 for (@kv) { 675 for (@kv) {
653 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
654 677
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//; 679 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
658 } else { 681 } else {
659 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
660 } 683 }
… …
756=cut 779=cut
757 780
758sub arch_attr($) { 781sub arch_attr($) {
759 my ($obj) = @_; 782 my ($obj) = @_;
760 783
761 require Crossfire::Data; 784 require Deliantra::Data;
762 785
763 my $root; 786 my $root;
764 my $attr = { }; 787 my $attr = { };
765 788
766 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
767 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
768 791
769 if ($type > 0) { 792 if ($type > 0) {
770 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
771 } else { 794 } else {
772 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
773 796
774 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
775 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
776 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
778 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
779 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
780 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
781 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
782 } else { 805 } else {
783 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
784 } 807 }
785 } 808 }
786 809
787 my @import = ($root); 810 my @import = ($root);
788 811
789 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
790 unless $type == 116; 813 unless $type == 116;
791 814
792 my (%ignore); 815 my (%ignore);
793 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
794 817
795 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
796 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
797 823
798 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
799 for qw(name desc use); 825 for qw(name desc use);
800 826
801 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
890} 916}
891 917
892sub construct_tilecache_pb { 918sub construct_tilecache_pb {
893 my ($idx, $cache) = @_; 919 my ($idx, $cache) = @_;
894 920
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
896 922
897 while (my ($name, $tile) = each %$cache) { 923 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb}; 924 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx}; 925 my $ofs = $tile->{idx};
900 926
901 for my $x (0 .. $tile->{w} - 1) { 927 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) { 928 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w}; 929 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
906 } 932 }
907 } 933 }
908 } 934 }
909 935
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
926=cut 952=cut
927 953
928sub load_tilecache() { 954sub load_tilecache() {
929 require Gtk2; 955 require Gtk2;
930 956
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, 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub { 958 sub {
964 my %cache; 959 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata"; 960 my $facedata = Storable::retrieve "$LIB/facedata";
966 961
967 $facedata->{version} == 2 962 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed."; 963 or die "$LIB/facedata: version mismatch, cannot proceed.";
969 964
970 my $faces = $facedata->{faceinfo}; 965 my $faces = $facedata->{faceinfo};
971 my $idx = 0; 966 my $idx = 0;
972 967
973 for (sort keys %$faces) { 968 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_}); 969 my ($face, $info) = ($_, $faces->{$_});
975 970
976 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32}); 972 $pb->write ($info->{data32});
978 $pb->close; 973 $pb->close;
979 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
980 975
981 my $tile = $cache{$face} = { 976 my $tile = $cache{$face} = {
982 pb => $pb, 977 pb => $pb,
983 idx => $idx, 978 idx => $idx,
984 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
986 }; 981 };
987 982
988 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
989 } 984 }
990 985
991 construct_tilecache_pb $idx, \%cache; 986 construct_tilecache_pb $idx, \%cache;
992 987
993 \%cache 988 \%cache
994 }; 989 };
995 }
996} 990}
997 991
998=head1 AUTHOR 992=head1 AUTHOR
999 993
1000 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
1004 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
1005 999
1006=cut 1000=cut
1007 1001
10081 10021
1003

Diff Legend

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