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.98 by root, Sun Mar 11 00:34:12 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.97'; 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::Syck (); #TODO#d# replace by JSON::PC when it becomes available == working 27use JSON::XS qw(decode_json encode_json);
25 28
26sub from_json($) {
27 $JSON::Syck::ImplicitUnicode = 1;
28 JSON::Syck::Load $_[0]
29}
30
31sub to_json($) {
32 $JSON::Syck::ImplicitUnicode = 0;
33 JSON::Syck::Dump $_[0]
34}
35
36our $LIB = $ENV{CROSSFIRE_LIBDIR}; 29our $LIB = $ENV{DELIANTRA_LIBDIR};
37 30
38our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.crossfire" 31our $VARDIR = $ENV{HOME} ? "$ENV{HOME}/.deliantra"
39 : $ENV{AppData} ? "$ENV{APPDATA}/crossfire" 32 : $ENV{AppData} ? "$ENV{APPDATA}/deliantra"
40 : File::Spec->tmpdir . "/crossfire"; 33 : File::Spec->tmpdir . "/deliantra";
41 34
42mkdir $VARDIR, 0777; 35mkdir $VARDIR, 0777;
43 36
44sub TILESIZE (){ 32 } 37sub TILESIZE (){ 32 }
38sub CACHESTRIDE (){ 64 }
45 39
46our %ARCH; 40our %ARCH;
41our %FACE; # face32
47our %FACE; 42our %FACEDATA;
48our $TILE; 43our $TILE;
49 44
50our %FIELD_MULTILINE = ( 45our %FIELD_MULTILINE = (
51 msg => "endmsg", 46 msg => "endmsg",
52 lore => "endlore", 47 lore => "endlore",
… …
68 outdoor temp pressure humid windspeed winddir sky nosmooth 63 outdoor temp pressure humid windspeed winddir sky nosmooth
69 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
70)); 65));
71 66
72our @FIELD_ORDER = (qw( 67our @FIELD_ORDER = (qw(
68 inherit
69
73 elevation 70 elevation
74 71
75 name name_pl custom_name attach title race 72 name name_pl custom_name attach title race
76 slaying skill msg lore other_arch face 73 slaying skill msg lore other_arch
77 #todo-events 74 sound sound_destroy face animation is_animated
78 animation is_animated 75 magicmap smoothlevel smoothface
79 str dex con wis pow cha int 76 str dex con wis pow cha int
80 hp maxhp sp maxsp grace maxgrace 77 hp maxhp sp maxsp grace maxgrace
81 exp perm_exp expmul 78 exp perm_exp expmul
82 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 nrof level direction type subtype attacktype 80 nrof level direction type subtype attacktype
… …
91 resist_life_stealing resist_disease 88 resist_life_stealing resist_disease
92 89
93 path_attuned path_repelled path_denied material materialname 90 path_attuned path_repelled path_denied material materialname
94 value carrying weight invisible state magic 91 value carrying weight invisible state magic
95 last_heal last_sp last_grace last_eat 92 last_heal last_sp last_grace last_eat
96 connected glow_radius randomitems npx_status npc_program 93 connected glow_radius randomitems tresure_env npx_status npc_program
97 run_away pick_up container will_apply smoothlevel 94 run_away pick_up container will_apply smoothlevel
98 current_weapon_script weapontype tooltype elevation client_type 95 current_weapon_script weapontype tooltype elevation client_type
99 item_power duration range 96 item_power duration range
100 range_modifier duration_modifier dam_modifier gen_sp_armour 97 range_modifier duration_modifier dam_modifier gen_sp_armour
101 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
… …
112 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
113 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
114 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
115 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
116 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
117 115
118 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
119 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
120)); 118));
121 119
… …
138sub MOVE_FLY_LOW (){ 0x02 } 136sub MOVE_FLY_LOW (){ 0x02 }
139sub MOVE_FLY_HIGH (){ 0x04 } 137sub MOVE_FLY_HIGH (){ 0x04 }
140sub MOVE_FLYING (){ 0x06 } 138sub MOVE_FLYING (){ 0x06 }
141sub MOVE_SWIM (){ 0x08 } 139sub MOVE_SWIM (){ 0x08 }
142sub MOVE_BOAT (){ 0x10 } 140sub MOVE_BOAT (){ 0x10 }
141sub MOVE_SHIP (){ 0x20 }
143sub MOVE_KNOWN (){ 0x1f } # all of above 142sub MOVE_KNOWN (){ 0x3f } # all of above
144sub MOVE_ALL (){ 0x10000 } # very special value 143sub MOVE_ALL (){ 0x10000 } # very special value
145 144
146our %MOVE_TYPE = ( 145our %MOVE_TYPE = (
147 walk => MOVE_WALK, 146 walk => MOVE_WALK,
148 fly_low => MOVE_FLY_LOW, 147 fly_low => MOVE_FLY_LOW,
149 fly_high => MOVE_FLY_HIGH, 148 fly_high => MOVE_FLY_HIGH,
150 flying => MOVE_FLYING, 149 flying => MOVE_FLYING,
151 swim => MOVE_SWIM, 150 swim => MOVE_SWIM,
152 boat => MOVE_BOAT, 151 boat => MOVE_BOAT,
152 ship => MOVE_SHIP,
153 all => MOVE_ALL, 153 all => MOVE_ALL,
154); 154);
155 155
156our @MOVE_TYPE = qw(all walk flying fly_low fly_high swim boat); 156our @MOVE_TYPE = qw(all ship boat swim flying fly_high fly_low walk);
157 157
158{ 158{
159 package Crossfire::MoveType; 159 package Deliantra::MoveType;
160 160
161 use overload 161 use overload
162 '=' => sub { bless [@{$_[0]}], ref $_[0] }, 162 '=' => sub { bless [@{$_[0]}], ref $_[0] },
163 '""' => \&as_string, 163 '""' => \&as_string,
164 '>=' => 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 },
… …
182 $_[0] 182 $_[0]
183 }, 183 },
184 'eq' => sub { "$_[0]" eq "$_[1]" }, 184 'eq' => sub { "$_[0]" eq "$_[1]" },
185 'ne' => sub { "$_[0]" ne "$_[1]" }, 185 'ne' => sub { "$_[0]" ne "$_[1]" },
186 ; 186 ;
187}
188 187
189sub Crossfire::MoveType::new { 188 sub TO_JSON {
189 $_[0][0]
190 }
191}
192
193sub Deliantra::MoveType::new {
190 my ($class, $string) = @_; 194 my ($class, $string) = @_;
191 195
192 my $mask; 196 my $mask;
193 my $value; 197 my $value;
194 198
… …
208 } 212 }
209 213
210 (bless [$mask, $value], $class)->normalise 214 (bless [$mask, $value], $class)->normalise
211} 215}
212 216
213sub Crossfire::MoveType::normalise { 217sub Deliantra::MoveType::normalise {
214 my ($self) = @_; 218 my ($self) = @_;
215 219
216 if ($self->[0] & MOVE_ALL) { 220 if ($self->[0] & MOVE_ALL) {
217 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);
218 $self->[0] &= $mask; 222 $self->[0] &= $mask;
… …
222 $self->[1] &= $self->[0]; 226 $self->[1] &= $self->[0];
223 227
224 $self 228 $self
225} 229}
226 230
227sub Crossfire::MoveType::as_string { 231sub Deliantra::MoveType::as_string {
228 my ($self) = @_; 232 my ($self) = @_;
229 233
230 my @res; 234 my @res;
231 235
232 my ($mask, $value) = @$self; 236 my ($mask, $value) = @$self;
233 237
234 for (@Crossfire::MOVE_TYPE) { 238 for (@Deliantra::MOVE_TYPE) {
235 my $bit = $Crossfire::MOVE_TYPE{$_}; 239 my $bit = $Deliantra::MOVE_TYPE{$_};
236 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) { 240 if (($mask & $bit) == $bit && (($value & $bit) == $bit || ($value & $bit) == 0)) {
237 $mask &= ~$bit; 241 $mask &= ~$bit;
238 push @res, $value & $bit ? $_ : "-$_"; 242 push @res, $value & $bit ? $_ : "-$_";
239 } 243 }
240 } 244 }
… …
352 } else { 356 } else {
353 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n"; 357 warn "object $ob->{_name} has unknown material ($ob->{material}) set.\n";
354 } 358 }
355 } 359 }
356 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
357 # 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
358 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg}; 373 $ob->{magicmap} ||= delete $ob->{color_fg} if exists $ob->{color_fg};
359 374
360 # nuke outdated or never supported fields 375 # nuke outdated or never supported fields
361 delete @$ob{qw( 376 delete @$ob{qw(
… …
369 384
370 # convert movement strings to bitsets 385 # convert movement strings to bitsets
371 for my $attr (keys %FIELD_MOVEMENT) { 386 for my $attr (keys %FIELD_MOVEMENT) {
372 next unless exists $ob->{$attr}; 387 next unless exists $ob->{$attr};
373 388
374 $ob->{$attr} = new Crossfire::MoveType $ob->{$attr}; 389 $ob->{$attr} = new Deliantra::MoveType $ob->{$attr};
375 } 390 }
376 391
377 # convert outdated movement flags to new movement sets 392 # convert outdated movement flags to new movement sets
378 if (defined (my $v = delete $ob->{no_pass})) { 393 if (defined (my $v = delete $ob->{no_pass})) {
379 $ob->{move_block} = new Crossfire::MoveType $v ? "all" : ""; 394 $ob->{move_block} = new Deliantra::MoveType $v ? "all" : "";
380 } 395 }
381 if (defined (my $v = delete $ob->{slow_move})) { 396 if (defined (my $v = delete $ob->{slow_move})) {
382 $ob->{move_slow} += "walk"; 397 $ob->{move_slow} += "walk";
383 $ob->{move_slow_penalty} = $v; 398 $ob->{move_slow_penalty} = $v;
384 } 399 }
385 if (defined (my $v = delete $ob->{walk_on})) { 400 if (defined (my $v = delete $ob->{walk_on})) {
386 $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" }
387 } 402 }
388 if (defined (my $v = delete $ob->{walk_off})) { 403 if (defined (my $v = delete $ob->{walk_off})) {
389 $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" }
390 } 405 }
391 if (defined (my $v = delete $ob->{fly_on})) { 406 if (defined (my $v = delete $ob->{fly_on})) {
392 $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" }
393 } 408 }
394 if (defined (my $v = delete $ob->{fly_off})) { 409 if (defined (my $v = delete $ob->{fly_off})) {
395 $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" }
396 } 411 }
397 if (defined (my $v = delete $ob->{flying})) { 412 if (defined (my $v = delete $ob->{flying})) {
398 $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" }
399 } 414 }
400 415
401 # convert idiotic event_xxx things into objects 416 # convert idiotic event_xxx things into objects
402 while (my ($event, $subtype) = each %EVENT_TYPE) { 417 while (my ($event, $subtype) = each %EVENT_TYPE) {
403 if (exists $ob->{"event_${event}_plugin"}) { 418 if (exists $ob->{"event_${event}_plugin"}) {
… …
419# arch as in "arch xxx", ie.. objects 434# arch as in "arch xxx", ie.. objects
420sub normalize_arch($) { 435sub normalize_arch($) {
421 my ($ob) = @_; 436 my ($ob) = @_;
422 437
423 normalize_object $ob; 438 normalize_object $ob;
439
440 return if $ob->{_atype} eq "object";
424 441
425 my $arch = $ARCH{$ob->{_name}} 442 my $arch = $ARCH{$ob->{_name}}
426 or (warn "$ob->{_name}: no such archetype", return $ob); 443 or (warn "$ob->{_name}: no such archetype", return $ob);
427 444
428 if ($arch->{type} == 22) { # map 445 if ($arch->{type} == 22) { # map
… …
464} 481}
465 482
466sub attr_thaw($) { 483sub attr_thaw($) {
467 my ($ob) = @_; 484 my ($ob) = @_;
468 485
469 $ob->{attach} = from_json $ob->{attach} 486 $ob->{attach} = decode_json $ob->{attach}
470 if exists $ob->{attach}; 487 if exists $ob->{attach};
471 488
472 $ob 489 $ob
473} 490}
474 491
475sub attr_freeze($) { 492sub attr_freeze($) {
476 my ($ob) = @_; 493 my ($ob) = @_;
477 494
478 $ob->{attach} = Crossfire::to_json $ob->{attach} 495 $ob->{attach} = JSON::XS->new->utf8->canonical->encode ($ob->{attach})
479 if exists $ob->{attach}; 496 if exists $ob->{attach};
480 497
481 $ob 498 $ob
482} 499}
483 500
… …
503 520
504 my %arc; 521 my %arc;
505 my ($more, $prev); 522 my ($more, $prev);
506 my $comment; 523 my $comment;
507 524
508 open my $fh, "<:raw:perlio:utf8", $path 525 open my $fh, "<:utf8", $path
509 or Carp::croak "$path: $!"; 526 or Carp::croak "$path: $!";
510 527
511# binmode $fh; 528# binmode $fh;
512 529
513 my $parse_block; $parse_block = sub { 530 my $parse_block; $parse_block = sub {
… …
613 my $str; 630 my $str;
614 631
615 my $append; $append = sub { 632 my $append; $append = sub {
616 my %a = %{$_[0]}; 633 my %a = %{$_[0]};
617 634
618 Crossfire::attr_freeze \%a; 635 Deliantra::attr_freeze \%a;
619 Crossfire::normalize_arch \%a; 636 Deliantra::normalize_arch \%a;
620 637
621 # undo the bit-split we did before 638 # undo the bit-split we did before
622 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}) {
623 $a{attack_movement} = (delete $a{attack_movement_bits_0_3}) 640 $a{attack_movement} = (delete $a{attack_movement_bits_0_3})
624 | (delete $a{attack_movement_bits_4_7}); 641 | (delete $a{attack_movement_bits_4_7});
… …
642 } 659 }
643 660
644 my @kv; 661 my @kv;
645 662
646 for ($a{_name} eq "map" 663 for ($a{_name} eq "map"
647 ? @Crossfire::FIELD_ORDER_MAP 664 ? @Deliantra::FIELD_ORDER_MAP
648 : @Crossfire::FIELD_ORDER) { 665 : @Deliantra::FIELD_ORDER) {
649 push @kv, [$_, delete $a{$_}] 666 push @kv, [$_, delete $a{$_}]
650 if exists $a{$_}; 667 if exists $a{$_};
651 } 668 }
652 669
653 for (sort keys %a) { 670 for (sort keys %a) {
… …
656 } 673 }
657 674
658 for (@kv) { 675 for (@kv) {
659 my ($k, $v) = @$_; 676 my ($k, $v) = @$_;
660 677
661 if (my $end = $Crossfire::FIELD_MULTILINE{$k}) { 678 if (my $end = $Deliantra::FIELD_MULTILINE{$k}) {
662 $v =~ s/\n$//; 679 $v =~ s/\n$//;
663 $str .= "$k\n$v\n$end\n"; 680 $str .= "$k\n$v\n$end\n";
664 } else { 681 } else {
665 $str .= "$k $v\n"; 682 $str .= "$k $v\n";
666 } 683 }
… …
762=cut 779=cut
763 780
764sub arch_attr($) { 781sub arch_attr($) {
765 my ($obj) = @_; 782 my ($obj) = @_;
766 783
767 require Crossfire::Data; 784 require Deliantra::Data;
768 785
769 my $root; 786 my $root;
770 my $attr = { }; 787 my $attr = { };
771 788
772 my $arch = $ARCH{ $obj->{_name} }; 789 my $arch = $ARCH{ $obj->{_name} };
773 my $type = $obj->{type} || $arch->{type}; 790 my $type = $obj->{type} || $arch->{type};
774 791
775 if ($type > 0) { 792 if ($type > 0) {
776 $root = $Crossfire::Data::ATTR{$type}; 793 $root = $Deliantra::Data::ATTR{$type};
777 } else { 794 } else {
778 my %a = (%$arch, %$obj); 795 my %a = (%$arch, %$obj);
779 796
780 if ($a{is_floor} && !$a{alive}) { 797 if ($a{is_floor} && !$a{alive}) {
781 $root = $Crossfire::Data::TYPE{Floor}; 798 $root = $Deliantra::Data::TYPE{Floor};
782 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) { 799 } elsif (!$a{is_floor} && $a{alive} && !$a{tear_down}) {
783 $root = $Crossfire::Data::TYPE{"Monster & NPC"}; 800 $root = $Deliantra::Data::TYPE{"Monster & NPC"};
784 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) { 801 } elsif (!$a{is_floor} && !$a{alive} && $a{move_block}) {
785 $root = $Crossfire::Data::TYPE{Wall}; 802 $root = $Deliantra::Data::TYPE{Wall};
786 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) { 803 } elsif (!$a{is_floor} && $a{alive} && $a{tear_down}) {
787 $root = $Crossfire::Data::TYPE{"Weak Wall"}; 804 $root = $Deliantra::Data::TYPE{"Weak Wall"};
788 } else { 805 } else {
789 $root = $Crossfire::Data::TYPE{Misc}; 806 $root = $Deliantra::Data::TYPE{Misc};
790 } 807 }
791 } 808 }
792 809
793 my @import = ($root); 810 my @import = ($root);
794 811
795 unshift @import, \%Crossfire::Data::DEFAULT_ATTR 812 unshift @import, \%Deliantra::Data::DEFAULT_ATTR
796 unless $type == 116; 813 unless $type == 116;
797 814
798 my (%ignore); 815 my (%ignore);
799 my (@section_order, %section, @attr_order); 816 my (@section_order, %section, @attr_order);
800 817
801 while (my $type = shift @import) { 818 while (my $type = shift @import) {
819 push @import,
820 grep $_,
821 map $Deliantra::Data::TYPE{$_},
802 push @import, @{$type->{import} || []}; 822 @{$type->{import} || []};
803 823
804 $attr->{$_} ||= $type->{$_} 824 $attr->{$_} ||= $type->{$_}
805 for qw(name desc use); 825 for qw(name desc use);
806 826
807 for (@{$type->{ignore} || []}) { 827 for (@{$type->{ignore} || []}) {
… …
893 }, sub { 913 }, sub {
894 read_arch "$LIB/archetypes" 914 read_arch "$LIB/archetypes"
895 }; 915 };
896} 916}
897 917
918sub construct_tilecache_pb {
919 my ($idx, $cache) = @_;
920
921 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, CACHESTRIDE * TILESIZE, TILESIZE * int +($idx + CACHESTRIDE - 1) / CACHESTRIDE;
922
923 while (my ($name, $tile) = each %$cache) {
924 my $tpb = delete $tile->{pb};
925 my $ofs = $tile->{idx};
926
927 for my $x (0 .. $tile->{w} - 1) {
928 for my $y (0 .. $tile->{h} - 1) {
929 my $idx = $ofs + $x + $y * $tile->{w};
930 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
931 $pb, ($idx % CACHESTRIDE) * TILESIZE, TILESIZE * int $idx / CACHESTRIDE);
932 }
933 }
934 }
935
936 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
937
938 $cache
939}
940
941sub use_tilecache {
942 my ($face) = @_;
943 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
944 or die "$VARDIR/tilecache.png: $!";
945 *FACE = $_[0];
946}
947
898=item load_tilecache 948=item load_tilecache
899 949
900(Re-)Load %TILE and %FACE. 950(Re-)Load %TILE and %FACE.
901 951
902=cut 952=cut
903 953
904sub load_tilecache() { 954sub load_tilecache() {
905 require Gtk2; 955 require Gtk2;
906 956
907 cache_file "$LIB/crossfire.0", "$VARDIR/tilecache.pst", sub { 957 cache_file "$LIB/facedata", "$VARDIR/tilecache.pst", \&use_tilecache,
908 $TILE = new_from_file Gtk2::Gdk::Pixbuf "$VARDIR/tilecache.png"
909 or die "$VARDIR/tilecache.png: $!";
910 *FACE = $_[0];
911 }, sub { 958 sub {
912 my $tile = read_pak "$LIB/crossfire.0";
913
914 my %cache; 959 my %cache;
960 my $facedata = Storable::retrieve "$LIB/facedata";
915 961
962 $facedata->{version} == 2
963 or die "$LIB/facedata: version mismatch, cannot proceed.";
964
965 my $faces = $facedata->{faceinfo};
916 my $idx = 0; 966 my $idx = 0;
917 967
918 for my $name (sort keys %$tile) { 968 for (sort keys %$faces) {
969 my ($face, $info) = ($_, $faces->{$_});
970
919 my $pb = new Gtk2::Gdk::PixbufLoader; 971 my $pb = new Gtk2::Gdk::PixbufLoader;
920 $pb->write ($tile->{$name}); 972 $pb->write ($info->{data32});
921 $pb->close; 973 $pb->close;
922 my $pb = $pb->get_pixbuf; 974 my $pb = $pb->get_pixbuf;
923 975
924 my $tile = $cache{$name} = { 976 my $tile = $cache{$face} = {
925 pb => $pb, 977 pb => $pb,
926 idx => $idx, 978 idx => $idx,
927 w => int $pb->get_width / TILESIZE, 979 w => int $pb->get_width / TILESIZE,
928 h => int $pb->get_height / TILESIZE, 980 h => int $pb->get_height / TILESIZE,
929 }; 981 };
930
931 982
932 $idx += $tile->{w} * $tile->{h}; 983 $idx += $tile->{w} * $tile->{h};
984 }
985
986 construct_tilecache_pb $idx, \%cache;
987
988 \%cache
933 } 989 };
934
935 my $pb = new Gtk2::Gdk::Pixbuf "rgb", 1, 8, 64 * TILESIZE, TILESIZE * int +($idx + 63) / 64;
936
937 while (my ($name, $tile) = each %cache) {
938 my $tpb = delete $tile->{pb};
939 my $ofs = $tile->{idx};
940
941 for my $x (0 .. $tile->{w} - 1) {
942 for my $y (0 .. $tile->{h} - 1) {
943 my $idx = $ofs + $x + $y * $tile->{w};
944 $tpb->copy_area ($x * TILESIZE, $y * TILESIZE, TILESIZE, TILESIZE,
945 $pb, ($idx % 64) * TILESIZE, TILESIZE * int $idx / 64);
946 }
947 }
948 }
949
950 $pb->save ("$VARDIR/tilecache.png", "png", compression => 1);
951
952 \%cache
953 };
954} 990}
955 991
956=head1 AUTHOR 992=head1 AUTHOR
957 993
958 Marc Lehmann <schmorp@schmorp.de> 994 Marc Lehmann <schmorp@schmorp.de>
… …
962 http://www.ta-sa.org/ 998 http://www.ta-sa.org/
963 999
964=cut 1000=cut
965 1001
9661 10021
1003

Diff Legend

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