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.136 by elmex, Mon Nov 9 15:25:35 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 },
167 '<=' => sub {
168 ($_[0][0] & $MOVE_TYPE{$_[1]}) == $MOVE_TYPE{$_[1]}
169 ? $_[0][1] & $MOVE_TYPE{$_[1]}
170 : undef
171 },
159 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise }, 172 '+=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] |= $MOVE_TYPE{$_[1]}; &normalise },
160 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 173 '-=' => sub { $_[0][0] |= $MOVE_TYPE{$_[1]}; $_[0][1] &= ~$MOVE_TYPE{$_[1]}; &normalise },
161 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise }, 174 '/=' => sub { $_[0][0] &= ~$MOVE_TYPE{$_[1]}; &normalise },
162 'x=' => sub { 175 'x=' => sub {
163 my $cur = $_[0] >= $_[1]; 176 my $cur = $_[0] >= $_[1];
… …
176 $_[0] 189 $_[0]
177 }, 190 },
178 'eq' => sub { "$_[0]" eq "$_[1]" }, 191 'eq' => sub { "$_[0]" eq "$_[1]" },
179 'ne' => sub { "$_[0]" ne "$_[1]" }, 192 'ne' => sub { "$_[0]" ne "$_[1]" },
180 ; 193 ;
181}
182 194
183sub Crossfire::MoveType::new { 195 sub TO_JSON {
196 $_[0][0]
197 }
198}
199
200sub Deliantra::MoveType::new {
184 my ($class, $string) = @_; 201 my ($class, $string) = @_;
185 202
186 my $mask; 203 my $mask;
187 my $value; 204 my $value;
188 205
… …
202 } 219 }
203 220
204 (bless [$mask, $value], $class)->normalise 221 (bless [$mask, $value], $class)->normalise
205} 222}
206 223
207sub Crossfire::MoveType::normalise { 224sub Deliantra::MoveType::normalise {
208 my ($self) = @_; 225 my ($self) = @_;
209 226
210 if ($self->[0] & MOVE_ALL) { 227 if ($self->[0] & MOVE_ALL) {
211 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL); 228 my $mask = ~(($self->[1] & MOVE_ALL ? $self->[1] : ~$self->[1]) & $self->[0] & ~MOVE_ALL);
212 $self->[0] &= $mask; 229 $self->[0] &= $mask;
… …
216 $self->[1] &= $self->[0]; 233 $self->[1] &= $self->[0];
217 234
218 $self 235 $self
219} 236}
220 237
221sub Crossfire::MoveType::as_string { 238sub Deliantra::MoveType::as_string {
222 my ($self) = @_; 239 my ($self) = @_;
223 240
224 my @res; 241 my @res;
225 242
226 my ($mask, $value) = @$self; 243 my ($mask, $value) = @$self;
227 244
228 for (@Crossfire::MOVE_TYPE) { 245 for (@Deliantra::MOVE_TYPE) {
229 my $bit = $Crossfire::MOVE_TYPE{$_}; 246 my $bit = $Deliantra::MOVE_TYPE{$_};
230 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 247 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
231 $mask &= ~$bit; 248 $mask &= ~$bit;
232 push @res, $value & $bit ? $_ : "-$_"; 249 push @res, $value & $bit ? $_ : "-$_";
233 } 250 }
234 } 251 }
… …
327 344
328# object as in "Object xxx", i.e. archetypes 345# object as in "Object xxx", i.e. archetypes
329sub normalize_object($) { 346sub normalize_object($) {
330 my ($ob) = @_; 347 my ($ob) = @_;
331 348
349 delete $ob->{editable}; # deprecated
350
332 # convert material bitset to materialname, if possible 351 # convert material bitset to materialname, if possible
333 if (exists $ob->{material}) { 352 if (exists $ob->{material}) {
334 if (!$ob->{material}) { 353 if (!$ob->{material}) {
335 delete $ob->{material}; 354 delete $ob->{material};
336 } elsif (exists $ob->{materialname}) { 355 } elsif (exists $ob->{materialname}) {
… …
346 } else { 365 } else {
347 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 366 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
348 } 367 }
349 } 368 }
350 369
370 # check whether attachment is the same as in the archetype
371 if (exists $ob->{attach}) {
372 my $arch = $ARCH{$ob->{_name}};
373 my $js = JSON::XS->new->utf8->canonical (1);
374
375 if (defined $arch->{attach}
376 && $js->encode ($js->decode ($ob->{attach})) eq $js->encode ($arch->{attach})) {
377 delete $ob->{attach}
378 }
379 }
380
351 # color_fg is used as default for magicmap if magicmap does not exist 381 # 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}; 382 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
353 383
354 # nuke outdated or never supported fields 384 # nuke outdated or never supported fields
355 delete @$ob{qw( 385 delete @$ob{qw(
… …
363 393
364 # convert movement strings to bitsets 394 # convert movement strings to bitsets
365 for my $attr (keys %FIELD_MOVEMENT) { 395 for my $attr (keys %FIELD_MOVEMENT) {
366 next unless exists $ob->{$attr}; 396 next unless exists $ob->{$attr};
367 397
368 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 398 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
369 } 399 }
370 400
371 # convert outdated movement flags to new movement sets 401 # convert outdated movement flags to new movement sets
372 if (defined (my $v = delete $ob->{no_pass})) { 402 if (defined (my $v = delete $ob->{no_pass})) {
373 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 403 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "0";
374 } 404 }
375 if (defined (my $v = delete $ob->{slow_move})) { 405 if (defined (my $v = delete $ob->{slow_move})) {
376 $ob->{move_slow} += "walk"; 406 $ob->{move_slow} += "walk";
377 $ob->{move_slow_penalty} = $v; 407 $ob->{move_slow_penalty} = $v;
378 } 408 }
379 if (defined (my $v = delete $ob->{walk_on})) { 409 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" } 410 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "walk" } else { $ob->{move_on} -= "walk" }
381 } 411 }
382 if (defined (my $v = delete $ob->{walk_off})) { 412 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" } 413 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "walk" } else { $ob->{move_off} -= "walk" }
384 } 414 }
385 if (defined (my $v = delete $ob->{fly_on})) { 415 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" } 416 $ob->{move_on} ||= new Deliantra::MoveType; if ($v) { $ob->{move_on} += "fly_low" } else { $ob->{move_on} -= "fly_low" }
387 } 417 }
388 if (defined (my $v = delete $ob->{fly_off})) { 418 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" } 419 $ob->{move_off} ||= new Deliantra::MoveType; if ($v) { $ob->{move_off} += "fly_low" } else { $ob->{move_off} -= "fly_low" }
390 } 420 }
391 if (defined (my $v = delete $ob->{flying})) { 421 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" } 422 $ob->{move_type} ||= new Deliantra::MoveType; if ($v) { $ob->{move_type} += "fly_low" } else { $ob->{move_type} -= "fly_low" }
393 } 423 }
394 424
395 # convert idiotic event_xxx things into objects 425 # convert idiotic event_xxx things into objects
396 while (my ($event, $subtype) = each %EVENT_TYPE) { 426 while (my ($event, $subtype) = each %EVENT_TYPE) {
397 if (exists $ob->{"event_${event}_plugin"}) { 427 if (exists $ob->{"event_${event}_plugin"}) {
… …
413# arch as in "arch xxx", ie.. objects 443# arch as in "arch xxx", ie.. objects
414sub normalize_arch($) { 444sub normalize_arch($) {
415 my ($ob) = @_; 445 my ($ob) = @_;
416 446
417 normalize_object $ob; 447 normalize_object $ob;
448
449 return if $ob->{_atype} eq "object";
418 450
419 my $arch = $ARCH{$ob->{_name}} 451 my $arch = $ARCH{$ob->{_name}}
420 or (warn "$ob->{_name}: no such archetype", return $ob); 452 or (warn "$ob->{_name}: no such archetype", return $ob);
421 453
422 if ($arch->{type} == 22) { # map 454 if ($arch->{type} == 22) { # map
… …
458} 490}
459 491
460sub attr_thaw($) { 492sub attr_thaw($) {
461 my ($ob) = @_; 493 my ($ob) = @_;
462 494
463 $ob->{attach} = from_json $ob->{attach} 495 $ob->{attach} = decode_json $ob->{attach}
464 if exists $ob->{attach}; 496 if exists $ob->{attach};
465 497
466 $ob 498 $ob
467} 499}
468 500
469sub attr_freeze($) { 501sub attr_freeze($) {
470 my ($ob) = @_; 502 my ($ob) = @_;
471 503
472 $ob->{attach} = Crossfire::to_json $ob->{attach} 504 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
473 if exists $ob->{attach}; 505 if exists $ob->{attach};
474 506
475 $ob 507 $ob
476} 508}
477 509
… …
497 529
498 my %arc; 530 my %arc;
499 my ($more, $prev); 531 my ($more, $prev);
500 my $comment; 532 my $comment;
501 533
502 open my $fh, "<:raw:perlio:utf8", $path 534 open my $fh, "<:utf8", $path
503 or Carp::croak "$path: $!"; 535 or Carp::croak "$path: $!";
504 536
505# binmode $fh; 537# binmode $fh;
506 538
507 my $parse_block; $parse_block = sub { 539 my $parse_block; $parse_block = sub {
… …
607 my $str; 639 my $str;
608 640
609 my $append; $append = sub { 641 my $append; $append = sub {
610 my %a = %{$_[0]}; 642 my %a = %{$_[0]};
611 643
612 Crossfire::attr_freeze \%a; 644 Deliantra::attr_freeze \%a;
613 Crossfire::normalize_arch \%a; 645 Deliantra::normalize_arch \%a;
614 646
615 # undo the bit-split we did before 647 # undo the bit-split we did before
616 if (exists $a{attack_movement_bits_0_3} or exists $a{attack_movement_bits_4_7}) { 648 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}) 649 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
618 | (delete $a{attack_movement_bits_4_7}); 650 | (delete $a{attack_movement_bits_4_7});
… …
636 } 668 }
637 669
638 my @kv; 670 my @kv;
639 671
640 for ($a{_name} eq "map" 672 for ($a{_name} eq "map"
641 ? @Crossfire::FIELD_ORDER_MAP 673 ? @Deliantra::FIELD_ORDER_MAP
642 : @Crossfire::FIELD_ORDER) { 674 : @Deliantra::FIELD_ORDER) {
643 push @kv, [$_, delete $a{$_}] 675 push @kv, [$_, delete $a{$_}]
644 if exists $a{$_}; 676 if exists $a{$_};
645 } 677 }
646 678
647 for (sort keys %a) { 679 for (sort keys %a) {
… …
650 } 682 }
651 683
652 for (@kv) { 684 for (@kv) {
653 my ($k, $v) = @$_; 685 my ($k, $v) = @$_;
654 686
655 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 687 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
656 $v =~ s/\n$//; 688 $v =~ s/\n$//;
657 $str .= "$k\n$v\n$end\n"; 689 $str .= "$k\n$v\n$end\n";
658 } else { 690 } else {
659 $str .= "$k $v\n"; 691 $str .= "$k $v\n";
660 } 692 }
… …
756=cut 788=cut
757 789
758sub arch_attr($) { 790sub arch_attr($) {
759 my ($obj) = @_; 791 my ($obj) = @_;
760 792
761 require Crossfire::Data; 793 require Deliantra::Data;
762 794
763 my $root; 795 my $root;
764 my $attr = { }; 796 my $attr = { };
765 797
766 my $arch = $ARCH{ $obj->{_name} }; 798 my $arch = $ARCH{ $obj->{_name} };
767 my $type = $obj->{type} || $arch->{type}; 799 my $type = $obj->{type} || $arch->{type};
768 800
769 if ($type > 0) { 801 if ($type > 0) {
770 $root = $Crossfire::Data::ATTR{$type}; 802 $root = $Deliantra::Data::ATTR{$type};
771 } else { 803 } else {
772 my %a = (%$arch, %$obj); 804 my %a = (%$arch, %$obj);
773 805
774 if ($a{is_floor} && !$a{alive}) { 806 if ($a{is_floor} && !$a{alive}) {
775 $root = $Crossfire::Data::TYPE{Floor}; 807 $root = $Deliantra::Data::TYPE{Floor};
776 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 808 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
777 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 809 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
778 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 810 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
779 $root = $Crossfire::Data::TYPE{Wall}; 811 $root = $Deliantra::Data::TYPE{Wall};
780 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 812 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
781 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 813 $root = $Deliantra::Data::TYPE{"Weak Wall"};
782 } else { 814 } else {
783 $root = $Crossfire::Data::TYPE{Misc}; 815 $root = $Deliantra::Data::TYPE{Misc};
784 } 816 }
785 } 817 }
786 818
787 my @import = ($root); 819 my @import = ($root);
788 820
789 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 821 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
790 unless $type == 116; 822 unless $type == 116;
791 823
792 my (%ignore); 824 my (%ignore);
793 my (@section_order, %section, @attr_order); 825 my (@section_order, %section, @attr_order);
794 826
795 while (my $type = shift @import) { 827 while (my $type = shift @import) {
828 push @import,
829 grep $_,
830 map $Deliantra::Data::TYPE{$_},
796 push @import, @{$type->{import} || []}; 831 @{$type->{import} || []};
797 832
798 $attr->{$_} ||= $type->{$_} 833 $attr->{$_} ||= $type->{$_}
799 for qw(name desc use); 834 for qw(name desc use);
800 835
801 for (@{$type->{ignore} || []}) { 836 for (@{$type->{ignore} || []}) {
… …
890} 925}
891 926
892sub construct_tilecache_pb { 927sub construct_tilecache_pb {
893 my ($idx, $cache) = @_; 928 my ($idx, $cache) = @_;
894 929
895 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64; 930 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
896 931
897 while (my ($name, $tile) = each %$cache) { 932 while (my ($name, $tile) = each %$cache) {
898 my $tpb = delete $tile->{pb}; 933 my $tpb = delete $tile->{pb};
899 my $ofs = $tile->{idx}; 934 my $ofs = $tile->{idx};
900 935
901 for my $x (0 .. $tile->{w} - 1) { 936 for my $x (0 .. $tile->{w} - 1) {
902 for my $y (0 .. $tile->{h} - 1) { 937 for my $y (0 .. $tile->{h} - 1) {
903 my $idx = $ofs + $x + $y * $tile->{w}; 938 my $idx = $ofs + $x + $y * $tile->{w};
904 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE, 939 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
905 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64); 940 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
906 } 941 }
907 } 942 }
908 } 943 }
909 944
910 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1); 945 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
… …
926=cut 961=cut
927 962
928sub load_tilecache() { 963sub load_tilecache() {
929 require Gtk2; 964 require Gtk2;
930 965
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, 966 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
963 sub { 967 sub {
964 my %cache; 968 my %cache;
965 my $facedata = Storable::retrieve "$LIB/facedata"; 969 my $facedata = Storable::retrieve "$LIB/facedata";
966 970
967 $facedata->{version} == 2 971 $facedata->{version} == 2
968 or die "$LIB/facedata: version mismatch, cannot proceed."; 972 or die "$LIB/facedata: version mismatch, cannot proceed.";
969 973
970 my $faces = $facedata->{faceinfo}; 974 my $faces = $facedata->{faceinfo};
971 my $idx = 0; 975 my $idx = 0;
972 976
973 for (sort keys %$faces) { 977 for (sort keys %$faces) {
974 my ($face, $info) = ($_, $faces->{$_}); 978 my ($face, $info) = ($_, $faces->{$_});
975 979
976 my $pb = new Gtk2::Gdk::PixbufLoader; 980 my $pb = new Gtk2::Gdk::PixbufLoader;
977 $pb->write ($info->{data32}); 981 $pb->write ($info->{data32});
978 $pb->close; 982 $pb->close;
979 my $pb = $pb->get_pixbuf; 983 my $pb = $pb->get_pixbuf;
980 984
981 my $tile = $cache{$face} = { 985 my $tile = $cache{$face} = {
982 pb => $pb, 986 pb => $pb,
983 idx => $idx, 987 idx => $idx,
984 w => int $pb->get_width / TILESIZE, 988 w => int $pb->get_width / TILESIZE,
985 h => int $pb->get_height / TILESIZE, 989 h => int $pb->get_height / TILESIZE,
986 }; 990 };
987 991
988 $idx += $tile->{w} * $tile->{h}; 992 $idx += $tile->{w} * $tile->{h};
989 } 993 }
990 994
991 construct_tilecache_pb $idx, \%cache; 995 construct_tilecache_pb $idx, \%cache;
992 996
993 \%cache 997 \%cache
994 }; 998 };
995 }
996} 999}
1000
1001=back
997 1002
998=head1 AUTHOR 1003=head1 AUTHOR
999 1004
1000 Marc Lehmann <schmorp@schmorp.de> 1005 Marc Lehmann <schmorp@schmorp.de>
1001 http://home.schmorp.de/ 1006 http://home.schmorp.de/
… …
1004 http://www.ta-sa.org/ 1009 http://www.ta-sa.org/
1005 1010
1006=cut 1011=cut
1007 1012
10081 10131
1014

Diff Legend

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