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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines