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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines