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.103 by root, Mon Apr 16 12:31:22 2007 UTC vs.
Revision 1.129 by root, Sun Jan 11 22:03:03 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.23';
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",
… …
58 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
59 tile_path_1 tile_path_2 tile_path_3 tile_path_4 64 tile_path_1 tile_path_2 tile_path_3 tile_path_4
60)); 65));
61 66
62our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
63 elevation 70 elevation
64 71
65 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
66 slaying skill msg lore other_arch 73 slaying skill msg lore other_arch
67 animation face is_animated 74 sound sound_destroy face animation is_animated
68 magicmap smoothlevel smoothface 75 magicmap smoothlevel smoothface
69 str dex con wis pow cha int 76 str dex con wis pow cha int
70 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
71 exp perm_exp expmul 78 exp perm_exp expmul
72 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
… …
81 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
82 89
83 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
84 value carrying weight invisible state magic 91 value carrying weight invisible state magic
85 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
86 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
87 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
88 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
89 item_power duration range 96 item_power duration range
90 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
91 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
… …
102 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
103 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
104 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
105 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
106 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
107 115
108 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
109 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
110)); 118));
111 119
… …
128sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
129sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
130sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
131sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
132sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
133sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
134sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
135 144
136our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
137 walk => MOVE_WALK, 146 walk => MOVE_WALK,
138 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
139 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
140 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
141 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
142 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
143 all => MOVE_ALL, 153 all => MOVE_ALL,
144); 154);
145 155
146our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = keys %MOVE_TYPE;
147 157
148{ 158{
149 package Crossfire::MoveType; 159 package Deliantra::MoveType;
150 160
151 use overload 161 use overload
152 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
153 '""' => \&as_string, 163 '""' => \&as_string,
154 '>=' => 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 },
… …
174 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
175 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
176 ; 186 ;
177} 187}
178 188
179sub Crossfire::MoveType::new { 189sub Deliantra::MoveType::new {
180 my ($class, $string) = @_; 190 my ($class, $string) = @_;
181 191
182 my $mask; 192 my $mask;
183 my $value; 193 my $value;
184 194
… …
198 } 208 }
199 209
200 (bless [$mask, $value], $class)->normalise 210 (bless [$mask, $value], $class)->normalise
201} 211}
202 212
203sub Crossfire::MoveType::normalise { 213sub Deliantra::MoveType::normalise {
204 my ($self) = @_; 214 my ($self) = @_;
205 215
206 if ($self->[0] & MOVE_ALL) { 216 if ($self->[0] & MOVE_ALL) {
207 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);
208 $self->[0] &= $mask; 218 $self->[0] &= $mask;
… …
212 $self->[1] &= $self->[0]; 222 $self->[1] &= $self->[0];
213 223
214 $self 224 $self
215} 225}
216 226
217sub Crossfire::MoveType::as_string { 227sub Deliantra::MoveType::as_string {
218 my ($self) = @_; 228 my ($self) = @_;
219 229
220 my @res; 230 my @res;
221 231
222 my ($mask, $value) = @$self; 232 my ($mask, $value) = @$self;
223 233
224 for (@Crossfire::MOVE_TYPE) { 234 for (@Deliantra::MOVE_TYPE) {
225 my $bit = $Crossfire::MOVE_TYPE{$_}; 235 my $bit = $Deliantra::MOVE_TYPE{$_};
226 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
227 $mask &= ~$bit; 237 $mask &= ~$bit;
228 push @res, $value & $bit ? $_ : "-$_"; 238 push @res, $value & $bit ? $_ : "-$_";
229 } 239 }
230 } 240 }
… …
342 } else { 352 } else {
343 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
344 } 354 }
345 } 355 }
346 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
347 # 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
348 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 369 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
349 370
350 # nuke outdated or never supported fields 371 # nuke outdated or never supported fields
351 delete @$ob{qw( 372 delete @$ob{qw(
… …
359 380
360 # convert movement strings to bitsets 381 # convert movement strings to bitsets
361 for my $attr (keys %FIELD_MOVEMENT) { 382 for my $attr (keys %FIELD_MOVEMENT) {
362 next unless exists $ob->{$attr}; 383 next unless exists $ob->{$attr};
363 384
364 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 385 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
365 } 386 }
366 387
367 # convert outdated movement flags to new movement sets 388 # convert outdated movement flags to new movement sets
368 if (defined (my $v = delete $ob->{no_pass})) { 389 if (defined (my $v = delete $ob->{no_pass})) {
369 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 390 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
370 } 391 }
371 if (defined (my $v = delete $ob->{slow_move})) { 392 if (defined (my $v = delete $ob->{slow_move})) {
372 $ob->{move_slow} += "walk"; 393 $ob->{move_slow} += "walk";
373 $ob->{move_slow_penalty} = $v; 394 $ob->{move_slow_penalty} = $v;
374 } 395 }
375 if (defined (my $v = delete $ob->{walk_on})) { 396 if (defined (my $v = delete $ob->{walk_on})) {
376 $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" }
377 } 398 }
378 if (defined (my $v = delete $ob->{walk_off})) { 399 if (defined (my $v = delete $ob->{walk_off})) {
379 $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" }
380 } 401 }
381 if (defined (my $v = delete $ob->{fly_on})) { 402 if (defined (my $v = delete $ob->{fly_on})) {
382 $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" }
383 } 404 }
384 if (defined (my $v = delete $ob->{fly_off})) { 405 if (defined (my $v = delete $ob->{fly_off})) {
385 $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" }
386 } 407 }
387 if (defined (my $v = delete $ob->{flying})) { 408 if (defined (my $v = delete $ob->{flying})) {
388 $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" }
389 } 410 }
390 411
391 # convert idiotic event_xxx things into objects 412 # convert idiotic event_xxx things into objects
392 while (my ($event, $subtype) = each %EVENT_TYPE) { 413 while (my ($event, $subtype) = each %EVENT_TYPE) {
393 if (exists $ob->{"event_${event}_plugin"}) { 414 if (exists $ob->{"event_${event}_plugin"}) {
… …
409# arch as in "arch xxx", ie.. objects 430# arch as in "arch xxx", ie.. objects
410sub normalize_arch($) { 431sub normalize_arch($) {
411 my ($ob) = @_; 432 my ($ob) = @_;
412 433
413 normalize_object $ob; 434 normalize_object $ob;
435
436 return if $ob->{_atype} eq "object";
414 437
415 my $arch = $ARCH{$ob->{_name}} 438 my $arch = $ARCH{$ob->{_name}}
416 or (warn "$ob->{_name}: no such archetype", return $ob); 439 or (warn "$ob->{_name}: no such archetype", return $ob);
417 440
418 if ($arch->{type} == 22) { # map 441 if ($arch->{type} == 22) { # map
… …
454} 477}
455 478
456sub attr_thaw($) { 479sub attr_thaw($) {
457 my ($ob) = @_; 480 my ($ob) = @_;
458 481
459 $ob->{attach} = from_json $ob->{attach} 482 $ob->{attach} = decode_json $ob->{attach}
460 if exists $ob->{attach}; 483 if exists $ob->{attach};
461 484
462 $ob 485 $ob
463} 486}
464 487
465sub attr_freeze($) { 488sub attr_freeze($) {
466 my ($ob) = @_; 489 my ($ob) = @_;
467 490
468 $ob->{attach} = Crossfire::to_json $ob->{attach} 491 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
469 if exists $ob->{attach}; 492 if exists $ob->{attach};
470 493
471 $ob 494 $ob
472} 495}
473 496
… …
493 516
494 my %arc; 517 my %arc;
495 my ($more, $prev); 518 my ($more, $prev);
496 my $comment; 519 my $comment;
497 520
498 open my $fh, "<:raw:perlio:utf8", $path 521 open my $fh, "<:utf8", $path
499 or Carp::croak "$path: $!"; 522 or Carp::croak "$path: $!";
500 523
501# binmode $fh; 524# binmode $fh;
502 525
503 my $parse_block; $parse_block = sub { 526 my $parse_block; $parse_block = sub {
… …
603 my $str; 626 my $str;
604 627
605 my $append; $append = sub { 628 my $append; $append = sub {
606 my %a = %{$_[0]}; 629 my %a = %{$_[0]};
607 630
608 Crossfire::attr_freeze \%a; 631 Deliantra::attr_freeze \%a;
609 Crossfire::normalize_arch \%a; 632 Deliantra::normalize_arch \%a;
610 633
611 # undo the bit-split we did before 634 # undo the bit-split we did before
612 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}) {
613 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 636 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
614 | (delete $a{attack_movement_bits_4_7}); 637 | (delete $a{attack_movement_bits_4_7});
… …
632 } 655 }
633 656
634 my @kv; 657 my @kv;
635 658
636 for ($a{_name} eq "map" 659 for ($a{_name} eq "map"
637 ? @Crossfire::FIELD_ORDER_MAP 660 ? @Deliantra::FIELD_ORDER_MAP
638 : @Crossfire::FIELD_ORDER) { 661 : @Deliantra::FIELD_ORDER) {
639 push @kv, [$_, delete $a{$_}] 662 push @kv, [$_, delete $a{$_}]
640 if exists $a{$_}; 663 if exists $a{$_};
641 } 664 }
642 665
643 for (sort keys %a) { 666 for (sort keys %a) {
… …
646 } 669 }
647 670
648 for (@kv) { 671 for (@kv) {
649 my ($k, $v) = @$_; 672 my ($k, $v) = @$_;
650 673
651 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 674 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
652 $v =~ s/\n$//; 675 $v =~ s/\n$//;
653 $str .= "$k\n$v\n$end\n"; 676 $str .= "$k\n$v\n$end\n";
654 } else { 677 } else {
655 $str .= "$k $v\n"; 678 $str .= "$k $v\n";
656 } 679 }
… …
752=cut 775=cut
753 776
754sub arch_attr($) { 777sub arch_attr($) {
755 my ($obj) = @_; 778 my ($obj) = @_;
756 779
757 require Crossfire::Data; 780 require Deliantra::Data;
758 781
759 my $root; 782 my $root;
760 my $attr = { }; 783 my $attr = { };
761 784
762 my $arch = $ARCH{ $obj->{_name} }; 785 my $arch = $ARCH{ $obj->{_name} };
763 my $type = $obj->{type} || $arch->{type}; 786 my $type = $obj->{type} || $arch->{type};
764 787
765 if ($type > 0) { 788 if ($type > 0) {
766 $root = $Crossfire::Data::ATTR{$type}; 789 $root = $Deliantra::Data::ATTR{$type};
767 } else { 790 } else {
768 my %a = (%$arch, %$obj); 791 my %a = (%$arch, %$obj);
769 792
770 if ($a{is_floor} && !$a{alive}) { 793 if ($a{is_floor} && !$a{alive}) {
771 $root = $Crossfire::Data::TYPE{Floor}; 794 $root = $Deliantra::Data::TYPE{Floor};
772 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 795 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
773 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 796 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
774 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 797 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
775 $root = $Crossfire::Data::TYPE{Wall}; 798 $root = $Deliantra::Data::TYPE{Wall};
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{"Weak Wall"}; 800 $root = $Deliantra::Data::TYPE{"Weak Wall"};
778 } else { 801 } else {
779 $root = $Crossfire::Data::TYPE{Misc}; 802 $root = $Deliantra::Data::TYPE{Misc};
780 } 803 }
781 } 804 }
782 805
783 my @import = ($root); 806 my @import = ($root);
784 807
785 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 808 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
786 unless $type == 116; 809 unless $type == 116;
787 810
788 my (%ignore); 811 my (%ignore);
789 my (@section_order, %section, @attr_order); 812 my (@section_order, %section, @attr_order);
790 813
791 while (my $type = shift @import) { 814 while (my $type = shift @import) {
815 push @import,
816 grep $_,
817 map $Deliantra::Data::TYPE{$_},
792 push @import, @{$type->{import} || []}; 818 @{$type->{import} || []};
793 819
794 $attr->{$_} ||= $type->{$_} 820 $attr->{$_} ||= $type->{$_}
795 for qw(name desc use); 821 for qw(name desc use);
796 822
797 for (@{$type->{ignore} || []}) { 823 for (@{$type->{ignore} || []}) {
… …
886} 912}
887 913
888sub construct_tilecache_pb { 914sub construct_tilecache_pb {
889 my ($idx, $cache) = @_; 915 my ($idx, $cache) = @_;
890 916
891 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;
892 918
893 while (my ($name, $tile) = each %$cache) { 919 while (my ($name, $tile) = each %$cache) {
894 my $tpb = delete $tile->{pb}; 920 my $tpb = delete $tile->{pb};
895 my $ofs = $tile->{idx}; 921 my $ofs = $tile->{idx};
896 922
897 for my $x (0 .. $tile->{w} - 1) { 923 for my $x (0 .. $tile->{w} - 1) {
898 for my $y (0 .. $tile->{h} - 1) { 924 for my $y (0 .. $tile->{h} - 1) {
899 my $idx = $ofs + $x + $y * $tile->{w}; 925 my $idx = $ofs + $x + $y * $tile->{w};
900 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 926 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
901 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 927 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
902 } 928 }
903 } 929 }
904 } 930 }
905 931
906 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 932 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
922=cut 948=cut
923 949
924sub load_tilecache() { 950sub load_tilecache() {
925 require Gtk2; 951 require Gtk2;
926 952
927 if (-e "$LIB/crossfire.0") { # Crossfire1 version
928 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", \&use_tilecache,
929 sub {
930 my $tile = read_pak "$LIB/crossfire.0";
931
932 my %cache;
933
934 my $idx = 0;
935
936 for my $name (sort keys %$tile) {
937 my $pb = new Gtk2::Gdk::PixbufLoader;
938 $pb->write ($tile->{$name});
939 $pb->close;
940 my $pb = $pb->get_pixbuf;
941
942 my $tile = $cache{$name} = {
943 pb => $pb,
944 idx => $idx,
945 w => int $pb->get_width / TILESIZE,
946 h => int $pb->get_height / TILESIZE,
947 };
948
949 $idx += $tile->{w} * $tile->{h};
950 }
951
952 construct_tilecache_pb $idx, \%cache;
953
954 \%cache
955 };
956
957 } else { # Crossfire+ version
958 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache, 953 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
959 sub { 954 sub {
960 my %cache; 955 my %cache;
961 my $facedata = Storable::retrieve "$LIB/facedata"; 956 my $facedata = Storable::retrieve "$LIB/facedata";
962 957
963 $facedata->{version} == 2 958 $facedata->{version} == 2
964 or die "$LIB/facedata: version mismatch, cannot proceed."; 959 or die "$LIB/facedata: version mismatch, cannot proceed.";
965 960
966 my $faces = $facedata->{faceinfo}; 961 my $faces = $facedata->{faceinfo};
967 my $idx = 0; 962 my $idx = 0;
968 963
969 for (sort keys %$faces) { 964 for (sort keys %$faces) {
970 my ($face, $info) = ($_, $faces->{$_}); 965 my ($face, $info) = ($_, $faces->{$_});
971 966
972 my $pb = new Gtk2::Gdk::PixbufLoader; 967 my $pb = new Gtk2::Gdk::PixbufLoader;
973 $pb->write ($info->{data32}); 968 $pb->write ($info->{data32});
974 $pb->close; 969 $pb->close;
975 my $pb = $pb->get_pixbuf; 970 my $pb = $pb->get_pixbuf;
976 971
977 my $tile = $cache{$face} = { 972 my $tile = $cache{$face} = {
978 pb => $pb, 973 pb => $pb,
979 idx => $idx, 974 idx => $idx,
980 w => int $pb->get_width / TILESIZE, 975 w => int $pb->get_width / TILESIZE,
981 h => int $pb->get_height / TILESIZE, 976 h => int $pb->get_height / TILESIZE,
982 }; 977 };
983 978
984 $idx += $tile->{w} * $tile->{h}; 979 $idx += $tile->{w} * $tile->{h};
985 } 980 }
986 981
987 construct_tilecache_pb $idx, \%cache; 982 construct_tilecache_pb $idx, \%cache;
988 983
989 \%cache 984 \%cache
990 }; 985 };
991 }
992} 986}
993 987
994=head1 AUTHOR 988=head1 AUTHOR
995 989
996 Marc Lehmann <schmorp@schmorp.de> 990 Marc Lehmann <schmorp@schmorp.de>
… …
1000 http://www.ta-sa.org/ 994 http://www.ta-sa.org/
1001 995
1002=cut 996=cut
1003 997
10041 9981
999

Diff Legend

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